From: Mathieu Baudier Date: Wed, 5 Jan 2022 11:37:17 +0000 (+0100) Subject: Massive Argeo APIs refactoring X-Git-Tag: argeo-slc-2.3.1~33 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=fbde11e8a342318876a4744c4676d3618bdf8583;p=gpl%2Fargeo-slc.git Massive Argeo APIs refactoring --- diff --git a/cms/org.argeo.cms.integration/bnd.bnd b/cms/org.argeo.cms.integration/bnd.bnd index 306bcd283..5a4665346 100644 --- a/cms/org.argeo.cms.integration/bnd.bnd +++ b/cms/org.argeo.cms.integration/bnd.bnd @@ -1,4 +1,4 @@ Import-Package:\ -org.argeo.api,\ javax.jcr.nodetype,\ +org.apache.commons.logging,\ * \ No newline at end of file diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java index bbac176a5..fb289c18e 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsExceptionsChain.java @@ -7,8 +7,7 @@ import java.util.List; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; @@ -16,7 +15,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** Serialisable wrapper of a {@link Throwable}. */ public class CmsExceptionsChain { - public final static Log log = LogFactory.getLog(CmsExceptionsChain.class); + public final static CmsLog log = CmsLog.getLog(CmsExceptionsChain.class); private List exceptions = new ArrayList<>(); diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java index 45dcd73fc..29a3137bb 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLoginServlet.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsSessionId; import org.argeo.cms.auth.RemoteAuthCallback; import org.argeo.cms.auth.RemoteAuthCallbackHandler; @@ -49,7 +49,7 @@ public class CmsLoginServlet extends HttpServlet { ServletHttpRequest request = new ServletHttpRequest(req); ServletHttpResponse response = new ServletHttpResponse(resp); try { - lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) { + lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { for (Callback callback : callbacks) { if (callback instanceof NameCallback && username != null) diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java index 6bf8d2250..0628eae36 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsLogoutServlet.java @@ -13,7 +13,7 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsSessionId; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.RemoteAuthCallback; @@ -38,7 +38,7 @@ public class CmsLogoutServlet extends HttpServlet { ServletHttpResponse httpResponse = new ServletHttpResponse(response); LoginContext lc = null; try { - lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, + lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(httpRequest, httpResponse) { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { for (Callback callback : callbacks) { diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java index ac342d3ac..cec04d230 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsPrivateServletContext.java @@ -1,7 +1,5 @@ package org.argeo.cms.integration; -import static org.argeo.api.NodeConstants.LOGIN_CONTEXT_USER; - import java.io.IOException; import java.security.AccessControlContext; import java.security.PrivilegedAction; @@ -13,6 +11,7 @@ import javax.security.auth.login.LoginException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.argeo.api.cms.CmsAuth; import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.auth.RemoteAuthUtils; import org.argeo.cms.servlet.ServletHttpRequest; @@ -46,7 +45,7 @@ public class CmsPrivateServletContext extends ServletContextHelper { if ((pathInfo != null && (servletPath + pathInfo).equals(loginPage)) || servletPath.contentEquals(loginServlet)) return true; try { - lc = new LoginContext(LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response)); + lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response)); lc.login(); } catch (LoginException e) { lc = processUnauthorized(req, resp); diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java index b95e56ef6..983202ad2 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/CmsTokenServlet.java @@ -15,13 +15,13 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; import org.argeo.cms.CmsUserManager; import org.argeo.cms.auth.RemoteAuthCallback; import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.servlet.ServletHttpRequest; import org.argeo.cms.servlet.ServletHttpResponse; -import org.argeo.naming.NamingUtils; +import org.argeo.util.naming.NamingUtils; import org.osgi.service.useradmin.Authorization; import com.fasterxml.jackson.core.JsonGenerator; @@ -45,7 +45,7 @@ public class CmsTokenServlet extends HttpServlet { ServletHttpResponse response = new ServletHttpResponse(resp); LoginContext lc = null; try { - lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) { + lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(request, response) { public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { for (Callback callback : callbacks) { if (callback instanceof RemoteAuthCallback) { diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java index 83393ec8e..0553d7f59 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrReadServlet.java @@ -30,10 +30,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.api.JackrabbitNode; import org.apache.jackrabbit.api.JackrabbitValue; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.osgi.service.http.context.ServletContextHelper; @@ -43,7 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; /** Access a JCR repository via web services. */ public class JcrReadServlet extends HttpServlet { private static final long serialVersionUID = 6536175260540484539L; - private final static Log log = LogFactory.getLog(JcrReadServlet.class); + private final static CmsLog log = CmsLog.getLog(JcrReadServlet.class); protected final static String ACCEPT_HTTP_HEADER = "Accept"; protected final static String CONTENT_DISPOSITION_HTTP_HEADER = "Content-Disposition"; diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java index 71d915674..8a3864bbd 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/integration/JcrWriteServlet.java @@ -12,14 +12,13 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; /** Access a JCR repository via web services. */ public class JcrWriteServlet extends JcrReadServlet { private static final long serialVersionUID = 17272653843085492L; - private final static Log log = LogFactory.getLog(JcrWriteServlet.class); + private final static CmsLog log = CmsLog.getLog(JcrWriteServlet.class); @Override protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { diff --git a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java index a1cdb257e..aea1f0a38 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/cms/websocket/CmsWebSocketConfigurator.java @@ -12,9 +12,8 @@ import javax.websocket.server.HandshakeRequest; import javax.websocket.server.ServerEndpointConfig; import javax.websocket.server.ServerEndpointConfig.Configurator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.auth.RemoteAuthCallbackHandler; import org.argeo.cms.auth.RemoteAuthSession; import org.argeo.cms.servlet.ServletHttpSession; @@ -24,7 +23,7 @@ import org.osgi.service.http.context.ServletContextHelper; public class CmsWebSocketConfigurator extends Configurator { public final static String WEBSOCKET_SUBJECT = "org.argeo.cms.websocket.subject"; - private final static Log log = LogFactory.getLog(CmsWebSocketConfigurator.class); + private final static CmsLog log = CmsLog.getLog(CmsWebSocketConfigurator.class); final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; @Override @@ -72,7 +71,7 @@ public class CmsWebSocketConfigurator extends Configurator { rejectResponse(response, null); } try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, new RemoteAuthCallbackHandler(httpSession)); lc.login(); if (log.isDebugEnabled()) diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java index c8f20bd7e..a72ce63f9 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/OsCallBackup.java @@ -11,17 +11,16 @@ import org.apache.commons.exec.ExecuteStreamHandler; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileContent; import org.apache.commons.vfs2.FileObject; +import org.argeo.api.cms.CmsLog; /** * Runs an OS command and save its standard output as a file. Typically used for * MySQL or OpenLDAP dumps. */ public class OsCallBackup extends AbstractAtomicBackup { - private final static Log log = LogFactory.getLog(OsCallBackup.class); + private final static CmsLog log = CmsLog.getLog(OsCallBackup.class); private String command; private Map variables = new HashMap(); diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java index 6e747019b..c8baf20c9 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SimpleBackupPurge.java @@ -8,16 +8,15 @@ import java.util.Date; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.Selectors; +import org.argeo.api.cms.CmsLog; /** Simple backup purge which keeps backups only for a given number of days */ public class SimpleBackupPurge implements BackupPurge { - private final static Log log = LogFactory.getLog(SimpleBackupPurge.class); + private final static CmsLog log = CmsLog.getLog(SimpleBackupPurge.class); private Integer daysKept = 30; diff --git a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java index a70267844..9ae0c96e5 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/maintenance/backup/vfs/SystemBackup.java @@ -5,8 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileSystemManager; @@ -14,6 +12,7 @@ import org.apache.commons.vfs2.FileSystemOptions; import org.apache.commons.vfs2.Selectors; import org.apache.commons.vfs2.UserAuthenticator; import org.apache.commons.vfs2.impl.DefaultFileSystemConfigBuilder; +import org.argeo.api.cms.CmsLog; import org.argeo.util.LangUtils; /** @@ -21,7 +20,7 @@ import org.argeo.util.LangUtils; * remote and local data based on certain criteria. */ public class SystemBackup implements Runnable { - private final static Log log = LogFactory.getLog(SystemBackup.class); + private final static CmsLog log = CmsLog.getLog(SystemBackup.class); private FileSystemManager fileSystemManager; private UserAuthenticator userAuthenticator = null; diff --git a/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java b/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java index 261ac2460..6bdb9bc99 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/ssh/AbstractSsh.java @@ -9,8 +9,6 @@ import java.util.HashSet; import java.util.Scanner; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.sshd.client.SshClient; import org.apache.sshd.client.channel.ClientChannel; import org.apache.sshd.client.channel.ClientChannelEvent; @@ -19,10 +17,11 @@ import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider; import org.apache.sshd.common.util.io.NoCloseInputStream; import org.apache.sshd.common.util.io.NoCloseOutputStream; +import org.argeo.api.cms.CmsLog; @SuppressWarnings("restriction") abstract class AbstractSsh { - private final static Log log = LogFactory.getLog(AbstractSsh.class); + private final static CmsLog log = CmsLog.getLog(AbstractSsh.class); private static SshClient sshClient; private static SftpFileSystemProvider sftpFileSystemProvider; diff --git a/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java b/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java index bafda015f..b9f1e91d0 100644 --- a/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java +++ b/cms/org.argeo.cms.integration/src/org/argeo/ssh/SshSync.java @@ -10,8 +10,6 @@ import java.util.Map; import java.util.Scanner; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.sshd.agent.SshAgent; import org.apache.sshd.agent.SshAgentFactory; import org.apache.sshd.agent.local.LocalAgentFactory; @@ -21,9 +19,10 @@ import org.apache.sshd.client.future.ConnectFuture; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystem; import org.apache.sshd.client.subsystem.sftp.fs.SftpFileSystemProvider; +import org.argeo.api.cms.CmsLog; public class SshSync { - private final static Log log = LogFactory.getLog(SshSync.class); + private final static CmsLog log = CmsLog.getLog(SshSync.class); public static void main(String[] args) { diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath index 457b11571..e03d341b1 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/.classpath @@ -4,6 +4,6 @@ + path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11" /> diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml index 894017918..09e9ed8f9 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/META-INF/spring/osgi.xml @@ -10,5 +10,5 @@ - + diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd index da72c4c46..7ac394ca1 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/bnd.bnd @@ -10,5 +10,4 @@ org.argeo.cms.ui.workbench,\ org.argeo.cms.ui.workbench.commands,\ org.argeo.eclipse.ui.specific,\ org.argeo.eclipse.spring,\ -org.argeo.api,\ * diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java index 586c1ee18..82e86b404 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/AnonymousEntryPoint.java @@ -6,9 +6,8 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.EntryPoint; @@ -20,7 +19,7 @@ import org.eclipse.ui.PlatformUI; * unauthenticated access. */ public class AnonymousEntryPoint implements EntryPoint { - private final static Log log = LogFactory.getLog(AnonymousEntryPoint.class); + private final static CmsLog log = CmsLog.getLog(AnonymousEntryPoint.class); /** * How many seconds to wait before invalidating the session if the user has @@ -41,7 +40,7 @@ public class AnonymousEntryPoint implements EntryPoint { final LoginContext loginContext; try { - loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_ANONYMOUS, + loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_ANONYMOUS, subject); loginContext.login(); } catch (LoginException e1) { diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java index 57f7c0763..c86dde4aa 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/LoginEntryPoint.java @@ -8,10 +8,9 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; import org.argeo.api.cms.CmsImageManager; +import org.argeo.api.cms.CmsLog; import org.argeo.api.cms.CmsView; import org.argeo.api.cms.UxContext; import org.argeo.cms.CmsException; @@ -20,7 +19,6 @@ import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.cms.swt.SimpleSwtUxContext; import org.argeo.cms.swt.auth.CmsLogin; import org.argeo.cms.swt.auth.CmsLoginShell; -import org.argeo.eclipse.ui.specific.UiContext; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.application.EntryPoint; import org.eclipse.swt.events.SelectionListener; @@ -30,7 +28,7 @@ import org.eclipse.swt.widgets.Display; public class LoginEntryPoint implements EntryPoint, CmsView { protected final static String HEADER_WWW_AUTHENTICATE = "WWW-Authenticate"; protected final static String HEADER_AUTHORIZATION = "Authorization"; - private final static Log log = LogFactory.getLog(LoginEntryPoint.class); + private final static CmsLog log = CmsLog.getLog(LoginEntryPoint.class); private LoginContext loginContext; private UxContext uxContext = null; private String uid; @@ -45,7 +43,7 @@ public class LoginEntryPoint implements EntryPoint, CmsView { CmsSwtUtils.registerCmsView(loginShell.getShell(), this); try { // try pre-auth - loginContext = new LoginContext(NodeConstants.LOGIN_CONTEXT_USER, loginShell); + loginContext = new LoginContext(CmsAuth.LOGIN_CONTEXT_USER, loginShell); loginContext.login(); } catch (LoginException e) { loginShell.createUi(); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java index a5acfe528..3f4b2cabe 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapActionBarAdvisor.java @@ -19,7 +19,7 @@ import org.eclipse.ui.commands.ICommandService; /** Eclipse rap specific action bar advisor */ public class RapActionBarAdvisor extends ActionBarAdvisor { private final static String ID_BASE = SecureRapActivator.ID; - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(SecureActionBarAdvisor.class); /** Null means anonymous */ diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java index 956f967e2..d471703f7 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/RapWorkbenchLogin.java @@ -6,14 +6,10 @@ import java.util.Locale; import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; -import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.client.service.JavaScriptExecutor; -import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java index fad2d9f13..4eaaef79d 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/SpnegoWorkbenchLogin.java @@ -8,14 +8,10 @@ import javax.security.auth.x500.X500Principal; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.argeo.cms.CmsMsg; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.ui.util.CmsUiUtils; import org.eclipse.rap.rwt.RWT; import org.eclipse.rap.rwt.client.service.JavaScriptExecutor; -import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.ui.PlatformUI; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath b/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath index 457b11571..e03d341b1 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/.classpath @@ -4,6 +4,6 @@ + path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11" /> diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml b/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml index 9f72ed253..17fd7f5b4 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/META-INF/spring/osgi.xml @@ -10,7 +10,7 @@ - + - + @@ -30,8 +30,6 @@ - diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java index 3c3220099..d18de037a 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/AbstractSystemExecution.java @@ -4,14 +4,13 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; /** Provides base method for executing code with system authorization. */ abstract class AbstractSystemExecution { - private final static Log log = LogFactory.getLog(AbstractSystemExecution.class); + private final static CmsLog log = CmsLog.getLog(AbstractSystemExecution.class); private final Subject subject = new Subject(); /** Authenticate the calling thread */ @@ -19,7 +18,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.login(); } catch (LoginException e) { throw new CmsException("Cannot login as system", e); @@ -34,7 +33,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.logout(); } catch (LoginException e) { throw new CmsException("Cannot logout as system", e); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java index 462621622..ea59c594e 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/SimpleRoleRegistration.java @@ -7,8 +7,7 @@ import java.util.Map; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; import org.argeo.osgi.transaction.WorkTransaction; import org.osgi.service.useradmin.Role; @@ -19,7 +18,7 @@ import org.osgi.service.useradmin.UserAdmin; * is already registered. */ public class SimpleRoleRegistration implements Runnable { - private final static Log log = LogFactory.getLog(SimpleRoleRegistration.class); + private final static CmsLog log = CmsLog.getLog(SimpleRoleRegistration.class); private String role; private List roles = new ArrayList(); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java index f085d6a23..e10ea0606 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/spring/osgi/OsgiModuleLabel.java @@ -1,7 +1,6 @@ package org.argeo.cms.spring.osgi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -11,7 +10,7 @@ import org.osgi.framework.Constants; * {@link BundleContext}. */ public class OsgiModuleLabel { - private final static Log log = LogFactory.getLog(OsgiModuleLabel.class); + private final static CmsLog log = CmsLog.getLog(OsgiModuleLabel.class); private Bundle bundle; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java index b2a46a391..8d965b827 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/AbstractLoginDialog.java @@ -8,8 +8,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.PasswordCallback; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.IDialogConstants; @@ -28,7 +27,7 @@ import org.osgi.framework.FrameworkUtil; public abstract class AbstractLoginDialog extends TrayDialog implements CallbackHandler { private static final long serialVersionUID = -8046708963512717709L; - private final static Log log = LogFactory.getLog(AbstractLoginDialog.class); + private final static CmsLog log = CmsLog.getLog(AbstractLoginDialog.class); private Thread modalContextThread = null; boolean processCallbacks = false; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java index 5d2232829..a95275ee0 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/WorkbenchUiPlugin.java @@ -7,8 +7,7 @@ import javax.security.auth.callback.Callback; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.callback.UnsupportedCallbackException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; import org.eclipse.core.runtime.ILogListener; import org.eclipse.core.runtime.IStatus; @@ -21,7 +20,7 @@ import org.osgi.framework.ServiceRegistration; /** The activator class controls the plug-in life cycle */ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener { - private final static Log log = LogFactory.getLog(WorkbenchUiPlugin.class); + private final static CmsLog log = CmsLog.getLog(WorkbenchUiPlugin.class); // The plug-in ID public final static String PLUGIN_ID = "org.argeo.cms.ui.workbench"; //$NON-NLS-1$ @@ -129,7 +128,7 @@ public class WorkbenchUiPlugin extends AbstractUIPlugin implements ILogListener } public void logging(IStatus status, String plugin) { - Log pluginLog = LogFactory.getLog(plugin); + CmsLog pluginLog = CmsLog.getLog(plugin); Integer severity = status.getSeverity(); if (severity == IStatus.ERROR) pluginLog.error(status.getMessage(), status.getException()); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java index 92548a6c9..73a56c688 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/commands/OpenChangePasswordDialog.java @@ -15,10 +15,9 @@ import javax.naming.ldap.LdapName; import javax.security.auth.Subject; import javax.security.auth.x500.X500Principal; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.security.CryptoKeyring; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; +import org.argeo.cms.security.CryptoKeyring; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.osgi.transaction.WorkTransaction; import org.eclipse.core.commands.AbstractHandler; @@ -42,7 +41,7 @@ import org.osgi.service.useradmin.UserAdmin; /** Open the change password dialog */ public class OpenChangePasswordDialog extends AbstractHandler { - private final static Log log = LogFactory.getLog(OpenChangePasswordDialog.class); + private final static CmsLog log = CmsLog.getLog(OpenChangePasswordDialog.class); private UserAdmin userAdmin; private WorkTransaction userTransaction; private CryptoKeyring keyring = null; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java index 8ae330c6c..80c121746 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/AddRemoteRepository.java @@ -9,11 +9,11 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.SimpleCredentials; -import org.argeo.api.NodeConstants; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.jcr.CmsJcrUtils; +import org.argeo.cms.security.Keyring; import org.argeo.cms.ui.workbench.internal.WorkbenchConstants; import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.eclipse.ui.EclipseUiException; @@ -123,7 +123,7 @@ public class AddRemoteRepository extends AbstractHandler implements WorkbenchCon String checkedUriStr = checkedUri.toString(); Hashtable params = new Hashtable(); - params.put(NodeConstants.LABELED_URI, checkedUriStr); + params.put(CmsConstants.LABELED_URI, checkedUriStr); Repository repository = repositoryFactory.getRepository(params); if (username.getText().trim().equals("")) {// anonymous // FIXME make it more generic diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java index d31674afa..d49067f85 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/GetNodeSize.java @@ -22,7 +22,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Compute an approximative size for the selected node(s) */ public class GetNodeSize extends AbstractHandler { - // private final static Log log = LogFactory.getLog(GetNodeSize.class); + // private final static CmsLog log = CmsLog.getLog(GetNodeSize.class); public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".getNodeSize"; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java index dcc0d0ebc..236b2c92e 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/commands/UploadFiles.java @@ -31,7 +31,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Upload local file(s) under the currently selected node */ public class UploadFiles extends AbstractHandler { - // private final static Log log = LogFactory.getLog(ImportFileSystem.class); + // private final static CmsLog log = CmsLog.getLog(ImportFileSystem.class); public Object execute(ExecutionEvent event) throws ExecutionException { diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java index 7f97d5806..e9d531504 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/AbstractJcrQueryEditor.java @@ -9,8 +9,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.eclipse.ui.GenericTableComparator; import org.eclipse.core.runtime.IProgressMonitor; @@ -40,7 +39,7 @@ import org.eclipse.ui.part.EditorPart; /** Executes any JCR query. */ public abstract class AbstractJcrQueryEditor extends EditorPart { - private final static Log log = LogFactory.getLog(AbstractJcrQueryEditor.class); + private final static CmsLog log = CmsLog.getLog(AbstractJcrQueryEditor.class); protected String initialQuery; protected String initialQueryType; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java index b11554c00..da7e7d478 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/ChildNodesPage.java @@ -25,7 +25,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; /** List all children of the current node */ public class ChildNodesPage extends FormPage { - // private final static Log log = LogFactory.getLog(ChildNodesPage.class); + // private final static CmsLog log = CmsLog.getLog(ChildNodesPage.class); private Node currentNode; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java index 367655951..3cf8dc5cf 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/GenericNodePage.java @@ -13,7 +13,7 @@ import javax.jcr.PropertyIterator; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import org.argeo.cms.ui.CmsConstants; +import org.argeo.cms.ui.CmsUiConstants; import org.argeo.cms.ui.workbench.internal.WorkbenchConstants; import org.argeo.eclipse.ui.EclipseUiException; import org.argeo.jcr.JcrUtils; @@ -39,13 +39,13 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; */ public class GenericNodePage extends FormPage implements WorkbenchConstants { - // private final static Log log = LogFactory.getLog(GenericNodePage.class); + // private final static CmsLog log = CmsLog.getLog(GenericNodePage.class); // local constants private final static String JCR_PROPERTY_NAME = "jcr:name"; // Utils - protected DateFormat timeFormatter = new SimpleDateFormat(CmsConstants.DATE_TIME_FORMAT); + protected DateFormat timeFormatter = new SimpleDateFormat(CmsUiConstants.DATE_TIME_FORMAT); // Main business Objects private Node currentNode; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java index fa90a424f..f066e30ee 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/jcr/parts/NodeVersionHistoryPage.java @@ -18,7 +18,7 @@ import javax.jcr.version.VersionHistory; import javax.jcr.version.VersionIterator; import javax.jcr.version.VersionManager; -import org.argeo.cms.ui.CmsConstants; +import org.argeo.cms.ui.CmsUiConstants; import org.argeo.cms.ui.jcr.FullVersioningTreeContentProvider; import org.argeo.cms.ui.jcr.JcrDClickListener; import org.argeo.cms.ui.jcr.VersionLabelProvider; @@ -51,11 +51,11 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout; * enable browsing */ public class NodeVersionHistoryPage extends FormPage implements WorkbenchConstants { - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(NodeVersionHistoryPage.class); // Utils - protected DateFormat timeFormatter = new SimpleDateFormat(CmsConstants.DATE_TIME_FORMAT); + protected DateFormat timeFormatter = new SimpleDateFormat(CmsUiConstants.DATE_TIME_FORMAT); // business objects private Node currentNode; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java index 28e82c5d7..23d1f4b28 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/PartStateChanged.java @@ -10,7 +10,7 @@ import org.eclipse.ui.PlatformUI; /** Manage transaction and part refresh while updating the security model */ public class PartStateChanged implements IPartListener, IStartup { - // private final static Log log = LogFactory.getLog(PartStateChanged.class); + // private final static CmsLog log = CmsLog.getLog(PartStateChanged.class); // private IContextActivation contextActivation; @Override diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java index 67c1c7a9b..c4b6a3c00 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UserAdminWrapper.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.CmsException; import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.osgi.useradmin.UserAdminConf; @@ -94,7 +94,7 @@ public class UserAdminWrapper { if (onlyWritable && "true".equals(readOnly)) continue; - if (baseDn.equalsIgnoreCase(NodeConstants.ROLES_BASEDN)) + if (baseDn.equalsIgnoreCase(CmsConstants.ROLES_BASEDN)) continue; dns.put(baseDn, uri); } diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java index a7782b765..d3ccbe3ea 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewGroup.java @@ -9,8 +9,8 @@ import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.naming.LdapAttrs; import org.argeo.osgi.useradmin.UserAdminConf; +import org.argeo.util.naming.LdapAttrs; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java index bccfff139..de86e88f7 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/commands/NewUser.java @@ -16,8 +16,8 @@ import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper; import org.argeo.cms.auth.UserAdminUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; -import org.argeo.naming.LdapAttrs; import org.argeo.osgi.useradmin.UserAdminConf; +import org.argeo.util.naming.LdapAttrs; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -40,7 +40,7 @@ import org.osgi.service.useradmin.UserAdminEvent; /** Open a wizard that enables creation of a new user. */ public class NewUser extends AbstractHandler { - // private final static Log log = LogFactory.getLog(NewUser.class); + // private final static CmsLog log = CmsLog.getLog(NewUser.class); public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".newUser"; /* DEPENDENCY INJECTION */ diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java index a226c134c..2706bea1b 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupMainPage.java @@ -1,9 +1,9 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts; -import static org.argeo.api.NodeInstance.WORKGROUP; +import static org.argeo.api.cms.CmsData.WORKGROUP; import static org.argeo.cms.auth.UserAdminUtils.setProperty; -import static org.argeo.naming.LdapAttrs.businessCategory; -import static org.argeo.naming.LdapAttrs.description; +import static org.argeo.util.naming.LdapAttrs.businessCategory; +import static org.argeo.util.naming.LdapAttrs.description; import java.util.ArrayList; import java.util.Iterator; @@ -16,7 +16,7 @@ import javax.jcr.Session; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; -import org.argeo.api.NodeInstance; +import org.argeo.api.cms.CmsData; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.UserAdminUtils; @@ -36,8 +36,8 @@ import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; import org.argeo.jcr.JcrUtils; -import org.argeo.naming.LdapAttrs; import org.argeo.osgi.transaction.WorkTransaction; +import org.argeo.util.naming.LdapAttrs; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; @@ -85,12 +85,12 @@ public class GroupMainPage extends FormPage implements ArgeoNames { final static String ID = "GroupEditor.mainPage"; private final UserEditor editor; - private final NodeInstance nodeInstance; + private final CmsData nodeInstance; private final UserAdminWrapper userAdminWrapper; private final Session session; public GroupMainPage(FormEditor editor, UserAdminWrapper userAdminWrapper, Repository repository, - NodeInstance nodeInstance) { + CmsData nodeInstance) { super(editor, ID, "Main"); try { session = repository.login(); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java index 46c891f52..23ad3abe7 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/GroupsView.java @@ -3,9 +3,8 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; @@ -20,8 +19,8 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultD import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; -import org.argeo.naming.LdapAttrs; -import org.argeo.naming.LdapObjs; +import org.argeo.util.naming.LdapAttrs; +import org.argeo.util.naming.LdapObjs; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; @@ -43,7 +42,7 @@ import org.osgi.service.useradmin.UserAdminListener; /** List all groups with filter */ public class GroupsView extends ViewPart implements ArgeoNames { - private final static Log log = LogFactory.getLog(GroupsView.class); + private final static CmsLog log = CmsLog.getLog(GroupsView.class); public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".groupsView"; /* DEPENDENCY INJECTION */ @@ -132,14 +131,14 @@ public class GroupsView extends ViewPart implements ArgeoNames { public MyUserTableViewer(Composite parent, int style) { super(parent, style); - showSystemRoles = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN); + showSystemRoles = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN); } protected void populateStaticFilters(Composite staticFilterCmp) { staticFilterCmp.setLayout(new GridLayout()); final Button showSystemRoleBtn = new Button(staticFilterCmp, SWT.CHECK); showSystemRoleBtn.setText("Show system roles"); - showSystemRoles = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN); + showSystemRoles = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN); showSystemRoleBtn.setSelection(showSystemRoles); showSystemRoleBtn.addSelectionListener(new SelectionAdapter() { @@ -172,7 +171,7 @@ public class GroupsView extends ViewPart implements ArgeoNames { builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=") .append(LdapObjs.groupOfNames.name()).append(")"); if (!showSystemRoles) - builder.append("(!(").append(LdapAttrs.DN).append("=*").append(NodeConstants.ROLES_BASEDN) + builder.append("(!(").append(LdapAttrs.DN).append("=*").append(CmsConstants.ROLES_BASEDN) .append("))"); builder.append("(|"); builder.append(tmpBuilder.toString()); @@ -181,7 +180,7 @@ public class GroupsView extends ViewPart implements ArgeoNames { if (!showSystemRoles) builder.append("(&(").append(LdapAttrs.objectClass.name()).append("=") .append(LdapObjs.groupOfNames.name()).append(")(!(").append(LdapAttrs.DN).append("=*") - .append(NodeConstants.ROLES_BASEDN).append(")))"); + .append(CmsConstants.ROLES_BASEDN).append(")))"); else builder.append("(").append(LdapAttrs.objectClass.name()).append("=") .append(LdapObjs.groupOfNames.name()).append(")"); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java index a6f9c4b3d..9e3b06884 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserBatchUpdateWizard.java @@ -5,9 +5,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.auth.UserAdminUtils; @@ -20,9 +19,9 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserNameLP; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; -import org.argeo.naming.LdapAttrs; -import org.argeo.naming.LdapObjs; import org.argeo.osgi.transaction.WorkTransaction; +import org.argeo.util.naming.LdapAttrs; +import org.argeo.util.naming.LdapObjs; import org.eclipse.jface.dialogs.IPageChangeProvider; import org.eclipse.jface.dialogs.IPageChangedListener; import org.eclipse.jface.dialogs.MessageDialog; @@ -49,7 +48,7 @@ import org.osgi.service.useradmin.UserAdminEvent; /** Wizard to update users */ public class UserBatchUpdateWizard extends Wizard { - private final static Log log = LogFactory.getLog(UserBatchUpdateWizard.class); + private final static CmsLog log = CmsLog.getLog(UserBatchUpdateWizard.class); private UserAdminWrapper userAdminWrapper; // pages @@ -465,7 +464,7 @@ public class UserBatchUpdateWizard extends Wizard { columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200)); // Only show technical DN to admin - if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN)) + if (CurrentUser.isInRole(CmsConstants.ROLE_ADMIN)) columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300)); userTableCmp = new ChooseUserTableViewer(pageCmp, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); @@ -564,7 +563,7 @@ public class UserBatchUpdateWizard extends Wizard { columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150)); columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200)); // Only show technical DN to admin - if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN)) + if (CurrentUser.isInRole(CmsConstants.ROLE_ADMIN)) columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300)); userTableCmp = new ChosenUsersTableViewer(pageCmp, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL); userTableCmp.setLayoutData(EclipseUiUtils.fillAll()); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java index 3acd1850a..ae72fb723 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserEditor.java @@ -5,13 +5,13 @@ import java.util.List; import javax.jcr.Repository; -import org.argeo.api.NodeInstance; +import org.argeo.api.cms.CmsData; import org.argeo.cms.CmsException; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.cms.ui.workbench.internal.useradmin.UiUserAdminListener; import org.argeo.cms.ui.workbench.internal.useradmin.UserAdminWrapper; +import org.argeo.util.naming.LdapAttrs; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.naming.LdapAttrs; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -39,7 +39,7 @@ public class UserEditor extends FormEditor { private Repository repository; private UserAdminWrapper userAdminWrapper; private UserAdmin userAdmin; - private NodeInstance nodeInstance; + private CmsData nodeInstance; // Context private User user; @@ -207,7 +207,7 @@ public class UserEditor extends FormEditor { this.repository = repository; } - public void setNodeInstance(NodeInstance nodeInstance) { + public void setNodeInstance(CmsData nodeInstance) { this.nodeInstance = nodeInstance; } diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java index 8a6da7d65..59051d2f2 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UserMainPage.java @@ -1,17 +1,17 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts; import static org.argeo.cms.auth.UserAdminUtils.getProperty; -import static org.argeo.naming.LdapAttrs.cn; -import static org.argeo.naming.LdapAttrs.givenName; -import static org.argeo.naming.LdapAttrs.mail; -import static org.argeo.naming.LdapAttrs.sn; -import static org.argeo.naming.LdapAttrs.uid; +import static org.argeo.util.naming.LdapAttrs.cn; +import static org.argeo.util.naming.LdapAttrs.givenName; +import static org.argeo.util.naming.LdapAttrs.mail; +import static org.argeo.util.naming.LdapAttrs.sn; +import static org.argeo.util.naming.LdapAttrs.uid; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.auth.CurrentUser; import org.argeo.cms.ui.workbench.CmsWorkbenchStyles; @@ -29,7 +29,7 @@ import org.argeo.cms.swt.CmsSwtUtils; import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; -import org.argeo.naming.LdapAttrs; +import org.argeo.util.naming.LdapAttrs; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.jface.dialogs.MessageDialog; @@ -355,7 +355,7 @@ public class UserMainPage extends FormPage implements ArgeoNames { staticFilterCmp.setLayout(new GridLayout()); showSystemRoleBtn = new Button(staticFilterCmp, SWT.CHECK); showSystemRoleBtn.setText("Show system roles"); - boolean showSysRole = CurrentUser.isInRole(NodeConstants.ROLE_ADMIN); + boolean showSysRole = CurrentUser.isInRole(CmsConstants.ROLE_ADMIN); showSystemRoleBtn.setSelection(showSysRole); userFilter.setShowSystemRole(showSysRole); showSystemRoleBtn.addSelectionListener(new SelectionAdapter() { diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java index b09d59eed..eeab612f3 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/parts/UsersView.java @@ -3,7 +3,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.parts; import java.util.ArrayList; import java.util.List; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; @@ -19,8 +19,8 @@ import org.argeo.cms.ui.workbench.internal.useradmin.providers.UserTableDefaultD import org.argeo.eclipse.ui.ColumnDefinition; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.eclipse.ui.parts.LdifUsersTable; -import org.argeo.naming.LdapAttrs; -import org.argeo.naming.LdapObjs; +import org.argeo.util.naming.LdapAttrs; +import org.argeo.util.naming.LdapObjs; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; @@ -37,7 +37,7 @@ import org.osgi.service.useradmin.UserAdminListener; /** List all users with filter - based on Ldif userAdmin */ public class UsersView extends ViewPart implements ArgeoNames { - // private final static Log log = LogFactory.getLog(UsersView.class); + // private final static CmsLog log = CmsLog.getLog(UsersView.class); public final static String ID = WorkbenchUiPlugin.PLUGIN_ID + ".usersView"; @@ -61,7 +61,7 @@ public class UsersView extends ViewPart implements ArgeoNames { columnDefs.add(new ColumnDefinition(new MailLP(), "E-mail", 150)); columnDefs.add(new ColumnDefinition(new DomainNameLP(), "Domain", 200)); // Only show technical DN to admin - if (CurrentUser.isInRole(NodeConstants.ROLE_ADMIN)) + if (CurrentUser.isInRole(CmsConstants.ROLE_ADMIN)) columnDefs.add(new ColumnDefinition(new UserNameLP(), "Distinguished Name", 300)); diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java index cae230593..793ce4436 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/CommonNameLP.java @@ -1,7 +1,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.naming.LdapAttrs; +import org.argeo.util.naming.LdapAttrs; import org.osgi.service.useradmin.User; /** Simply declare a label provider that returns the common name of a user */ diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java index c411bd20f..e5d8bca33 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/MailLP.java @@ -1,7 +1,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.naming.LdapAttrs; +import org.argeo.util.naming.LdapAttrs; import org.osgi.service.useradmin.User; /** Simply declare a label provider that returns the Primary Mail of a user */ diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java index bd2260bb3..7658be866 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/RoleIconLP.java @@ -1,10 +1,10 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import org.argeo.cms.ui.workbench.internal.useradmin.SecurityAdminImages; -import org.argeo.api.NodeConstants; -import org.argeo.api.NodeInstance; +import org.argeo.util.naming.LdapAttrs; +import org.argeo.api.cms.CmsData; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.naming.LdapAttrs; import org.eclipse.swt.graphics.Image; import org.osgi.service.useradmin.Role; import org.osgi.service.useradmin.User; @@ -22,11 +22,11 @@ public class RoleIconLP extends UserAdminAbstractLP { public Image getImage(Object element) { User user = (User) element; String dn = user.getName(); - if (dn.endsWith(NodeConstants.ROLES_BASEDN)) + if (dn.endsWith(CmsConstants.ROLES_BASEDN)) return SecurityAdminImages.ICON_ROLE; else if (user.getType() == Role.GROUP) { String businessCategory = UserAdminUtils.getProperty(user, LdapAttrs.businessCategory); - if (businessCategory != null && businessCategory.equals(NodeInstance.WORKGROUP)) + if (businessCategory != null && businessCategory.equals(CmsData.WORKGROUP)) return SecurityAdminImages.ICON_WORKGROUP; return SecurityAdminImages.ICON_GROUP; } else diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java index 36278743a..a8261c5b3 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserFilter.java @@ -2,9 +2,9 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import static org.argeo.eclipse.ui.EclipseUiUtils.notEmpty; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.auth.UserAdminUtils; -import org.argeo.naming.LdapAttrs; +import org.argeo.util.naming.LdapAttrs; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.osgi.service.useradmin.User; @@ -37,7 +37,7 @@ public class UserFilter extends ViewerFilter { @Override public boolean select(Viewer viewer, Object parentElement, Object element) { User user = (User) element; - if (!showSystemRole && user.getName().matches(".*(" + NodeConstants.ROLES_BASEDN + ")")) + if (!showSystemRole && user.getName().matches(".*(" + CmsConstants.ROLES_BASEDN + ")")) // UserAdminUtils.getProperty(user, LdifName.dn.name()) // .toLowerCase().endsWith(AuthConstants.ROLES_BASEDN)) return false; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java index 71abe0120..f9b04a93a 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/providers/UserTransactionProvider.java @@ -3,8 +3,7 @@ package org.argeo.cms.ui.workbench.internal.useradmin.providers; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.CmsException; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.argeo.osgi.transaction.WorkTransaction; @@ -13,7 +12,7 @@ import org.eclipse.ui.ISources; /** Observe and notify UI on UserTransaction state changes */ public class UserTransactionProvider extends AbstractSourceProvider { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(UserTransactionProvider.class); public final static String TRANSACTION_STATE = WorkbenchUiPlugin.PLUGIN_ID diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java index ee6263f0e..9368e1c9c 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/jcr/JcrBrowserView.java @@ -13,8 +13,8 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventListener; import javax.jcr.observation.ObservationManager; -import org.argeo.api.NodeConstants; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsConstants; +import org.argeo.cms.security.Keyring; import org.argeo.cms.ui.jcr.DefaultRepositoryRegister; import org.argeo.cms.ui.jcr.JcrBrowserUtils; import org.argeo.cms.ui.jcr.JcrDClickListener; @@ -84,7 +84,7 @@ public class JcrBrowserView extends ViewPart { top.setLayout(gl); try { - this.userSession = this.nodeRepository.login(NodeConstants.HOME_WORKSPACE); + this.userSession = this.nodeRepository.login(CmsConstants.HOME_WORKSPACE); } catch (RepositoryException e) { throw new EclipseUiException("Cannot open user session", e); } diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java index 4fe850826..616dadcf6 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/legacy/rap/OpenFile.java @@ -1,7 +1,6 @@ package org.argeo.cms.ui.workbench.legacy.rap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.rap.rwt.RWT; @@ -25,7 +24,7 @@ import org.eclipse.rap.rwt.client.service.UrlLauncher; *

*/ public class OpenFile extends AbstractHandler { - private final static Log log = LogFactory.getLog(OpenFile.class); + private final static CmsLog log = CmsLog.getLog(OpenFile.class); public final static String ID = SingleSourcingConstants.OPEN_FILE_CMD_ID; public final static String PARAM_FILE_NAME = SingleSourcingConstants.PARAM_FILE_NAME; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java index cdc0e8b58..55a868bcd 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/AdminLogView.java @@ -2,7 +2,7 @@ package org.argeo.cms.ui.workbench.useradmin; import java.util.ArrayList; -import org.argeo.api.ArgeoLogger; +import org.argeo.cms.ArgeoLogger; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.LabelProvider; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java index b65313cc7..84884c65e 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogContentProvider.java @@ -7,7 +7,7 @@ import java.util.Date; import java.util.LinkedList; import java.util.List; -import org.argeo.api.ArgeoLogListener; +import org.argeo.cms.ArgeoLogListener; import org.eclipse.jface.viewers.ILazyContentProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java index b95de6a2a..1af2740a4 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/useradmin/LogView.java @@ -2,8 +2,8 @@ package org.argeo.cms.ui.workbench.useradmin; import java.util.ArrayList; -import org.argeo.api.ArgeoLogListener; -import org.argeo.api.ArgeoLogger; +import org.argeo.cms.ArgeoLogListener; +import org.argeo.cms.ArgeoLogger; import org.argeo.cms.ui.workbench.WorkbenchUiPlugin; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.viewers.LabelProvider; diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java index 81e8d9edf..2bd54d144 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/ApplicationContextTracker.java @@ -2,8 +2,7 @@ package org.argeo.eclipse.spring; import static java.text.MessageFormat.format; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.eclipse.core.runtime.Platform; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -15,7 +14,7 @@ import org.springframework.context.ApplicationContext; /** Tracks Spring application context published as services. */ class ApplicationContextTracker { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(ApplicationContextTracker.class); private static final String FILTER = "(&(objectClass=org.springframework.context.ApplicationContext)" //$NON-NLS-1$ diff --git a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java index 0fb40b0cf..361ff23e5 100644 --- a/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java +++ b/legacy/argeo-commons/org.argeo.cms.ui.workbench/src/org/argeo/eclipse/spring/SpringCommandHandler.java @@ -1,7 +1,6 @@ package org.argeo.eclipse.spring; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.EclipseUiException; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; @@ -11,7 +10,7 @@ import org.springframework.context.ApplicationContext; /** Allows to declare Eclipse commands as Spring beans */ public class SpringCommandHandler implements IHandler { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(SpringCommandHandler.class); public void addHandlerListener(IHandlerListener handlerListener) { diff --git a/legacy/org.argeo.slc.client.rap/.classpath b/legacy/org.argeo.slc.client.rap/.classpath index 06bea9468..a76fff418 100644 --- a/legacy/org.argeo.slc.client.rap/.classpath +++ b/legacy/org.argeo.slc.client.rap/.classpath @@ -2,6 +2,6 @@ - >> + >> diff --git a/legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs b/legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8b45224bc..000000000 --- a/legacy/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Thu Apr 14 17:49:18 CEST 2011 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml b/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml index 6c7654620..0202c77e3 100644 --- a/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml +++ b/legacy/org.argeo.slc.client.rap/META-INF/spring/osgi.xml @@ -17,5 +17,5 @@ + interface="org.argeo.cms.security.CryptoKeyring" /> diff --git a/legacy/org.argeo.slc.client.rap/bnd.bnd b/legacy/org.argeo.slc.client.rap/bnd.bnd index 7b46665df..518826108 100644 --- a/legacy/org.argeo.slc.client.rap/bnd.bnd +++ b/legacy/org.argeo.slc.client.rap/bnd.bnd @@ -12,5 +12,6 @@ javax.servlet.http,\ org.argeo.eclipse.spring,\ org.argeo.slc.repo.core,\ org.argeo.cms.ui.util,\ +org.argeo.api.cms,\ * \ No newline at end of file diff --git a/legacy/org.argeo.slc.client.ui.dist/.classpath b/legacy/org.argeo.slc.client.ui.dist/.classpath index 120e381bb..7c32a3ec0 100644 --- a/legacy/org.argeo.slc.client.ui.dist/.classpath +++ b/legacy/org.argeo.slc.client.ui.dist/.classpath @@ -1,7 +1,7 @@ - + diff --git a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs b/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 7c5d41949..000000000 --- a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -#Wed Dec 08 08:27:02 CET 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs b/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 0e2e53753..000000000 --- a/legacy/org.argeo.slc.client.ui.dist/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -#Wed Dec 08 08:27:02 CET 2010 -eclipse.preferences.version=1 -pluginProject.extensions=false -resolve.requirebundle=false diff --git a/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml b/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml index 324c66f8b..7c33b1399 100644 --- a/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml +++ b/legacy/org.argeo.slc.client.ui.dist/META-INF/spring/osgi.xml @@ -12,7 +12,7 @@ filter="(cn=java)" /> - + diff --git a/legacy/org.argeo.slc.client.ui.dist/bnd.bnd b/legacy/org.argeo.slc.client.ui.dist/bnd.bnd index b075699aa..d4ed89c61 100644 --- a/legacy/org.argeo.slc.client.ui.dist/bnd.bnd +++ b/legacy/org.argeo.slc.client.ui.dist/bnd.bnd @@ -10,7 +10,7 @@ Import-Package: org.argeo.eclipse.spring,\ javax.jcr.nodetype,\ javax.jcr.security,\ aQute.lib.*;resolution:=optional,\ +org.springframework.beans.factory,\ org.osgi.*;version=0.0.0,\ -org.argeo.api,\ * \ No newline at end of file diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java index 27ed484ae..c9bd5590f 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyLocalJavaWorkspace.java @@ -6,8 +6,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.security.Privilege; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ui.workbench.util.PrivilegedJob; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; @@ -37,7 +36,7 @@ import org.eclipse.ui.handlers.HandlerUtil; * JavaRepoManager. */ public class CopyLocalJavaWorkspace extends AbstractHandler { - private static final Log log = LogFactory + private static final CmsLog log = CmsLog .getLog(CopyLocalJavaWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".copyLocalJavaWorkspace"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java index 87db6674b..2618c5c98 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CopyWorkspace.java @@ -8,9 +8,8 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.security.Privilege; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.security.Keyring; import org.argeo.cms.ui.workbench.util.PrivilegedJob; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; @@ -36,7 +35,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Create a copy of the chosen workspace in a remote repository */ public class CopyWorkspace extends AbstractHandler { - private static final Log log = LogFactory.getLog(CopyWorkspace.class); + private static final CmsLog log = CmsLog.getLog(CopyWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".copyWorkspace"; public final static String DEFAULT_LABEL = "Duplicate..."; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java index dd15ecf10..4972bc38e 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateLocalJavaWorkspace.java @@ -1,7 +1,6 @@ package org.argeo.slc.client.ui.dist.commands; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; @@ -16,7 +15,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Create a new empty workspace in the default local java repository */ public class CreateLocalJavaWorkspace extends AbstractHandler { - private static final Log log = LogFactory + private static final CmsLog log = CmsLog .getLog(CreateLocalJavaWorkspace.class); // Exposes commands meta-info diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java index 9934c8689..c034ef641 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/CreateWorkspace.java @@ -8,9 +8,8 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.security.Privilege; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.security.Keyring; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcConstants; @@ -27,7 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Create a new empty workspace in a remote repository */ public class CreateWorkspace extends AbstractHandler { - private static final Log log = LogFactory.getLog(CreateWorkspace.class); + private static final CmsLog log = CmsLog.getLog(CreateWorkspace.class); // Exposes commands meta-info public final static String ID = DistPlugin.PLUGIN_ID + ".createWorkspace"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java index 4caf2b526..bc80827e6 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteArtifacts.java @@ -21,7 +21,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Delete chosen artifacts from the current workspace */ public class DeleteArtifacts extends AbstractHandler { - // private static final Log log = LogFactory.getLog(DeleteWorkspace.class); + // private static final CmsLog log = CmsLog.getLog(DeleteWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".deleteArtifacts"; public final static String DEFAULT_LABEL = "Delete selected items"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java index 4707fc0e6..c2f862d85 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/DeleteWorkspace.java @@ -9,7 +9,7 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; -import org.argeo.api.security.Keyring; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; @@ -29,7 +29,7 @@ import org.eclipse.jface.resource.ImageDescriptor; * {@code NodeType.NT_UNSTRUCTURED} */ public class DeleteWorkspace extends AbstractHandler { - // private static final Log log = LogFactory.getLog(DeleteWorkspace.class); + // private static final CmsLog log = CmsLog.getLog(DeleteWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".deleteWorkspace"; public final static String DEFAULT_LABEL = "Clear"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java index 39a9274d8..ab0e42390 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/Fetch.java @@ -6,7 +6,7 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.api.security.Keyring; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.dist.DistPlugin; @@ -25,7 +25,7 @@ import org.eclipse.ui.handlers.HandlerUtil; * definition of the fetch process parameters */ public class Fetch extends AbstractHandler { - // private final static Log log = LogFactory.getLog(Fetch.class); + // private final static CmsLog log = CmsLog.getLog(Fetch.class); public final static String ID = DistPlugin.PLUGIN_ID + ".fetch"; public final static String DEFAULT_LABEL = "Fetch..."; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java index 6a62a62ee..4ba2e0565 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/MergeWorkspaces.java @@ -10,9 +10,8 @@ import javax.jcr.Session; import javax.jcr.query.Query; import javax.jcr.query.QueryResult; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.security.Keyring; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; @@ -29,7 +28,7 @@ import org.eclipse.core.runtime.jobs.Job; /** Merge two workspaces */ public class MergeWorkspaces extends AbstractHandler { - private final static Log log = LogFactory.getLog(MergeWorkspaces.class); + private final static CmsLog log = CmsLog.getLog(MergeWorkspaces.class); public final static String ID = DistPlugin.PLUGIN_ID + ".mergeWorkspaces"; public final static String DEFAULT_LABEL = "Merge"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java index 2b9b2d05c..03fd9b6b0 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeDistribution.java @@ -14,9 +14,8 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import javax.jcr.util.TraversingItemVisitor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.security.Keyring; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; @@ -59,7 +58,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Legacy - Make sure than Maven and OSGi metadata are consistent */ public class NormalizeDistribution extends AbstractHandler implements SlcNames { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(NormalizeDistribution.class); public final static String ID = DistPlugin.PLUGIN_ID diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java index 73261fed2..617e0f26d 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/NormalizeWorkspace.java @@ -12,9 +12,8 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import javax.jcr.util.TraversingItemVisitor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsLog; +import org.argeo.cms.security.Keyring; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; @@ -43,7 +42,7 @@ import org.eclipse.jface.resource.ImageDescriptor; * must sometimes be triggered manually */ public class NormalizeWorkspace extends AbstractHandler implements SlcNames { - private final static Log log = LogFactory.getLog(NormalizeWorkspace.class); + private final static CmsLog log = CmsLog.getLog(NormalizeWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".normalizeWorkspace"; public final static ImageDescriptor DEFAULT_ICON = DistPlugin.getImageDescriptor("icons/normalize.gif"); diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java index c1b6c12db..19271d116 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/OpenGenerateBinariesWizard.java @@ -15,7 +15,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Open a {@code GenerateBinariesWizard} wizard for the selected node */ public class OpenGenerateBinariesWizard extends AbstractHandler { - // private static final Log log = LogFactory.getLog(DeleteWorkspace.class); + // private static final CmsLog log = CmsLog.getLog(DeleteWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".openGenerateBinariesWizard"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java index b7a75c53b..c308d8024 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java @@ -8,8 +8,8 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.security.Privilege; -import org.argeo.api.NodeConstants; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsConstants; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcConstants; import org.argeo.slc.SlcException; @@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor; /** Publish the current workspace by giving READ_ONLY rights to anonymous */ public class PublishWorkspace extends AbstractHandler { - // private static final Log log = LogFactory.getLog(PublishWorkspace.class); + // private static final CmsLog log = CmsLog.getLog(PublishWorkspace.class); public final static String ID = DistPlugin.PLUGIN_ID + ".publishWorkspace"; public final static String DEFAULT_LABEL = "Make Public"; @@ -48,7 +48,7 @@ public class PublishWorkspace extends AbstractHandler { Session session = null; try { - nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE); + nodeSession = nodeRepository.login(CmsConstants.HOME_WORKSPACE); Node repoNode = nodeSession.getNode(targetRepoPath); Repository repository = RepoUtils.getRepository(repositoryFactory, keyring, repoNode); diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java index f09fd1763..4795ee5de 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RegisterRepository.java @@ -3,8 +3,8 @@ package org.argeo.slc.client.ui.dist.commands; import javax.jcr.Repository; import javax.jcr.RepositoryFactory; -import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; +import org.argeo.cms.security.Keyring; import org.argeo.slc.SlcNames; import org.argeo.slc.client.ui.dist.DistPlugin; import org.argeo.slc.client.ui.dist.utils.CommandHelpers; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java index fc336f6fb..cf267194e 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/RunInOsgi.java @@ -14,8 +14,7 @@ import javax.jcr.Session; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -36,7 +35,7 @@ import org.eclipse.jface.resource.ImageDescriptor; /** UNDER DEVELOPMENT. Download and prepare an OSGi runtime */ public class RunInOsgi extends AbstractHandler implements SlcNames { - private final static Log log = LogFactory.getLog(RunInOsgi.class); + private final static CmsLog log = CmsLog.getLog(RunInOsgi.class); public final static String ID = DistPlugin.PLUGIN_ID + ".runInOsgi"; public final static String DEFAULT_LABEL = "Run in OSGi"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java index 8ff0e4a94..5b610fb80 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/commands/UnregisterRemoteRepo.java @@ -6,7 +6,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.jcr.JcrUtils; @@ -23,7 +23,7 @@ import org.eclipse.jface.resource.ImageDescriptor; * the node Repository. It does not affect the repository instance */ public class UnregisterRemoteRepo extends AbstractHandler { - // private static final Log log = LogFactory + // private static final CmsLog log = CmsLog // .getLog(UnregisterRemoteRepo.class); public final static String ID = DistPlugin.PLUGIN_ID + ".unregisterRemoteRepo"; @@ -42,7 +42,7 @@ public class UnregisterRemoteRepo extends AbstractHandler { return null; try { - session = nodeRepository.login(NodeConstants.HOME_WORKSPACE); + session = nodeRepository.login(CmsConstants.HOME_WORKSPACE); Node rNode = session.getNode(repoPath); if (rNode.isNodeType(ArgeoTypes.ARGEO_REMOTE_REPOSITORY)) { diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java index 52c537469..67c4674e3 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistSessionFactory.java @@ -8,7 +8,7 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.api.security.Keyring; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.repo.RepoUtils; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java index c2e9a8e48..05b11c906 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/controllers/DistTreeContentProvider.java @@ -12,11 +12,11 @@ import javax.jcr.RepositoryFactory; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; -import org.argeo.api.NodeConstants; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.jcr.CmsJcrUtils; +import org.argeo.cms.security.Keyring; import org.argeo.eclipse.ui.TreeParent; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -45,7 +45,7 @@ public class DistTreeContentProvider implements ITreeContentProvider { try { if (nodeSession != null) dispose(); - nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE); + nodeSession = nodeRepository.login(CmsConstants.HOME_WORKSPACE); String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java index c300af1ba..103ffa33c 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/BundleDetailPage.java @@ -5,8 +5,7 @@ import java.net.URL; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; import org.argeo.slc.build.License; @@ -36,7 +35,7 @@ import org.eclipse.ui.forms.widgets.Section; /** Show details for a given bundle. */ public class BundleDetailPage extends FormPage implements SlcNames { - private final static Log log = LogFactory.getLog(BundleDetailPage.class); + private final static CmsLog log = CmsLog.getLog(BundleDetailPage.class); final static String PAGE_ID = "BundleDetailPage"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java index e377b53c8..0923dcd5d 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspBrowserPage.java @@ -49,7 +49,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; */ public class DistWkspBrowserPage extends FormPage implements DistConstants, RepoConstants { - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(ArtifactsBrowserPage.class); final static String PAGE_ID = "artifactsBrowserPage"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java index 167cb5a05..fc81214a4 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWkspSearchPage.java @@ -72,7 +72,7 @@ import org.eclipse.ui.forms.widgets.Section; /** Show all bundles contained in a given workspace as filter-able table */ public class DistWkspSearchPage extends FormPage implements SlcNames { - // final private static Log log = LogFactory + // final private static CmsLog log = CmsLog // .getLog(DistributionOverviewPage.class); final static String PAGE_ID = "distributionOverviewPage"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java index 3f8f98d9b..a628496dc 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/DistWorkspaceEditor.java @@ -6,7 +6,7 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.api.security.Keyring; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java index d3ab885ac..5cb97a053 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/editors/ModularDistVersionOverviewPage.java @@ -20,8 +20,7 @@ import javax.jcr.query.qom.QueryObjectModelFactory; import javax.jcr.query.qom.Selector; import javax.jcr.query.qom.StaticOperand; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.eclipse.ui.EclipseUiUtils; import org.argeo.jcr.JcrUtils; @@ -78,7 +77,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; public class ModularDistVersionOverviewPage extends FormPage implements SlcNames { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(ModularDistVersionOverviewPage.class); final static String PAGE_ID = "ModularDistVersionOverviewPage"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java index 7d4ef1f4b..9356f0828 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/model/RepoElem.java @@ -9,10 +9,10 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.api.NodeConstants; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.jcr.CmsJcrUtils; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.repo.RepoConstants; @@ -23,7 +23,7 @@ import org.argeo.slc.repo.RepoUtils; * home Node or just an URI and a label if user is anonymous */ public class RepoElem extends DistParentElem { - // private final static Log log = LogFactory.getLog(RepoElem.class); + // private final static CmsLog log = CmsLog.getLog(RepoElem.class); private RepositoryFactory repositoryFactory; private Keyring keyring; @@ -93,7 +93,7 @@ public class RepoElem extends DistParentElem { try { // FIXME make it more generic - String defaultWorkspace = NodeConstants.SYS_WORKSPACE; + String defaultWorkspace = CmsConstants.SYS_WORKSPACE; defaultSession = repository.login(credentials, defaultWorkspace); refreshChildren(); } catch (RepositoryException e) { @@ -174,7 +174,7 @@ public class RepoElem extends DistParentElem { protected Session repositoryLogin(String workspaceName) { try { if (workspaceName == null) - workspaceName = NodeConstants.SYS_WORKSPACE;// FIXME make it more generic + workspaceName = CmsConstants.SYS_WORKSPACE;// FIXME make it more generic return repository.login(credentials, workspaceName); } catch (RepositoryException e) { throw new SlcException("Cannot login repository " + label + " with credential " + credentials, e); diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java index dcdfc930d..cc6e788ee 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/ArtifactsTableConfigurer.java @@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.TableColumn; */ public class ArtifactsTableConfigurer implements SlcNames, SlcTypes, DistConstants { - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(ArtifactsTableConfigurer.class); // Used in the comparator to be able to retrieve the value from a row // knowing the corresponding column index. diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java index 14119969f..2977eabf0 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistNodeViewerComparator.java @@ -10,8 +10,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import javax.jcr.ValueFormatException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.GenericTableComparator; import org.argeo.slc.SlcException; import org.eclipse.jface.viewers.Viewer; @@ -20,7 +19,7 @@ import org.eclipse.jface.viewers.Viewer; public class DistNodeViewerComparator extends GenericTableComparator { private static final long serialVersionUID = -5966120108210992211L; - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(DistNodeViewerComparator.class); // Jcr property type goes to 12 diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java index b53fe0196..b611e49d6 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/utils/DistUiHelpers.java @@ -8,15 +8,14 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import javax.jcr.Value; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; import org.argeo.slc.SlcTypes; import org.argeo.slc.client.ui.dist.DistConstants; public class DistUiHelpers implements DistConstants, SlcTypes, SlcNames { - private final static Log log = LogFactory.getLog(DistUiHelpers.class); + private final static CmsLog log = CmsLog.getLog(DistUiHelpers.class); private final static DateFormat df = new SimpleDateFormat(DATE_TIME_FORMAT); /** diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java index e6552ebc1..53af8063f 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AbstractQueryArtifactsView.java @@ -13,8 +13,7 @@ import javax.jcr.query.QueryResult; import javax.jcr.query.Row; import javax.jcr.query.RowIterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.GenericTableComparator; import org.argeo.slc.SlcException; import org.argeo.slc.SlcTypes; @@ -39,7 +38,7 @@ import org.eclipse.ui.part.ViewPart; /** Factorizes useful methods to build a query view in a sashForm */ public abstract class AbstractQueryArtifactsView extends ViewPart implements SlcTypes { - private static final Log log = LogFactory + private static final CmsLog log = CmsLog .getLog(AbstractQueryArtifactsView.class); // shortcuts diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java index b511c4e93..4abfb8634 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java @@ -21,7 +21,7 @@ import org.eclipse.ui.part.ViewPart; */ public class AnonymousDistributionsView extends ViewPart implements SlcNames, ArgeoNames { - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(AnonymousDistributionsView.class); public final static String ID = DistPlugin.PLUGIN_ID + ".anonymousDistributionsView"; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java index 9eef47710..da3dfd285 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/ArtifactsBrowser.java @@ -40,7 +40,7 @@ import org.eclipse.ui.part.ViewPart; public class ArtifactsBrowser extends ViewPart implements DistConstants, RepoConstants { - // private final static Log log = LogFactory.getLog(ArtifactsBrowser.class); + // private final static CmsLog log = CmsLog.getLog(ArtifactsBrowser.class); public final static String ID = DistPlugin.PLUGIN_ID + ".artifactsBrowser"; /* DEPENDENCY INJECTION */ diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java index 9ce41d477..fcbb3f140 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryArtifactsForm.java @@ -18,7 +18,7 @@ import org.eclipse.swt.widgets.Text; /** Query SLC Repo to get some artifacts given some predefined parameters */ public class QueryArtifactsForm extends AbstractQueryArtifactsView implements SlcNames { - // private static final Log log = LogFactory.getLog(QueryArtifactsForm.class); + // private static final CmsLog log = CmsLog.getLog(QueryArtifactsForm.class); public static final String ID = DistPlugin.PLUGIN_ID + ".queryArtifactsForm"; // widgets diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java index c4980d53f..68e3bec72 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/views/QueryBundlesForm.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Text; /** Query SLC Repo to get some artifacts given some predefined parameters */ public class QueryBundlesForm extends AbstractQueryArtifactsView implements SlcNames, SlcTypes { - // private static final Log log = LogFactory.getLog(QueryBundlesForm.class); + // private static final CmsLog log = CmsLog.getLog(QueryBundlesForm.class); public static final String ID = DistPlugin.PLUGIN_ID + ".queryBundlesForm"; // widgets diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java index dfbca8d39..2991f14b5 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/FetchWizard.java @@ -13,10 +13,10 @@ import javax.jcr.RepositoryException; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.api.security.Keyring; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.jcr.CmsJcrUtils; +import org.argeo.cms.security.Keyring; import org.argeo.cms.ui.workbench.util.PrivilegedJob; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; @@ -62,7 +62,7 @@ import org.eclipse.swt.widgets.Text; * object. */ public class FetchWizard extends Wizard { - // private final static Log log = LogFactory.getLog(FetchWizard.class); + // private final static CmsLog log = CmsLog.getLog(FetchWizard.class); // Business objects private Keyring keyring; diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java index 3fbbb2869..8940c0068 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/GenerateBinariesWizard.java @@ -8,8 +8,7 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ui.workbench.util.PrivilegedJob; import org.argeo.eclipse.ui.jcr.EclipseJcrMonitor; import org.argeo.jcr.JcrMonitor; @@ -51,7 +50,7 @@ import org.eclipse.swt.widgets.Text; * artifacts for this group using a {@link GenerateBinaries} runnable */ public class GenerateBinariesWizard extends Wizard { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(GenerateBinariesWizard.class); // Business objects diff --git a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java index 31e726a03..b4d920a29 100644 --- a/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java +++ b/legacy/org.argeo.slc.client.ui.dist/src/org/argeo/slc/client/ui/dist/wizards/RegisterRepoWizard.java @@ -11,11 +11,11 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import javax.jcr.nodetype.NodeType; -import org.argeo.api.NodeConstants; -import org.argeo.api.security.Keyring; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.jcr.CmsJcrUtils; +import org.argeo.cms.security.Keyring; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -88,7 +88,7 @@ public class RegisterRepoWizard extends Wizard { Session nodeSession = null; try { - nodeSession = nodeRepository.login(NodeConstants.HOME_WORKSPACE); + nodeSession = nodeRepository.login(CmsConstants.HOME_WORKSPACE); String reposPath = CmsJcrUtils.getUserHome(nodeSession).getPath() + RepoConstants.REPOSITORIES_BASE_PATH; Node repos = nodeSession.getNode(reposPath); diff --git a/legacy/org.argeo.slc.client.ui/.classpath b/legacy/org.argeo.slc.client.ui/.classpath index 120e381bb..7c32a3ec0 100644 --- a/legacy/org.argeo.slc.client.ui/.classpath +++ b/legacy/org.argeo.slc.client.ui/.classpath @@ -1,7 +1,7 @@ - + diff --git a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs b/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 95d6b05d7..000000000 --- a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Wed Aug 04 16:31:36 CEST 2010 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs b/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs deleted file mode 100644 index 31cbfaeee..000000000 --- a/legacy/org.argeo.slc.client.ui/.settings/org.eclipse.pde.core.prefs +++ /dev/null @@ -1,3 +0,0 @@ -#Tue Jul 27 14:24:51 CEST 2010 -eclipse.preferences.version=1 -resolve.requirebundle=false diff --git a/legacy/org.argeo.slc.client.ui/bnd.bnd b/legacy/org.argeo.slc.client.ui/bnd.bnd index d24c331e7..497210cbc 100644 --- a/legacy/org.argeo.slc.client.ui/bnd.bnd +++ b/legacy/org.argeo.slc.client.ui/bnd.bnd @@ -7,7 +7,6 @@ org.eclipse.rap.ui.workbench;resolution:=optional Bundle-Activator: org.argeo.slc.client.ui.ClientUiPlugin Import-Package: org.argeo.eclipse.spring,\ -org.argeo.api,\ org.eclipse.core.runtime,\ org.osgi.*;version=0.0.0,\ * diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java index 7cf8509b7..6b9802702 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/commands/UpdateModule.java @@ -6,8 +6,7 @@ import java.util.Map; import javax.jcr.Node; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.BasicNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -27,7 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Deletes one or many results */ public class UpdateModule extends AbstractHandler { - private final static Log log = LogFactory.getLog(UpdateModule.class); + private final static CmsLog log = CmsLog.getLog(UpdateModule.class); private ModulesManager modulesManager; diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java index 9d91cc544..d8a541230 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java @@ -28,7 +28,7 @@ public class ResultFailedDecorator extends LabelProvider implements // FIXME why not use? org.eclipse.jface.viewers.DecoratingLabelProvider - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(ResultFailedDecorator.class); private final static DateFormat dateFormat = new SimpleDateFormat( diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java index 38db84a3c..022460fbb 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/editors/ProcessEditor.java @@ -11,7 +11,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.eclipse.ui.dialogs.ErrorFeedback; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -54,7 +54,7 @@ public class ProcessEditor extends FormEditor implements SlcTypes, SlcNames { pushSession = new ServerPushSession(); pushSession.start(); try { - homeSession = repository.login(NodeConstants.HOME_WORKSPACE); + homeSession = repository.login(CmsConstants.HOME_WORKSPACE); agentSession = repository.login(); } catch (RepositoryException e1) { throw new SlcException("Cannot log in to repository"); diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java index c6ffcd8d9..79963982b 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/model/ParentNodeFolder.java @@ -23,7 +23,7 @@ import org.argeo.slc.SlcTypes; * and keeps a reference to its parent. */ public class ParentNodeFolder extends ResultParent { - // private final static Log log = LogFactory.getLog(ParentNodeFolder.class); + // private final static CmsLog log = CmsLog.getLog(ParentNodeFolder.class); private Node node = null; diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java index 3c418d63c..5555e9cac 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java @@ -17,7 +17,7 @@ import org.eclipse.swt.graphics.Image; /** Basic label provider for a tree of result */ public class ResultTreeLabelProvider extends LabelProvider { - // private final static Log log = LogFactory + // private final static CmsLog log = CmsLog // .getLog(ResultTreeLabelProvider.class); @Override diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java index 6ddc1974c..b667ef751 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java @@ -19,8 +19,7 @@ import javax.jcr.observation.Event; import javax.jcr.query.Query; import javax.jcr.query.QueryManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider; import org.argeo.eclipse.ui.jcr.NodeElementComparer; @@ -57,7 +56,7 @@ import org.eclipse.ui.part.ViewPart; /** JCR based view of the execution modules. */ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, SlcNames { - private final static Log log = LogFactory.getLog(JcrExecutionModulesView.class); + private final static CmsLog log = CmsLog.getLog(JcrExecutionModulesView.class); public static final String ID = ClientUiPlugin.ID + ".jcrExecutionModulesView"; diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java index 7a921441f..2fcf77b39 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java @@ -16,7 +16,7 @@ import javax.jcr.observation.EventListener; import javax.jcr.observation.ObservationManager; import javax.jcr.query.Query; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -65,7 +65,7 @@ public class JcrProcessListView extends ViewPart { pushSession = new ServerPushSession(); pushSession.start(); try { - session = repository.login(NodeConstants.HOME_WORKSPACE); + session = repository.login(CmsConstants.HOME_WORKSPACE); } catch (RepositoryException re) { throw new SlcException("Unable to log in Repository " + repository, re); } diff --git a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java index 824dcfd72..e74d4c8f6 100644 --- a/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java +++ b/legacy/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java @@ -18,7 +18,7 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventListener; import javax.jcr.observation.ObservationManager; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.cms.ui.workbench.util.CommandUtils; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.jcr.JcrUtils; @@ -125,7 +125,7 @@ public class JcrResultTreeView extends ViewPart { @Override public void createPartControl(Composite parent) { try { - session = repository.login(NodeConstants.HOME_WORKSPACE); + session = repository.login(CmsConstants.HOME_WORKSPACE); } catch (RepositoryException e1) { throw new SlcException("Cannot log in to repository"); } diff --git a/legacy/org.argeo.slc.spring/bnd.bnd b/legacy/org.argeo.slc.spring/bnd.bnd index 682a5ea24..4b1e53439 100644 --- a/legacy/org.argeo.slc.spring/bnd.bnd +++ b/legacy/org.argeo.slc.spring/bnd.bnd @@ -1,6 +1,5 @@ Import-Package: javax.jcr.nodetype,\ javax.jcr.security,\ -org.argeo.api,\ aQute.bnd.osgi,\ org.apache.tools.ant.*;resolution:="optional",\ junit.framework;resolution:="optional",\ diff --git a/legacy/org.argeo.slc.spring/build.properties b/legacy/org.argeo.slc.spring/build.properties index 25c77f274..c90717773 100644 --- a/legacy/org.argeo.slc.spring/build.properties +++ b/legacy/org.argeo.slc.spring/build.properties @@ -1,8 +1,5 @@ additional.bundles = org.springframework.context,\ org.slf4j.api,\ - org.slf4j.commons.logging,\ - org.slf4j.log4j12,\ - org.apache.log4j,\ org.springframework.aop,\ org.springframework.aspects,\ org.springframework.beans,\ diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java index e433d6694..bf2be685d 100644 --- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java +++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/deploy/DefaultResourceSetTest.java @@ -2,13 +2,12 @@ package org.argeo.slc.core.deploy; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.core.test.context.AbstractInternalSpringTestCase; import org.springframework.core.io.Resource; public class DefaultResourceSetTest extends AbstractInternalSpringTestCase { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(DefaultResourceSetTest.class); public void testListResources() { diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java index 3a5e8a75b..104783780 100644 --- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java +++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/AbstractExecutionFlowTestCase.java @@ -2,8 +2,7 @@ package org.argeo.slc.core.execution; import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.runtime.test.SimpleTestResult; @@ -14,7 +13,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public abstract class AbstractExecutionFlowTestCase extends TestCase { - protected final Log log = LogFactory.getLog(getClass()); + protected final CmsLog log = CmsLog.getLog(getClass()); protected void logException(Throwable ex) { log.info("Got Exception of class " + ex.getClass().toString() diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java index 7ba7c826a..658ff3424 100644 --- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java +++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/ExceptionIfInitCalledTwice.java @@ -1,12 +1,11 @@ package org.argeo.slc.core.execution; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.beans.factory.InitializingBean; public class ExceptionIfInitCalledTwice implements Runnable, InitializingBean { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(ExceptionIfInitCalledTwice.class); private Boolean calledOnce = false; diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java index b007b9a54..19fb1efa8 100644 --- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java +++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/execution/tasks/SystemCallTest.java @@ -1,11 +1,10 @@ package org.argeo.slc.core.execution.tasks; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.core.execution.AbstractExecutionFlowTestCase; public class SystemCallTest extends AbstractExecutionFlowTestCase { - private final static Log log = LogFactory.getLog(SystemCallTest.class); + private final static CmsLog log = CmsLog.getLog(SystemCallTest.class); private final String defFile = "systemCall.xml"; diff --git a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java index 507bb41bf..2068dc9a5 100644 --- a/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java +++ b/legacy/org.argeo.slc.spring/ext/test/org/argeo/slc/core/test/context/AbstractInternalSpringTestCase.java @@ -4,8 +4,7 @@ import java.util.Map; import junit.framework.TestCase; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; @@ -14,7 +13,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** Helper for tests using a Spring application context. */ public abstract class AbstractInternalSpringTestCase extends TestCase { - protected final Log log = LogFactory.getLog(getClass()); + protected final CmsLog log = CmsLog.getLog(getClass()); private ConfigurableApplicationContext context; /** diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java index 238e2255c..c073b1155 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/ant/AntRun.java @@ -7,18 +7,17 @@ import java.util.List; import java.util.Map; import java.util.Vector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.tools.ant.BuildEvent; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.ProjectHelper; import org.apache.tools.ant.helper.ProjectHelper2; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.core.io.Resource; public class AntRun implements Runnable { - private final static Log log = LogFactory.getLog(AntRun.class); + private final static CmsLog log = CmsLog.getLog(AntRun.class); private Resource buildFile; private File baseDir; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java index b5c9e3cd4..fc2a2924d 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/attachment/FileAttachmentsStorage.java @@ -12,8 +12,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.attachment.Attachment; import org.argeo.slc.attachment.AttachmentsStorage; @@ -22,7 +21,7 @@ import org.springframework.core.io.Resource; public class FileAttachmentsStorage implements AttachmentsStorage, AttachmentUploader, InitializingBean { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(FileAttachmentsStorage.class); private File attachmentsDirectory; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java index a5b8536df..f131dee89 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/DefaultResourceSet.java @@ -7,8 +7,7 @@ import java.util.Map; import java.util.StringTokenizer; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ResourceLoaderAware; @@ -21,7 +20,7 @@ import org.springframework.util.PathMatcher; public class DefaultResourceSet implements ResourceLoaderAware, InitializingBean, ResourceSet { - private final static Log log = LogFactory.getLog(DefaultResourceSet.class); + private final static CmsLog log = CmsLog.getLog(DefaultResourceSet.class); public final static String DEFAULT_EXCLUDES = "**/.svn/**"; private String base; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java index 6c9336854..10b399875 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/SimpleExecutables.java @@ -4,15 +4,14 @@ import java.io.File; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.build.Distribution; import org.argeo.slc.deploy.DeploymentData; import org.argeo.slc.deploy.InstalledExecutables; import org.argeo.slc.deploy.TargetData; public class SimpleExecutables implements InstalledExecutables { - private final static Log log = LogFactory.getLog(SimpleExecutables.class); + private final static CmsLog log = CmsLog.getLog(SimpleExecutables.class); private String baseDir; private Map paths = new TreeMap(); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java index 40f6735e0..96df26bd9 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/deploy/VersionedDirSync.java @@ -4,8 +4,7 @@ import java.io.File; import java.io.IOException; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.deploy.VersioningDriver; @@ -14,7 +13,7 @@ import org.argeo.slc.deploy.VersioningDriver; * information if possible. */ public class VersionedDirSync implements Runnable { - private final static Log log = LogFactory.getLog(VersionedDirSync.class); + private final static CmsLog log = CmsLog.getLog(VersionedDirSync.class); private VersioningDriver versioningDriver; private File dir; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java index 19861151a..9ccfaa488 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/AbstractExecutionFlowGenerator.java @@ -3,8 +3,7 @@ package org.argeo.slc.core.execution; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.beans.BeansException; import org.springframework.beans.MutablePropertyValues; @@ -18,7 +17,7 @@ import org.springframework.core.PriorityOrdered; public abstract class AbstractExecutionFlowGenerator implements BeanFactoryPostProcessor, PriorityOrdered { - private final Log log = LogFactory.getLog(getClass()); + private final CmsLog log = CmsLog.getLog(getClass()); protected abstract Map createExecutionFlowDefinitions( ConfigurableListableBeanFactory beanFactory); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java index 0bdeb53bb..d85dbd070 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionFlowDescriptorConverter.java @@ -7,8 +7,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionFlowDescriptorConverter; @@ -42,7 +41,7 @@ public class DefaultExecutionFlowDescriptorConverter implements /** Workaround for https://www.spartadn.com/bugzilla/show_bug.cgi?id=206 */ private final static String REF_VALUE_INTERNAL = "[internal]"; - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(DefaultExecutionFlowDescriptorConverter.class); private ApplicationContext applicationContext; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java index e603f71a7..b7ebe6c1a 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/DefaultExecutionSpec.java @@ -3,8 +3,7 @@ package org.argeo.slc.core.execution; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.execution.ExecutionSpecAttribute; import org.argeo.slc.execution.RefSpecAttribute; import org.argeo.slc.execution.RefValueChoice; @@ -22,7 +21,7 @@ import org.springframework.context.ConfigurableApplicationContext; public class DefaultExecutionSpec extends org.argeo.slc.runtime.DefaultExecutionSpec implements BeanNameAware, ApplicationContextAware, InitializingBean { private static final long serialVersionUID = 5159882223926926539L; - private final static Log log = LogFactory.getLog(DefaultExecutionSpec.class); + private final static CmsLog log = CmsLog.getLog(DefaultExecutionSpec.class); private transient ApplicationContext applicationContext; public DefaultExecutionSpec() { diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java index 2fb23488c..2275ee947 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionAspect.java @@ -1,7 +1,6 @@ package org.argeo.slc.core.execution; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionStack; @@ -13,7 +12,7 @@ import org.aspectj.lang.annotation.Pointcut; @Aspect /** Aspect intercepting calls on execution flows and contexts. */ public class ExecutionAspect { - private final static Log log = LogFactory.getLog(ExecutionAspect.class); + private final static CmsLog log = CmsLog.getLog(ExecutionAspect.class); private ExecutionStack executionStack; private ExecutionContext executionContext; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java index 75105045e..85d96c89e 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionParameterPostProcessor.java @@ -7,8 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; @@ -35,7 +34,7 @@ import org.springframework.util.StringUtils; public class ExecutionParameterPostProcessor extends InstantiationAwareBeanPostProcessorAdapter { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(ExecutionParameterPostProcessor.class); private ExecutionContext executionContext; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java index 19296ab08..0e08f9228 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ExecutionScope.java @@ -1,7 +1,6 @@ package org.argeo.slc.core.execution; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.UnsupportedException; import org.argeo.slc.execution.ExecutionContext; @@ -17,7 +16,7 @@ import org.springframework.beans.factory.config.Scope; * reused across an execution. */ public class ExecutionScope implements Scope { - private final static Log log = LogFactory.getLog(ExecutionScope.class); + private final static CmsLog log = CmsLog.getLog(ExecutionScope.class); private final ThreadLocal executionStack = new ThreadLocal(); public final ThreadLocal executionStackBeanName = new ThreadLocal(); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java index 41fb6941a..b102639b1 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/FileExecutionResources.java @@ -9,8 +9,7 @@ import java.text.SimpleDateFormat; import java.util.Date; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionContext; import org.springframework.core.io.FileSystemResource; @@ -19,7 +18,7 @@ import org.springframework.util.Assert; /** Implements write access to resources based on standard Java {@link File} */ public class FileExecutionResources implements ExecutionResources { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(FileExecutionResources.class); protected final static String DEFAULT_EXECUTION_RESOURCES_DIRNAME = "executionResources"; public final static String DEFAULT_EXECUTION_RESOURCES_TMP_PATH = System diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java index 093f78184..67da8ce7e 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/ParameterRef.java @@ -1,12 +1,11 @@ package org.argeo.slc.core.execution; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.runtime.InstantiationManager; import org.springframework.beans.factory.FactoryBean; public class ParameterRef implements FactoryBean { - private final static Log log = LogFactory.getLog(ParameterRef.class); + private final static CmsLog log = CmsLog.getLog(ParameterRef.class); private InstantiationManager instantiationManager; private String name; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java index 0e06f4e17..121ba1f41 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/ExecutionFlowGenerator.java @@ -2,8 +2,7 @@ package org.argeo.slc.core.execution.generator; import java.util.HashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.aop.scope.ScopedProxyUtils; import org.springframework.beans.BeansException; @@ -28,7 +27,7 @@ import org.springframework.core.Ordered; public class ExecutionFlowGenerator implements BeanFactoryPostProcessor, Ordered { - private final Log log = LogFactory.getLog(getClass()); + private final CmsLog log = CmsLog.getLog(getClass()); /** * Source providing a list of RunnableCallFlowDescriptor diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/RunnableCallFlow.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/RunnableCallFlow.java index 04043acff..105b8ee9c 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/RunnableCallFlow.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/generator/RunnableCallFlow.java @@ -5,8 +5,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.DefaultExecutionSpec; import org.argeo.slc.execution.ExecutionContext; @@ -23,7 +22,7 @@ import org.springframework.context.ApplicationContextAware; */ public class RunnableCallFlow implements ExecutionFlow, ApplicationContextAware { - private final static Log log = LogFactory.getLog(RunnableCallFlow.class); + private final static CmsLog log = CmsLog.getLog(RunnableCallFlow.class); /** * Key in the execution context for the index of the call (e.g. 0 for the diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/Echo.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/Echo.java index 87140246f..19584b7dd 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/Echo.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/Echo.java @@ -4,16 +4,15 @@ import java.io.File; import java.io.IOException; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.core.io.Resource; public class Echo implements Runnable { - private final static Log defaultLog = LogFactory.getLog(Echo.class); + private final static CmsLog defaultLog = CmsLog.getLog(Echo.class); private Resource writeTo = null; - private Log log; + private CmsLog log; private Object message; public void run() { @@ -32,7 +31,7 @@ public class Echo implements Runnable { } } - private Log log() { + private CmsLog log() { return log != null ? log : defaultLog; } diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/SystemCall.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/SystemCall.java index 633f8f950..81b6915e8 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/SystemCall.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/tasks/SystemCall.java @@ -30,8 +30,7 @@ import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.exec.ShutdownHookProcessDestroyer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.UnsupportedException; import org.argeo.slc.core.execution.ExecutionResources; @@ -44,7 +43,7 @@ import org.springframework.core.io.Resource; public class SystemCall implements Runnable { public final static String LOG_STDOUT = "System.out"; - private final Log log = LogFactory.getLog(getClass()); + private final CmsLog log = CmsLog.getLog(getClass()); private String execDir; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/AsFlowDecorator.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/AsFlowDecorator.java index b68d9c77d..add4e0a2f 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/AsFlowDecorator.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/AsFlowDecorator.java @@ -1,7 +1,6 @@ package org.argeo.slc.core.execution.xml; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.DefaultExecutionFlow; import org.argeo.slc.execution.ExecutionFlow; @@ -17,7 +16,7 @@ import org.w3c.dom.Node; /** Publishes a {@link Runnable} as an {@link ExecutionFlow} */ public class AsFlowDecorator implements BeanDefinitionDecorator { - private Log log = LogFactory.getLog(AsFlowDecorator.class); + private CmsLog log = CmsLog.getLog(AsFlowDecorator.class); public BeanDefinitionHolder decorate(Node node, BeanDefinitionHolder bean, ParserContext ctx) { diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/FlowBeanDefinitionParser.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/FlowBeanDefinitionParser.java index 60e869992..122b40111 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/FlowBeanDefinitionParser.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/FlowBeanDefinitionParser.java @@ -3,8 +3,7 @@ package org.argeo.slc.core.execution.xml; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.DefaultExecutionFlow; import org.argeo.slc.execution.ExecutionFlow; @@ -25,7 +24,7 @@ import org.w3c.dom.NodeList; /** Interprets the tag */ public class FlowBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { - private Log log = LogFactory.getLog(FlowBeanDefinitionParser.class); + private CmsLog log = CmsLog.getLog(FlowBeanDefinitionParser.class); /** Whether the user has already be warned on path attribute usage. */ private Boolean warnedAboutPathAttribute = false; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/NamespaceUtils.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/NamespaceUtils.java index baa01524f..aa2f00abd 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/NamespaceUtils.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/NamespaceUtils.java @@ -15,7 +15,7 @@ import org.w3c.dom.NodeList; * converting it into bean definitions. */ public class NamespaceUtils { - // private final static Log log = LogFactory.getLog(NamespaceUtils.class); + // private final static CmsLog log = CmsLog.getLog(NamespaceUtils.class); /** * Returns the value defined either: directly by the the 'value' attribute, diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java index 937e8d02d..2867fc993 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/core/execution/xml/SpecBeanDefinitionParser.java @@ -2,8 +2,7 @@ package org.argeo.slc.core.execution.xml; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.core.execution.DefaultExecutionSpec; import org.argeo.slc.execution.RefSpecAttribute; import org.argeo.slc.execution.RefValueChoice; @@ -21,7 +20,7 @@ import org.w3c.dom.Element; /** Interprets the tag */ public class SpecBeanDefinitionParser extends AbstractSingleBeanDefinitionParser { - private Log log = LogFactory.getLog(SpecBeanDefinitionParser.class); + private CmsLog log = CmsLog.getLog(SpecBeanDefinitionParser.class); @Override protected void doParse(Element element, ParserContext parserContext, diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/BundlesManager.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/BundlesManager.java index 6563d3951..2e2fdc5a5 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/BundlesManager.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/BundlesManager.java @@ -2,8 +2,7 @@ package org.argeo.slc.osgi; import java.util.Collection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.eclipse.gemini.blueprint.context.BundleContextAware; import org.eclipse.gemini.blueprint.context.event.OsgiBundleApplicationContextEvent; @@ -33,7 +32,7 @@ import org.springframework.util.Assert; public class BundlesManager implements BundleContextAware, FrameworkListener, InitializingBean, DisposableBean, OsgiBundleApplicationContextListener { - private final static Log log = LogFactory.getLog(BundlesManager.class); + private final static CmsLog log = CmsLog.getLog(BundlesManager.class); private BundleContext bundleContext; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/FileSystemBundleRegister.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/FileSystemBundleRegister.java index 605c797e6..947f79187 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/FileSystemBundleRegister.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/FileSystemBundleRegister.java @@ -8,13 +8,12 @@ import java.util.jar.JarFile; import java.util.jar.Manifest; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.osgi.framework.Constants; /** Experimental */ public class FileSystemBundleRegister implements BundleRegister { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(FileSystemBundleRegister.class); private Properties packagesBundles = null; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java index 01509c273..958a858f7 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/MultipleServiceExporterPostProcessor.java @@ -7,8 +7,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; @@ -22,7 +21,7 @@ import org.springframework.core.Ordered; @SuppressWarnings(value = { "unchecked", "rawtypes" }) public class MultipleServiceExporterPostProcessor implements ApplicationListener, Ordered { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(MultipleServiceExporterPostProcessor.class); private List interfaces = new ArrayList(); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModule.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModule.java index ca3f5faa7..e5d3d470f 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModule.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModule.java @@ -1,13 +1,12 @@ package org.argeo.slc.osgi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.core.execution.AbstractSpringExecutionModule; import org.argeo.slc.execution.ExecutionContext; @Deprecated public class OsgiExecutionModule extends AbstractSpringExecutionModule { - private final static Log log = LogFactory.getLog(OsgiExecutionModule.class); + private final static CmsLog log = CmsLog.getLog(OsgiExecutionModule.class); public OsgiExecutionModule() { log.error("######## ERROR - DEPRECATED APPROACH USED ########"); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java index 63eb6f9a4..a4c570c82 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionModulesManager.java @@ -15,8 +15,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import javax.management.StandardMBean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -45,7 +44,7 @@ public class OsgiExecutionModulesManager extends AbstractExecutionModulesManager implements OsgiServiceLifecycleListener, BundleListener { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(OsgiExecutionModulesManager.class); private BundlesManager bundlesManager; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionResources.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionResources.java index 3668b9123..2267b809a 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionResources.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/OsgiExecutionResources.java @@ -3,8 +3,7 @@ package org.argeo.slc.osgi; import java.io.File; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.FileExecutionResources; import org.eclipse.gemini.blueprint.context.BundleContextAware; @@ -15,7 +14,7 @@ import org.springframework.core.io.Resource; /** Write access to resources in an OSGi context */ public class OsgiExecutionResources extends FileExecutionResources implements BundleContextAware { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(OsgiExecutionResources.class); private BundleContext bundleContext; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java index 61380c0eb..6b0e07051 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/AbstractOsgiModularDistribution.java @@ -8,8 +8,7 @@ import java.util.Set; import java.util.SortedMap; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -23,7 +22,7 @@ import org.springframework.beans.factory.InitializingBean; public abstract class AbstractOsgiModularDistribution implements ModularDistribution, BundleContextAware, InitializingBean { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(AbstractOsgiModularDistribution.class); private BundleContext bundleContext; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java index acc4bab36..fc75d6522 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/osgi/build/OsgiRuntimeModularDistribution.java @@ -3,8 +3,7 @@ package org.argeo.slc.osgi.build; import java.net.URL; import java.util.SortedMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; import org.argeo.slc.core.build.VersionedResourceDistribution; @@ -17,7 +16,7 @@ import org.springframework.core.io.ResourceLoader; public class OsgiRuntimeModularDistribution extends AbstractOsgiModularDistribution implements ResourceLoaderAware { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(OsgiRuntimeModularDistribution.class); private ResourceLoader resourceLoader; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java index 2c12838cd..27857e4cf 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/AbstractSystemExecution.java @@ -4,14 +4,13 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; /** Provides base method for executing code with system authorization. */ abstract class AbstractSystemExecution { - private final static Log log = LogFactory.getLog(AbstractSystemExecution.class); + private final static CmsLog log = CmsLog.getLog(AbstractSystemExecution.class); private final Subject subject = new Subject(); /** Authenticate the calling thread */ @@ -19,7 +18,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.login(); } catch (LoginException e) { throw new SlcException("Cannot login as system", e); @@ -34,7 +33,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.logout(); } catch (LoginException e) { throw new SlcException("Cannot logout as system", e); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java index eb1d73155..7ec36bc1b 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/AbstractSystemExecution.java @@ -4,14 +4,13 @@ import javax.security.auth.Subject; import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsAuth; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; /** Provides base method for executing code with system authorization. */ abstract class AbstractSystemExecution { - private final static Log log = LogFactory.getLog(AbstractSystemExecution.class); + private final static CmsLog log = CmsLog.getLog(AbstractSystemExecution.class); private final Subject subject = new Subject(); /** Authenticate the calling thread */ @@ -19,7 +18,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.login(); } catch (LoginException e) { throw new SlcException("Cannot login as system", e); @@ -34,7 +33,7 @@ abstract class AbstractSystemExecution { ClassLoader origClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { - LoginContext lc = new LoginContext(NodeConstants.LOGIN_CONTEXT_DATA_ADMIN, subject); + LoginContext lc = new LoginContext(CmsAuth.LOGIN_CONTEXT_DATA_ADMIN, subject); lc.logout(); } catch (LoginException e) { throw new SlcException("Cannot logout as system", e); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java index 7c4d87087..94478f00a 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/auth/SimpleRoleRegistration.java @@ -7,8 +7,7 @@ import java.util.Map; import javax.naming.InvalidNameException; import javax.naming.ldap.LdapName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.osgi.transaction.WorkTransaction; import org.argeo.slc.SlcException; import org.osgi.service.useradmin.Role; @@ -19,7 +18,7 @@ import org.osgi.service.useradmin.UserAdmin; * is already registered. */ public class SimpleRoleRegistration implements Runnable { - private final static Log log = LogFactory.getLog(SimpleRoleRegistration.class); + private final static CmsLog log = CmsLog.getLog(SimpleRoleRegistration.class); private String role; private List roles = new ArrayList(); diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/BndWrapper.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/BndWrapper.java index 8b52c9a35..1b4650bf8 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/BndWrapper.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/BndWrapper.java @@ -1,11 +1,10 @@ package org.argeo.slc.spring.repo.osgi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.springframework.beans.factory.BeanNameAware; public class BndWrapper extends org.argeo.slc.repo.osgi.BndWrapper implements BeanNameAware { - private final static Log log = LogFactory.getLog(BndWrapper.class); + private final static CmsLog log = CmsLog.getLog(BndWrapper.class); @Override public void setBeanName(String name) { diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/MavenWrapper.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/MavenWrapper.java index f351a5b84..4c4c9fe76 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/MavenWrapper.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/MavenWrapper.java @@ -1,11 +1,10 @@ package org.argeo.slc.spring.repo.osgi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.springframework.beans.factory.BeanNameAware; public class MavenWrapper extends org.argeo.slc.repo.osgi.MavenWrapper implements BeanNameAware { - private final static Log log = LogFactory.getLog(MavenWrapper.class); + private final static CmsLog log = CmsLog.getLog(MavenWrapper.class); @Override public void setBeanName(String name) { diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/UriWrapper.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/UriWrapper.java index 1b5edd12e..1452ab7ac 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/UriWrapper.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/repo/osgi/UriWrapper.java @@ -1,11 +1,10 @@ package org.argeo.slc.spring.repo.osgi; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.springframework.beans.factory.BeanNameAware; public class UriWrapper extends org.argeo.slc.repo.osgi.UriWrapper implements BeanNameAware { - private final static Log log = LogFactory.getLog(UriWrapper.class); + private final static CmsLog log = CmsLog.getLog(UriWrapper.class); @Override public void setBeanName(String name) { diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java index 65dfa55c9..e72678d48 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractOsgiRuntimeTestCase.java @@ -5,8 +5,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.init.osgi.OsgiBoot; import org.argeo.slc.SlcException; import org.eclipse.core.runtime.adaptor.EclipseStarter; @@ -21,7 +20,7 @@ import junit.framework.TestCase; @SuppressWarnings("restriction") public abstract class AbstractOsgiRuntimeTestCase extends TestCase { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(AbstractOsgiRuntimeTestCase.class); protected OsgiBoot osgiBoot = null; diff --git a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java index ec532eb13..aab613903 100644 --- a/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java +++ b/legacy/org.argeo.slc.spring/src/org/argeo/slc/spring/unit/AbstractSpringTestCase.java @@ -2,8 +2,7 @@ package org.argeo.slc.spring.unit; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.ListableBeanFactory; @@ -14,7 +13,7 @@ import junit.framework.TestCase; /** Helper for tests using a Spring application co,text. */ public abstract class AbstractSpringTestCase extends TestCase { - protected final Log log = LogFactory.getLog(getClass()); + protected final CmsLog log = CmsLog.getLog(getClass()); private ConfigurableApplicationContext context; /** diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java index 59c0acfae..3c48f10fa 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/AbstractJschTask.java @@ -4,8 +4,7 @@ import java.io.IOException; import java.io.InputStream; import java.security.PrivilegedAction; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import com.jcraft.jsch.JSch; @@ -15,7 +14,7 @@ import com.jcraft.jsch.Session; import com.jcraft.jsch.UserAuthGSSAPIWithMIC; public abstract class AbstractJschTask implements Runnable { - private final Log log = LogFactory.getLog(getClass()); + private final CmsLog log = CmsLog.getLog(getClass()); private SshTarget sshTarget; @@ -121,7 +120,7 @@ public abstract class AbstractJschTask implements Runnable { } private static class JschLogger implements Logger { - private final Log log = LogFactory.getLog(JschLogger.class); + private final CmsLog log = CmsLog.getLog(JschLogger.class); // TODO better support levels @Override diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/JschContextSession.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/JschContextSession.java index 8855beb7c..e52a55d27 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/JschContextSession.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/JschContextSession.java @@ -1,7 +1,6 @@ package org.argeo.slc.jsch; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; @@ -10,7 +9,7 @@ import com.jcraft.jsch.Session; /** Caches a JSCH session in the the ssh target. */ public class JschContextSession extends AbstractJschTask implements InitializingBean, DisposableBean { - private final static Log log = LogFactory.getLog(JschContextSession.class); + private final static CmsLog log = CmsLog.getLog(JschContextSession.class); private Boolean autoconnect = false; @Override diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/RemoteExec.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/RemoteExec.java index 886dc92b2..e397297e3 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/RemoteExec.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/RemoteExec.java @@ -18,8 +18,7 @@ import java.util.StringTokenizer; import org.apache.commons.exec.ExecuteStreamHandler; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.ExecutionResources; import org.argeo.slc.core.execution.tasks.SystemCall; @@ -32,7 +31,7 @@ import com.jcraft.jsch.ChannelShell; import com.jcraft.jsch.Session; public class RemoteExec extends AbstractJschTask { - private final static Log log = LogFactory.getLog(RemoteExec.class); + private final static CmsLog log = CmsLog.getLog(RemoteExec.class); private Boolean failOnBadExitStatus = true; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpFrom.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpFrom.java index ced80eee0..ff79a4987 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpFrom.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpFrom.java @@ -7,8 +7,7 @@ import java.io.InputStream; import java.io.OutputStream; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.core.io.Resource; @@ -17,7 +16,7 @@ import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.Session; public class ScpFrom extends AbstractJschTask { - private final static Log log = LogFactory.getLog(ScpFrom.class); + private final static CmsLog log = CmsLog.getLog(ScpFrom.class); private Resource localResource; private String remotePath; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpTo.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpTo.java index 5da5f79e7..f2ead8026 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpTo.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/ScpTo.java @@ -12,8 +12,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; @@ -26,7 +25,7 @@ import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.Session; public class ScpTo extends AbstractJschTask { - private final static Log log = LogFactory.getLog(ScpTo.class); + private final static CmsLog log = CmsLog.getLog(ScpTo.class); private Resource localResource; private String remotePath; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SimpleUserInfo.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SimpleUserInfo.java index fd84224ad..9f9fcc3e5 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SimpleUserInfo.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SimpleUserInfo.java @@ -5,8 +5,7 @@ import java.io.InputStream; import java.io.PushbackInputStream; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import com.jcraft.jsch.UserInfo; @@ -16,7 +15,7 @@ public class SimpleUserInfo implements UserInfo { private Boolean permissive = true; private Boolean verbose = false; - private final static Log log = LogFactory.getLog(SimpleUserInfo.class); + private final static CmsLog log = CmsLog.getLog(SimpleUserInfo.class); protected String password; protected char[] passwordSafe; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshFilesDeployment.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshFilesDeployment.java index 53670e14d..7a70266ae 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshFilesDeployment.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshFilesDeployment.java @@ -6,8 +6,7 @@ import java.util.List; import java.util.Map; import java.util.StringTokenizer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.deploy.DigestCheck; import org.argeo.slc.core.deploy.ResourceSet; @@ -16,7 +15,7 @@ import org.springframework.core.io.Resource; import com.jcraft.jsch.Session; public class SshFilesDeployment extends AbstractJschTask implements Runnable { - private final static Log log = LogFactory.getLog(SshFilesDeployment.class); + private final static CmsLog log = CmsLog.getLog(SshFilesDeployment.class); private String targetBase = ""; private ResourceSet resourceSet; /** diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshShell.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshShell.java index 2ec2b72a1..c369bd4fb 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshShell.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/jsch/SshShell.java @@ -7,8 +7,7 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.springframework.core.io.Resource; import org.springframework.util.StringUtils; @@ -17,7 +16,7 @@ import com.jcraft.jsch.Channel; import com.jcraft.jsch.Session; public class SshShell extends AbstractJschTask { - private final static Log log = LogFactory.getLog(SshShell.class); + private final static CmsLog log = CmsLog.getLog(SshShell.class); private Resource input; @Override diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java index f62700a0e..ef0c4fa9e 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/jcr/JcrRepositoryBackup.java @@ -15,20 +15,19 @@ import javax.jcr.Session; import javax.jcr.SimpleCredentials; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSelectInfo; import org.apache.commons.vfs2.FileSelector; import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileSystemManager; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; /** Backups a JCR repository */ public class JcrRepositoryBackup implements Runnable { - private final static Log log = LogFactory.getLog(JcrRepositoryBackup.class); + private final static CmsLog log = CmsLog.getLog(JcrRepositoryBackup.class); private String sourceRepo; private String sourceDatastore; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java index 44c4e0c94..ef661fb29 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/BuildInMock.java @@ -10,14 +10,13 @@ import java.util.Set; import org.apache.commons.exec.Executor; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.tasks.SystemCall; /** Rebuild an SRPM in mock. (Historical) Replaces the build-mock.sh script. */ public class BuildInMock implements Runnable { - private final static Log log = LogFactory.getLog(BuildInMock.class); + private final static CmsLog log = CmsLog.getLog(BuildInMock.class); /** Mock flavour provided by the EPEL repository */ public final static String EPEL = "EPEL"; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java index 04680df7b..cc27f8a68 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/linux/rpmfactory/CreateSrpm.java @@ -10,8 +10,7 @@ import java.util.List; import org.apache.commons.exec.Executor; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.tasks.SystemCall; import org.springframework.core.io.Resource; @@ -19,7 +18,7 @@ import org.springframework.core.io.UrlResource; /** Generates an SRPM from a spec file */ public class CreateSrpm implements Runnable { - private final static Log log = LogFactory.getLog(CreateSrpm.class); + private final static CmsLog log = CmsLog.getLog(CreateSrpm.class); private File topdir; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxManager.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxManager.java index 9992d77f5..e6b545f0d 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxManager.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/lib/vbox/VBoxManager.java @@ -4,14 +4,13 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.tasks.SystemCall; import org.springframework.core.io.Resource; public class VBoxManager { - private final static Log log = LogFactory.getLog(VBoxManager.class); + private final static CmsLog log = CmsLog.getLog(VBoxManager.class); private VBoxMachine vm; private String executable = "VBoxManage"; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/log4j/SlcExecutionAppender.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/log4j/SlcExecutionAppender.java deleted file mode 100644 index 2a9ea5f3d..000000000 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/log4j/SlcExecutionAppender.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.argeo.slc.log4j; - -import java.util.Date; -import java.util.concurrent.BlockingQueue; - -import org.apache.log4j.AppenderSkeleton; -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.spi.LoggingEvent; -import org.argeo.slc.execution.ExecutionStep; -import org.argeo.slc.runtime.ExecutionThread; -import org.argeo.slc.runtime.ProcessThreadGroup; - -/** Not meant to be used directly in standard log4j config */ -public class SlcExecutionAppender extends AppenderSkeleton { - - private Boolean disabled = false; - - private String level = null; - - private Level log4jLevel = null; - - /** Marker to prevent stack overflow */ - private ThreadLocal dispatching = new ThreadLocal() { - - @Override - protected Boolean initialValue() { - return false; - } - }; - - // private Layout layout = null; - // private String pattern = "%m - %c%n"; - private Boolean onlyExecutionThread = false; - - public void init() { - // if (layout != null) - // setLayout(layout); - // else - // setLayout(new PatternLayout(pattern)); - Logger.getRootLogger().addAppender(this); - } - - @Override - protected void append(LoggingEvent event) { - if (disabled) - return; - - if (dispatching.get()) - return; - - if (level != null && !level.trim().equals("")) { - if (log4jLevel == null || !log4jLevel.toString().equals(level)) - try { - log4jLevel = Level.toLevel(level); - } catch (Exception e) { - System.err.println("Log4j level could not be set for level '" + level + "', resetting it to null."); - e.printStackTrace(); - level = null; - } - - if (log4jLevel != null && !event.getLevel().isGreaterOrEqual(log4jLevel)) { - return; - } - } - - // Check whether we are within an executing process - Thread currentThread = Thread.currentThread(); - if (currentThread.getThreadGroup() instanceof ProcessThreadGroup) { - if (onlyExecutionThread && !(currentThread instanceof ExecutionThread)) - return; - - final String type; - if (event.getLevel().equals(Level.ERROR) || event.getLevel().equals(Level.FATAL)) - type = ExecutionStep.ERROR; - else if (event.getLevel().equals(Level.WARN)) - type = ExecutionStep.WARNING; - else if (event.getLevel().equals(Level.INFO)) - type = ExecutionStep.INFO; - else if (event.getLevel().equals(Level.DEBUG)) - type = ExecutionStep.DEBUG; - else if (event.getLevel().equals(Level.TRACE)) - type = ExecutionStep.TRACE; - else - type = ExecutionStep.INFO; - - ExecutionStep step = new ExecutionStep(event.getLoggerName(), new Date(event.getTimeStamp()), type, - event.getMessage().toString()); - - try { - dispatching.set(true); - BlockingQueue steps = ((ProcessThreadGroup) currentThread.getThreadGroup()).getSteps(); - if (steps.remainingCapacity() == 0) { - stdOut("WARNING: execution steps queue is full, skipping step: " + step); - // FIXME understand why it block indefinitely: the queue - // should be emptied by the logging thread - } else { - steps.add(step); - } - } finally { - dispatching.set(false); - } - } - } - - public void destroy() throws Exception { - Logger.getRootLogger().removeAppender(this); - } - - public void close() { - } - - public boolean requiresLayout() { - return false; - } - - // public void setLayout(Layout layout) { - // this.layout = layout; - // } - - /** For development purpose, since using regular logging is not easy here */ - static void stdOut(Object obj) { - System.out.println(obj); - } - - // public void setPattern(String pattern) { - // this.pattern = pattern; - // } - - public void setOnlyExecutionThread(Boolean onlyExecutionThread) { - this.onlyExecutionThread = onlyExecutionThread; - } - - public void setDisabled(Boolean disabled) { - this.disabled = disabled; - } - - public void setLevel(String level) { - this.level = level; - } - -} diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/mail/SendMail.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/mail/SendMail.java index db4ab45f9..0f1eb3c99 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/mail/SendMail.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/mail/SendMail.java @@ -10,8 +10,7 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.core.execution.tasks.SystemCall; @@ -21,7 +20,7 @@ public class SendMail implements Runnable { // http://java.sun.com/developer/onlineTraining/JavaMail/contents.html#JavaMailUsage // http://java.sun.com/products/javamail/FAQ.html#gmail - private final static Log log = LogFactory.getLog(SendMail.class); + private final static CmsLog log = CmsLog.getLog(SendMail.class); private String host; private String from; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java index 804f2805d..edb50924a 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdApplicationDeployment.java @@ -2,8 +2,7 @@ package org.argeo.slc.support.deploy; import java.io.File; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.build.Distribution; import org.argeo.slc.deploy.DeployEnvironment; @@ -13,7 +12,7 @@ import org.argeo.slc.deploy.DeploymentData; import org.argeo.slc.deploy.TargetData; public class HttpdApplicationDeployment implements Deployment { - private static final Log log = LogFactory + private static final CmsLog log = CmsLog .getLog(HttpdApplicationDeployment.class); private HttpdApplicationTargetData targetData; diff --git a/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerManager.java b/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerManager.java index 20b78591f..2c9886741 100644 --- a/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerManager.java +++ b/legacy/org.argeo.slc.support/src/org/argeo/slc/support/deploy/HttpdServerManager.java @@ -6,13 +6,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.deploy.DeployedSystemManager; public class HttpdServerManager implements DeployedSystemManager { - private final static Log log = LogFactory.getLog(HttpdServerManager.class); + private final static CmsLog log = CmsLog.getLog(HttpdServerManager.class); private HttpdServer httpdServer; diff --git a/org.argeo.slc.factory/pom.xml b/org.argeo.slc.factory/pom.xml index 87b399676..eb7009072 100644 --- a/org.argeo.slc.factory/pom.xml +++ b/org.argeo.slc.factory/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.argeo.slc @@ -15,12 +17,19 @@ org.argeo.slc.runtime 2.3-SNAPSHOT - - + + org.argeo.slc org.argeo.slc.repo 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.api + ${version.argeo-commons} + + \ No newline at end of file diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java index a69e39fde..eab9ffa30 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/BuildInMock.java @@ -10,15 +10,14 @@ import java.util.Set; import org.apache.commons.exec.Executor; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.rpmfactory.RpmFactory; import org.argeo.slc.runtime.tasks.SystemCall; /** Build an RPM in mock. */ public class BuildInMock implements Runnable { - private final static Log log = LogFactory.getLog(BuildInMock.class); + private final static CmsLog log = CmsLog.getLog(BuildInMock.class); private final static String NOARCH = "noarch"; private String rpmPackage = null; diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java index 6f60b3d94..43c6c6c1e 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/CreateRpmDistribution.java @@ -11,8 +11,7 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.rpmfactory.RpmFactory; @@ -23,7 +22,7 @@ import org.argeo.slc.runtime.tasks.SystemCall; * consistent distributable set (typically to be used to generate an ISO). */ public class CreateRpmDistribution implements Runnable { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(CreateRpmDistribution.class); private RpmFactory rpmFactory; diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java index dcdbc9cdc..78f7af337 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/ReleaseStaging.java @@ -7,15 +7,14 @@ import java.util.List; import org.apache.commons.exec.Executor; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.rpmfactory.RpmFactory; import org.argeo.slc.runtime.tasks.SystemCall; /** Releases the content of staging to a public repository. */ public class ReleaseStaging implements Runnable { - private final static Log log = LogFactory.getLog(ReleaseStaging.class); + private final static CmsLog log = CmsLog.getLog(ReleaseStaging.class); private RpmFactory rpmFactory; private Executor executor; diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java index cf111f81e..47ca4daff 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmFactoryImpl.java @@ -17,8 +17,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcConstants; import org.argeo.slc.SlcException; @@ -32,7 +31,7 @@ import org.argeo.slc.runtime.tasks.SystemCall; * components performing the various actions related to RPM build. */ public class RpmFactoryImpl implements RpmFactory { - private Log log = LogFactory.getLog(RpmFactoryImpl.class); + private CmsLog log = CmsLog.getLog(RpmFactoryImpl.class); private Repository rpmRepository; private Repository distRepository; diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java index d067dfaa1..0772c9874 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/RpmProxyServiceImpl.java @@ -10,8 +10,7 @@ import javax.jcr.Session; import javax.jcr.nodetype.NodeType; import javax.jcr.security.AccessControlException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ArgeoNames; import org.argeo.jcr.JcrUtils; import org.argeo.jcr.proxy.AbstractUrlProxy; @@ -26,7 +25,7 @@ import org.argeo.slc.rpmfactory.RpmRepository; /** Synchronises the node repository with remote Maven repositories */ public class RpmProxyServiceImpl extends AbstractUrlProxy implements RpmProxyService, ArgeoNames, SlcNames { - private final static Log log = LogFactory.getLog(RpmProxyServiceImpl.class); + private final static CmsLog log = CmsLog.getLog(RpmProxyServiceImpl.class); private Set defaultRepositories = new HashSet(); diff --git a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java index ee89aa311..9327fedb7 100644 --- a/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java +++ b/org.argeo.slc.factory/src/org/argeo/slc/rpmfactory/core/YumListParser.java @@ -11,8 +11,7 @@ import java.util.TreeSet; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; /** @@ -20,7 +19,7 @@ import org.argeo.slc.SlcException; * packages. */ public class YumListParser implements RpmPackageSet { - private final static Log log = LogFactory.getLog(YumListParser.class); + private final static CmsLog log = CmsLog.getLog(YumListParser.class); private Set installed = new TreeSet(); /** Not installed but available */ diff --git a/org.argeo.slc.jcr/bnd.bnd b/org.argeo.slc.jcr/bnd.bnd index 03ecd9580..725fe5548 100644 --- a/org.argeo.slc.jcr/bnd.bnd +++ b/org.argeo.slc.jcr/bnd.bnd @@ -2,5 +2,4 @@ Import-Package: javax.jcr.nodetype,\ javax.jcr.security,\ org.apache.jackrabbit.api,\ org.apache.jackrabbit.commons,\ -org.argeo.api,\ * \ No newline at end of file diff --git a/org.argeo.slc.jcr/build.properties b/org.argeo.slc.jcr/build.properties index 35295596a..55a8621a4 100644 --- a/org.argeo.slc.jcr/build.properties +++ b/org.argeo.slc.jcr/build.properties @@ -12,9 +12,7 @@ additional.bundles = org.junit,\ org.apache.jackrabbit.spi,\ org.apache.jackrabbit.spi.commons,\ org.slf4j.api,\ - org.slf4j.log4j12,\ - org.apache.log4j,\ - org.apache.commons.collections,\ + org.apache.commons.collections,\ EDU.oswego.cs.dl.util.concurrent,\ org.apache.lucene,\ org.apache.tika.core,\ diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrMetadataWriter.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrMetadataWriter.java index e2d1b10fe..f50b9f842 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrMetadataWriter.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrMetadataWriter.java @@ -6,8 +6,7 @@ import java.util.Map; import javax.jcr.Node; import javax.jcr.RepositoryException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -17,7 +16,7 @@ import org.argeo.slc.SlcNames; * itself if metadata node name is set to null) */ public class JcrMetadataWriter implements Runnable { - private final static Log log = LogFactory.getLog(JcrMetadataWriter.class); + private final static CmsLog log = CmsLog.getLog(JcrMetadataWriter.class); private Node baseNode; private String metadataNodeName = SlcNames.SLC_METADATA; @@ -28,9 +27,8 @@ public class JcrMetadataWriter implements Runnable { try { Node metadataNode; if (metadataNodeName != null) - metadataNode = baseNode.hasNode(metadataNodeName) ? baseNode - .getNode(metadataNodeName) : baseNode - .addNode(metadataNodeName); + metadataNode = baseNode.hasNode(metadataNodeName) ? baseNode.getNode(metadataNodeName) + : baseNode.addNode(metadataNodeName); else metadataNode = baseNode; @@ -40,8 +38,7 @@ public class JcrMetadataWriter implements Runnable { baseNode.getSession().save(); if (log.isDebugEnabled()) - log.debug("Wrote " + metadata.size() + " metadata entries to " - + metadataNode); + log.debug("Wrote " + metadata.size() + " metadata entries to " + metadataNode); } catch (RepositoryException e) { throw new SlcException("Cannot write metadata to " + baseNode, e); } finally { diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java index e2d0607ae..72d0b4d9b 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/JcrTestResult.java @@ -15,8 +15,7 @@ import javax.jcr.Session; import javax.jcr.query.Query; import javax.jcr.query.QueryManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -33,7 +32,7 @@ import org.argeo.slc.test.TestStatus; * {@link SlcTypes#SLC_TEST_RESULT}. */ public class JcrTestResult implements TestResult, SlcNames, AttachmentsEnabled { - private final static Log log = LogFactory.getLog(JcrTestResult.class); + private final static CmsLog log = CmsLog.getLog(JcrTestResult.class); /** Should only be set for an already existing result. */ private String uuid; diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java index 2804b2215..58f31251b 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionModulesListener.java @@ -12,8 +12,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.nodetype.NodeType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -35,21 +34,19 @@ import org.argeo.slc.primitive.PrimitiveValue; * Synchronizes the local execution runtime with a JCR repository. For the time * being the state is completely reset from one start to another. */ -public class JcrExecutionModulesListener implements ExecutionModulesListener, - SlcNames { +public class JcrExecutionModulesListener implements ExecutionModulesListener, SlcNames { private final static String SLC_EXECUTION_MODULES_PROPERTY = "slc.executionModules"; - private final static Log log = LogFactory - .getLog(JcrExecutionModulesListener.class); + private final static CmsLog log = CmsLog.getLog(JcrExecutionModulesListener.class); private JcrAgent agent; private ExecutionModulesManager modulesManager; private Repository repository; /** - * We don't use a thread bound session because many different threads will - * call this critical component and we don't want to login each time. We - * therefore rather protect access to this session via synchronized. + * We don't use a thread bound session because many different threads will call + * this critical component and we don't want to login each time. We therefore + * rather protect access to this session via synchronized. */ private Session session; @@ -63,54 +60,38 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, if (modulesManager != null) { Node agentNode = session.getNode(agent.getNodePath()); - List moduleDescriptors = modulesManager - .listModules(); + List moduleDescriptors = modulesManager.listModules(); // scan SLC-ExecutionModule metadata for (ModuleDescriptor md : moduleDescriptors) { - if (md.getMetadata().containsKey( - ExecutionModuleDescriptor.SLC_EXECUTION_MODULE)) { - String moduleNodeName = SlcJcrUtils - .getModuleNodeName(md); - Node moduleNode = agentNode.hasNode(moduleNodeName) ? agentNode - .getNode(moduleNodeName) : agentNode - .addNode(moduleNodeName); + if (md.getMetadata().containsKey(ExecutionModuleDescriptor.SLC_EXECUTION_MODULE)) { + String moduleNodeName = SlcJcrUtils.getModuleNodeName(md); + Node moduleNode = agentNode.hasNode(moduleNodeName) ? agentNode.getNode(moduleNodeName) + : agentNode.addNode(moduleNodeName); moduleNode.addMixin(SlcTypes.SLC_EXECUTION_MODULE); moduleNode.setProperty(SLC_NAME, md.getName()); moduleNode.setProperty(SLC_VERSION, md.getVersion()); - moduleNode.setProperty(Property.JCR_TITLE, - md.getTitle()); - moduleNode.setProperty(Property.JCR_DESCRIPTION, - md.getDescription()); + moduleNode.setProperty(Property.JCR_TITLE, md.getTitle()); + moduleNode.setProperty(Property.JCR_DESCRIPTION, md.getDescription()); moduleNode.setProperty(SLC_STARTED, md.getStarted()); } } // scan execution modules property - String executionModules = System - .getProperty(SLC_EXECUTION_MODULES_PROPERTY); + String executionModules = System.getProperty(SLC_EXECUTION_MODULES_PROPERTY); if (executionModules != null) { for (String executionModule : executionModules.split(",")) { allModules: for (ModuleDescriptor md : moduleDescriptors) { - String moduleNodeName = SlcJcrUtils - .getModuleNodeName(md); + String moduleNodeName = SlcJcrUtils.getModuleNodeName(md); if (md.getName().equals(executionModule)) { - Node moduleNode = agentNode - .hasNode(moduleNodeName) ? agentNode - .getNode(moduleNodeName) : agentNode - .addNode(moduleNodeName); - moduleNode - .addMixin(SlcTypes.SLC_EXECUTION_MODULE); + Node moduleNode = agentNode.hasNode(moduleNodeName) ? agentNode.getNode(moduleNodeName) + : agentNode.addNode(moduleNodeName); + moduleNode.addMixin(SlcTypes.SLC_EXECUTION_MODULE); moduleNode.setProperty(SLC_NAME, md.getName()); - moduleNode.setProperty(SLC_VERSION, - md.getVersion()); - moduleNode.setProperty(Property.JCR_TITLE, - md.getTitle()); - moduleNode.setProperty( - Property.JCR_DESCRIPTION, - md.getDescription()); - moduleNode.setProperty(SLC_STARTED, - md.getStarted()); + moduleNode.setProperty(SLC_VERSION, md.getVersion()); + moduleNode.setProperty(Property.JCR_TITLE, md.getTitle()); + moduleNode.setProperty(Property.JCR_DESCRIPTION, md.getDescription()); + moduleNode.setProperty(SLC_STARTED, md.getStarted()); break allModules; } } @@ -149,26 +130,21 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, * EXECUTION MODULES LISTENER */ - public synchronized void executionModuleAdded( - ModuleDescriptor moduleDescriptor) { + public synchronized void executionModuleAdded(ModuleDescriptor moduleDescriptor) { syncExecutionModule(moduleDescriptor); } protected void syncExecutionModule(ModuleDescriptor moduleDescriptor) { try { Node agentNode = session.getNode(agent.getNodePath()); - String moduleNodeName = SlcJcrUtils - .getModuleNodeName(moduleDescriptor); - Node moduleNode = agentNode.hasNode(moduleNodeName) ? agentNode - .getNode(moduleNodeName) : agentNode - .addNode(moduleNodeName); + String moduleNodeName = SlcJcrUtils.getModuleNodeName(moduleDescriptor); + Node moduleNode = agentNode.hasNode(moduleNodeName) ? agentNode.getNode(moduleNodeName) + : agentNode.addNode(moduleNodeName); moduleNode.addMixin(SlcTypes.SLC_EXECUTION_MODULE); moduleNode.setProperty(SLC_NAME, moduleDescriptor.getName()); moduleNode.setProperty(SLC_VERSION, moduleDescriptor.getVersion()); - moduleNode.setProperty(Property.JCR_TITLE, - moduleDescriptor.getTitle()); - moduleNode.setProperty(Property.JCR_DESCRIPTION, - moduleDescriptor.getDescription()); + moduleNode.setProperty(Property.JCR_TITLE, moduleDescriptor.getTitle()); + moduleNode.setProperty(Property.JCR_DESCRIPTION, moduleDescriptor.getDescription()); moduleNode.setProperty(SLC_STARTED, moduleDescriptor.getStarted()); session.save(); } catch (RepositoryException e) { @@ -177,8 +153,7 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, } } - public synchronized void executionModuleRemoved( - ModuleDescriptor moduleDescriptor) { + public synchronized void executionModuleRemoved(ModuleDescriptor moduleDescriptor) { try { String moduleName = SlcJcrUtils.getModuleNodeName(moduleDescriptor); Node agentNode = session.getNode(agent.getNodePath()); @@ -192,23 +167,19 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, session.save(); } catch (RepositoryException e) { JcrUtils.discardQuietly(session); - throw new SlcException("Cannot remove module " + moduleDescriptor, - e); + throw new SlcException("Cannot remove module " + moduleDescriptor, e); } } - public synchronized void executionFlowAdded(ModuleDescriptor module, - ExecutionFlowDescriptor efd) { + public synchronized void executionFlowAdded(ModuleDescriptor module, ExecutionFlowDescriptor efd) { try { Node agentNode = session.getNode(agent.getNodePath()); - Node moduleNode = agentNode.getNode(SlcJcrUtils - .getModuleNodeName(module)); + Node moduleNode = agentNode.getNode(SlcJcrUtils.getModuleNodeName(module)); String relativePath = getExecutionFlowRelativePath(efd); @SuppressWarnings("unused") Node flowNode = null; if (!moduleNode.hasNode(relativePath)) { - flowNode = createExecutionFlowNode(moduleNode, relativePath, - efd); + flowNode = createExecutionFlowNode(moduleNode, relativePath, efd); session.save(); } else { flowNode = moduleNode.getNode(relativePath); @@ -218,14 +189,12 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, log.trace("Flow " + efd + " added to JCR"); } catch (RepositoryException e) { JcrUtils.discardQuietly(session); - throw new SlcException("Cannot add flow " + efd + " from module " - + module, e); + throw new SlcException("Cannot add flow " + efd + " from module " + module, e); } } - protected Node createExecutionFlowNode(Node moduleNode, - String relativePath, ExecutionFlowDescriptor efd) + protected Node createExecutionFlowNode(Node moduleNode, String relativePath, ExecutionFlowDescriptor efd) throws RepositoryException { Node flowNode = null; List pathTokens = Arrays.asList(relativePath.split("/")); @@ -241,8 +210,7 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, if (names.hasNext()) currNode = currNode.addNode(name); else - flowNode = currNode.addNode(name, - SlcTypes.SLC_EXECUTION_FLOW); + flowNode = currNode.addNode(name, SlcTypes.SLC_EXECUTION_FLOW); } } @@ -250,8 +218,7 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, flowNode.setProperty(SLC_NAME, efd.getName()); String endName = pathTokens.get(pathTokens.size() - 1); flowNode.setProperty(Property.JCR_TITLE, endName); - if (efd.getDescription() != null - && !efd.getDescription().trim().equals("")) { + if (efd.getDescription() != null && !efd.getDescription().trim().equals("")) { flowNode.setProperty(Property.JCR_DESCRIPTION, efd.getDescription()); } else { flowNode.setProperty(Property.JCR_DESCRIPTION, endName); @@ -266,32 +233,26 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, mapExecutionSpec(flowNode, executionSpec); } else { // reference spec node - Node executionSpecsNode = moduleNode.hasNode(SLC_EXECUTION_SPECS) ? moduleNode - .getNode(SLC_EXECUTION_SPECS) : moduleNode - .addNode(SLC_EXECUTION_SPECS); - Node executionSpecNode = executionSpecsNode.addNode(esName, - SlcTypes.SLC_EXECUTION_SPEC); + Node executionSpecsNode = moduleNode.hasNode(SLC_EXECUTION_SPECS) ? moduleNode.getNode(SLC_EXECUTION_SPECS) + : moduleNode.addNode(SLC_EXECUTION_SPECS); + Node executionSpecNode = executionSpecsNode.addNode(esName, SlcTypes.SLC_EXECUTION_SPEC); executionSpecNode.setProperty(SLC_NAME, esName); executionSpecNode.setProperty(Property.JCR_TITLE, esName); - if (executionSpec.getDescription() != null - && !executionSpec.getDescription().trim().equals("")) - executionSpecNode.setProperty(Property.JCR_DESCRIPTION, - executionSpec.getDescription()); + if (executionSpec.getDescription() != null && !executionSpec.getDescription().trim().equals("")) + executionSpecNode.setProperty(Property.JCR_DESCRIPTION, executionSpec.getDescription()); mapExecutionSpec(executionSpecNode, executionSpec); flowNode.setProperty(SLC_SPEC, executionSpecNode); } // flow values for (String attr : efd.getValues().keySet()) { - ExecutionSpecAttribute esa = executionSpec.getAttributes() - .get(attr); + ExecutionSpecAttribute esa = executionSpec.getAttributes().get(attr); if (esa instanceof PrimitiveSpecAttribute) { PrimitiveSpecAttribute psa = (PrimitiveSpecAttribute) esa; // if spec reference there will be no node at this stage Node valueNode = JcrUtils.getOrAdd(flowNode, attr); valueNode.setProperty(SLC_TYPE, psa.getType()); - SlcJcrUtils.setPrimitiveAsProperty(valueNode, SLC_VALUE, - (PrimitiveValue) efd.getValues().get(attr)); + SlcJcrUtils.setPrimitiveAsProperty(valueNode, SLC_VALUE, (PrimitiveValue) efd.getValues().get(attr)); } } @@ -299,14 +260,12 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, } /** - * Base can be either an execution spec node, or an execution flow node (in - * case the execution spec is internal) + * Base can be either an execution spec node, or an execution flow node (in case + * the execution spec is internal) */ - protected void mapExecutionSpec(Node baseNode, ExecutionSpec executionSpec) - throws RepositoryException { + protected void mapExecutionSpec(Node baseNode, ExecutionSpec executionSpec) throws RepositoryException { for (String attrName : executionSpec.getAttributes().keySet()) { - ExecutionSpecAttribute esa = executionSpec.getAttributes().get( - attrName); + ExecutionSpecAttribute esa = executionSpec.getAttributes().get(attrName); Node attrNode = baseNode.addNode(attrName); // booleans attrNode.addMixin(SlcTypes.SLC_EXECUTION_SPEC_ATTRIBUTE); @@ -333,12 +292,9 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, index = count; Node choiceNode = attrNode.addNode(choice.getName()); choiceNode.addMixin(NodeType.MIX_TITLE); - choiceNode.setProperty(Property.JCR_TITLE, - choice.getName()); - if (choice.getDescription() != null - && !choice.getDescription().trim().equals("")) - choiceNode.setProperty(Property.JCR_DESCRIPTION, - choice.getDescription()); + choiceNode.setProperty(Property.JCR_TITLE, choice.getName()); + if (choice.getDescription() != null && !choice.getDescription().trim().equals("")) + choiceNode.setProperty(Property.JCR_DESCRIPTION, choice.getDescription()); count++; } @@ -349,19 +305,16 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, } } - public synchronized void executionFlowRemoved(ModuleDescriptor module, - ExecutionFlowDescriptor executionFlow) { + public synchronized void executionFlowRemoved(ModuleDescriptor module, ExecutionFlowDescriptor executionFlow) { try { Node agentNode = session.getNode(agent.getNodePath()); - Node moduleNode = agentNode.getNode(SlcJcrUtils - .getModuleNodeName(module)); + Node moduleNode = agentNode.getNode(SlcJcrUtils.getModuleNodeName(module)); String relativePath = getExecutionFlowRelativePath(executionFlow); if (moduleNode.hasNode(relativePath)) moduleNode.getNode(relativePath).remove(); agentNode.getSession().save(); } catch (RepositoryException e) { - throw new SlcException("Cannot remove flow " + executionFlow - + " from module " + module, e); + throw new SlcException("Cannot remove flow " + executionFlow + " from module " + module, e); } } @@ -370,11 +323,9 @@ public class JcrExecutionModulesListener implements ExecutionModulesListener, */ /** @return the relative path, never starts with '/' */ @SuppressWarnings("deprecation") - protected String getExecutionFlowRelativePath( - ExecutionFlowDescriptor executionFlow) { - String relativePath = executionFlow.getPath() == null ? executionFlow - .getName() : executionFlow.getPath() + '/' - + executionFlow.getName(); + protected String getExecutionFlowRelativePath(ExecutionFlowDescriptor executionFlow) { + String relativePath = executionFlow.getPath() == null ? executionFlow.getName() + : executionFlow.getPath() + '/' + executionFlow.getName(); // we assume that it is more than one char long if (relativePath.charAt(0) == '/') relativePath = relativePath.substring(1); diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java index 9d0045961..8cc4dbeb7 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrExecutionProcess.java @@ -11,8 +11,7 @@ import javax.jcr.Property; import javax.jcr.Repository; import javax.jcr.RepositoryException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -26,7 +25,7 @@ import org.argeo.slc.runtime.ProcessThread; /** Execution process implementation based on a JCR node. */ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { - private final static Log log = LogFactory.getLog(JcrExecutionProcess.class); + private final static CmsLog log = CmsLog.getLog(JcrExecutionProcess.class); private final Node node; private Long nextLogLine = 1l; @@ -72,8 +71,8 @@ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { } /** - * Synchronized in order to make sure that there is no concurrent - * modification of {@link #nextLogLine}. + * Synchronized in order to make sure that there is no concurrent modification + * of {@link #nextLogLine}. */ public synchronized void addSteps(List steps) { try { @@ -93,8 +92,7 @@ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { // skip continue steps; - String relPath = SLC_LOG + '/' - + step.getThread().replace('/', '_') + '/' + String relPath = SLC_LOG + '/' + step.getThread().replace('/', '_') + '/' + step.getLocation().replace('.', '/'); String path = node.getPath() + '/' + relPath; // clean special character @@ -102,8 +100,7 @@ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { path = path.replace('@', '_'); Node location = JcrUtils.mkdirs(node.getSession(), path); - Node logEntry = location.addNode(Long.toString(nextLogLine), - type); + Node logEntry = location.addNode(Long.toString(nextLogLine), type); logEntry.setProperty(SLC_MESSAGE, step.getLog()); Calendar calendar = new GregorianCalendar(); calendar.setTime(step.getTimestamp()); @@ -139,17 +136,12 @@ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { Node realizedFlowNode = nit.nextNode(); if (realizedFlowNode.hasNode(SLC_ADDRESS)) { - String flowPath = realizedFlowNode.getNode(SLC_ADDRESS) - .getProperty(Property.JCR_PATH).getString(); - NameVersion moduleNameVersion = SlcJcrUtils - .moduleNameVersion(flowPath); - ((ProcessThread) Thread.currentThread()) - .getExecutionModulesManager().start( - moduleNameVersion); + String flowPath = realizedFlowNode.getNode(SLC_ADDRESS).getProperty(Property.JCR_PATH).getString(); + NameVersion moduleNameVersion = SlcJcrUtils.moduleNameVersion(flowPath); + ((ProcessThread) Thread.currentThread()).getExecutionModulesManager().start(moduleNameVersion); } - RealizedFlow realizedFlow = new JcrRealizedFlow( - realizedFlowNode); + RealizedFlow realizedFlow = new JcrRealizedFlow(realizedFlowNode); if (realizedFlow != null) realizedFlows.add(realizedFlow); } @@ -163,8 +155,7 @@ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { try { return node.getPath(); } catch (RepositoryException e) { - throw new SlcException("Cannot get process node path for " + node, - e); + throw new SlcException("Cannot get process node path for " + node, e); } } @@ -172,8 +163,7 @@ public class JcrExecutionProcess implements ExecutionProcess, SlcNames { try { return node.getSession().getRepository(); } catch (RepositoryException e) { - throw new SlcException("Cannot get process JCR repository for " - + node, e); + throw new SlcException("Cannot get process JCR repository for " + node, e); } } } diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrProcessThread.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrProcessThread.java index bef375a7a..67c213d30 100644 --- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrProcessThread.java +++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/execution/JcrProcessThread.java @@ -6,7 +6,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -29,7 +29,7 @@ public class JcrProcessThread extends ProcessThread implements SlcNames { Session session = null; if (getProcess() instanceof JcrExecutionProcess) try { - session = ((JcrExecutionProcess) getProcess()).getRepository().login(NodeConstants.HOME_WORKSPACE); + session = ((JcrExecutionProcess) getProcess()).getRepository().login(CmsConstants.HOME_WORKSPACE); List realizedFlows = getProcess().getRealizedFlows(); for (RealizedFlow realizedFlow : realizedFlows) { diff --git a/org.argeo.slc.repo/bnd.bnd b/org.argeo.slc.repo/bnd.bnd index 6e38b44dc..2314c5bb8 100644 --- a/org.argeo.slc.repo/bnd.bnd +++ b/org.argeo.slc.repo/bnd.bnd @@ -4,7 +4,6 @@ javax.xml.transform.*,\ javax.xml.parsers.*,\ javax.jcr.nodetype,\ org.osgi.*;version=0.0.0,\ -org.argeo.api,\ * Require-Capability: cms.datamodel; filter:="(name=slc)" diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java index 037a7be67..209f2b667 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ArtifactIndexer.java @@ -5,8 +5,7 @@ import javax.jcr.NodeIterator; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -21,7 +20,7 @@ import org.osgi.framework.Constants; * files and other non artifact files). */ public class ArtifactIndexer implements NodeIndexer, SlcNames { - private Log log = LogFactory.getLog(ArtifactIndexer.class); + private CmsLog log = CmsLog.getLog(ArtifactIndexer.class); private Boolean force = false; public Boolean support(String path) { @@ -57,65 +56,49 @@ public class ArtifactIndexer implements NodeIndexer, SlcNames { artifact = AetherUtils.convertPathToArtifact(relativePath, null); // support() guarantees that artifact won't be null, no NPE check fileNode.addMixin(SlcTypes.SLC_ARTIFACT); - fileNode.setProperty(SlcNames.SLC_ARTIFACT_ID, - artifact.getArtifactId()); + fileNode.setProperty(SlcNames.SLC_ARTIFACT_ID, artifact.getArtifactId()); fileNode.setProperty(SlcNames.SLC_GROUP_ID, artifact.getGroupId()); - fileNode.setProperty(SlcNames.SLC_ARTIFACT_VERSION, - artifact.getVersion()); - fileNode.setProperty(SlcNames.SLC_ARTIFACT_EXTENSION, - artifact.getExtension()); + fileNode.setProperty(SlcNames.SLC_ARTIFACT_VERSION, artifact.getVersion()); + fileNode.setProperty(SlcNames.SLC_ARTIFACT_EXTENSION, artifact.getExtension()); // can be null but ok for JCR API - fileNode.setProperty(SlcNames.SLC_ARTIFACT_CLASSIFIER, - artifact.getClassifier()); + fileNode.setProperty(SlcNames.SLC_ARTIFACT_CLASSIFIER, artifact.getClassifier()); JcrUtils.updateLastModified(fileNode); // make sure there are checksums String shaNodeName = fileNode.getName() + ".sha1"; if (!fileNode.getParent().hasNode(shaNodeName)) { String sha = JcrUtils.checksumFile(fileNode, "SHA-1"); - JcrUtils.copyBytesAsFile(fileNode.getParent(), shaNodeName, - sha.getBytes()); + JcrUtils.copyBytesAsFile(fileNode.getParent(), shaNodeName, sha.getBytes()); } String md5NodeName = fileNode.getName() + ".md5"; if (!fileNode.getParent().hasNode(md5NodeName)) { String md5 = JcrUtils.checksumFile(fileNode, "MD5"); - JcrUtils.copyBytesAsFile(fileNode.getParent(), md5NodeName, - md5.getBytes()); + JcrUtils.copyBytesAsFile(fileNode.getParent(), md5NodeName, md5.getBytes()); } // Create a default pom if none already exist String fileNodeName = fileNode.getName(); String pomName = null; if (fileNodeName.endsWith(".jar")) - pomName = fileNodeName.substring(0, fileNodeName.length() - - ".jar".length()) - + ".pom"; + pomName = fileNodeName.substring(0, fileNodeName.length() - ".jar".length()) + ".pom"; if (pomName != null && !fileNode.getParent().hasNode(pomName)) { String pom = generatePomForBundle(fileNode); - Node pomNode = JcrUtils.copyBytesAsFile(fileNode.getParent(), - pomName, pom.getBytes()); + Node pomNode = JcrUtils.copyBytesAsFile(fileNode.getParent(), pomName, pom.getBytes()); // corresponding check sums String sha = JcrUtils.checksumFile(pomNode, "SHA-1"); - JcrUtils.copyBytesAsFile(fileNode.getParent(), pomName - + ".sha1", sha.getBytes()); + JcrUtils.copyBytesAsFile(fileNode.getParent(), pomName + ".sha1", sha.getBytes()); String md5 = JcrUtils.checksumFile(fileNode, "MD5"); - JcrUtils.copyBytesAsFile(fileNode.getParent(), - pomName + ".md5", md5.getBytes()); + JcrUtils.copyBytesAsFile(fileNode.getParent(), pomName + ".md5", md5.getBytes()); } // set higher levels Node artifactVersionBase = fileNode.getParent(); - if (!artifactVersionBase - .isNodeType(SlcTypes.SLC_ARTIFACT_VERSION_BASE)) { - artifactVersionBase - .addMixin(SlcTypes.SLC_ARTIFACT_VERSION_BASE); - artifactVersionBase.setProperty(SlcNames.SLC_ARTIFACT_VERSION, - artifact.getBaseVersion()); - artifactVersionBase.setProperty(SlcNames.SLC_ARTIFACT_ID, - artifact.getArtifactId()); - artifactVersionBase.setProperty(SlcNames.SLC_GROUP_ID, - artifact.getGroupId()); + if (!artifactVersionBase.isNodeType(SlcTypes.SLC_ARTIFACT_VERSION_BASE)) { + artifactVersionBase.addMixin(SlcTypes.SLC_ARTIFACT_VERSION_BASE); + artifactVersionBase.setProperty(SlcNames.SLC_ARTIFACT_VERSION, artifact.getBaseVersion()); + artifactVersionBase.setProperty(SlcNames.SLC_ARTIFACT_ID, artifact.getArtifactId()); + artifactVersionBase.setProperty(SlcNames.SLC_GROUP_ID, artifact.getGroupId()); } JcrUtils.updateLastModified(artifactVersionBase); @@ -127,10 +110,8 @@ public class ArtifactIndexer implements NodeIndexer, SlcNames { Node artifactBase = artifactVersionBase.getParent(); if (!artifactBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { artifactBase.addMixin(SlcTypes.SLC_ARTIFACT_BASE); - artifactBase.setProperty(SlcNames.SLC_ARTIFACT_ID, - artifact.getArtifactId()); - artifactBase.setProperty(SlcNames.SLC_GROUP_ID, - artifact.getGroupId()); + artifactBase.setProperty(SlcNames.SLC_ARTIFACT_ID, artifact.getArtifactId()); + artifactBase.setProperty(SlcNames.SLC_GROUP_ID, artifact.getGroupId()); } JcrUtils.updateLastModified(artifactBase); @@ -141,17 +122,14 @@ public class ArtifactIndexer implements NodeIndexer, SlcNames { // + " is also artifact base"); // } groupBase.addMixin(SlcTypes.SLC_GROUP_BASE); - groupBase.setProperty(SlcNames.SLC_GROUP_BASE_ID, - artifact.getGroupId()); + groupBase.setProperty(SlcNames.SLC_GROUP_BASE_ID, artifact.getGroupId()); } - JcrUtils.updateLastModifiedAndParents(groupBase, - RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH); + JcrUtils.updateLastModifiedAndParents(groupBase, RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH); if (log.isTraceEnabled()) log.trace("Indexed artifact " + artifact + " on " + fileNode); } catch (Exception e) { - throw new SlcException("Cannot index artifact " + artifact - + " metadata on node " + fileNode, e); + throw new SlcException("Cannot index artifact " + artifact + " metadata on node " + fileNode, e); } } @@ -170,71 +148,55 @@ public class ArtifactIndexer implements NodeIndexer, SlcNames { private String generatePomForBundle(Node n) throws RepositoryException { StringBuffer p = new StringBuffer(); p.append("\n"); - p.append("\n"); + p.append( + "\n"); p.append("4.0.0"); // Categorized name version - p.append("").append(JcrUtils.get(n, SLC_GROUP_ID)) - .append("\n"); - p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_ID)) - .append("\n"); - p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_VERSION)) - .append("\n"); + p.append("").append(JcrUtils.get(n, SLC_GROUP_ID)).append("\n"); + p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_ID)).append("\n"); + p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_VERSION)).append("\n"); // TODO make it more generic p.append("jar\n"); if (n.hasProperty(SLC_ + Constants.BUNDLE_NAME)) - p.append("") - .append(JcrUtils.get(n, SLC_ + Constants.BUNDLE_NAME)) - .append("\n"); + p.append("").append(JcrUtils.get(n, SLC_ + Constants.BUNDLE_NAME)).append("\n"); if (n.hasProperty(SLC_ + Constants.BUNDLE_DESCRIPTION)) - p.append("") - .append(JcrUtils - .get(n, SLC_ + Constants.BUNDLE_DESCRIPTION)) + p.append("").append(JcrUtils.get(n, SLC_ + Constants.BUNDLE_DESCRIPTION)) .append("\n"); // Dependencies in case of a distribution if (n.isNodeType(SlcTypes.SLC_MODULAR_DISTRIBUTION)) { - p.append(getDependenciesSnippet(n.getNode(SlcNames.SLC_MODULES) - .getNodes())); - p.append(getDependencyManagementSnippet(n.getNode( - SlcNames.SLC_MODULES).getNodes())); + p.append(getDependenciesSnippet(n.getNode(SlcNames.SLC_MODULES).getNodes())); + p.append(getDependencyManagementSnippet(n.getNode(SlcNames.SLC_MODULES).getNodes())); } p.append("\n"); return p.toString(); } - private String getDependenciesSnippet(NodeIterator nit) - throws RepositoryException { + private String getDependenciesSnippet(NodeIterator nit) throws RepositoryException { StringBuilder b = new StringBuilder(); b.append("\n"); while (nit.hasNext()) { Node currModule = nit.nextNode(); if (currModule.isNodeType(SlcTypes.SLC_MODULE_COORDINATES)) { - b.append(getDependencySnippet( - currModule.getProperty(SlcNames.SLC_CATEGORY) - .getString(), - currModule.getProperty(SlcNames.SLC_NAME).getString(), - null)); + b.append(getDependencySnippet(currModule.getProperty(SlcNames.SLC_CATEGORY).getString(), + currModule.getProperty(SlcNames.SLC_NAME).getString(), null)); } } b.append("\n"); return b.toString(); } - private String getDependencyManagementSnippet(NodeIterator nit) - throws RepositoryException { + private String getDependencyManagementSnippet(NodeIterator nit) throws RepositoryException { StringBuilder b = new StringBuilder(); b.append("\n"); b.append("\n"); while (nit.hasNext()) { Node currModule = nit.nextNode(); if (currModule.isNodeType(SlcTypes.SLC_MODULE_COORDINATES)) { - b.append(getDependencySnippet( - currModule.getProperty(SlcNames.SLC_CATEGORY) - .getString(), + b.append(getDependencySnippet(currModule.getProperty(SlcNames.SLC_CATEGORY).getString(), currModule.getProperty(SlcNames.SLC_NAME).getString(), - currModule.getProperty(SlcNames.SLC_VERSION) - .getString())); + currModule.getProperty(SlcNames.SLC_VERSION).getString())); } } b.append("\n"); @@ -242,8 +204,7 @@ public class ArtifactIndexer implements NodeIndexer, SlcNames { return b.toString(); } - private String getDependencySnippet(String category, String name, - String version) { + private String getDependencySnippet(String category, String name, String version) { StringBuilder b = new StringBuilder(); b.append("\n"); b.append("\t").append(category).append("\n"); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java index 95fa918b1..5d4bf5bc0 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/JarFileIndexer.java @@ -24,8 +24,7 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -38,7 +37,7 @@ import org.osgi.framework.Version; * from MANIFEST) */ public class JarFileIndexer implements NodeIndexer, SlcNames { - private final static Log log = LogFactory.getLog(JarFileIndexer.class); + private final static CmsLog log = CmsLog.getLog(JarFileIndexer.class); private Boolean force = false; public Boolean support(String path) { @@ -77,12 +76,10 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { manifest.write(bo); byte[] newManifest = bo.toByteArray(); if (fileNode.hasProperty(SLC_MANIFEST)) { - byte[] storedManifest = JcrUtils.getBinaryAsBytes(fileNode - .getProperty(SLC_MANIFEST)); + byte[] storedManifest = JcrUtils.getBinaryAsBytes(fileNode.getProperty(SLC_MANIFEST)); if (Arrays.equals(newManifest, storedManifest)) { if (log.isTraceEnabled()) - log.trace("Manifest not changed, doing nothing " - + fileNode); + log.trace("Manifest not changed, doing nothing " + fileNode); return; } } @@ -136,8 +133,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { } - private void getI18nValues(Binary fileBinary, Attributes attrs) - throws IOException { + private void getI18nValues(Binary fileBinary, Attributes attrs) throws IOException { JarInputStream jarIn = null; try { jarIn = new JarInputStream(fileBinary.getStream()); @@ -162,8 +158,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { browse: if (bundleLocalization != null) { JarEntry entry = jarIn.getNextJarEntry(); while (entry != null) { - if (entry.getName().equals( - bundleLocalization + ".properties")) { + if (entry.getName().equals(bundleLocalization + ".properties")) { jarEntry = entry; // if(je.getSize() != -1){ @@ -203,19 +198,15 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { } } } catch (RepositoryException e) { - throw new SlcException( - "Error while reading the jar binary content " + fileBinary, - e); + throw new SlcException("Error while reading the jar binary content " + fileBinary, e); } catch (IOException ioe) { - throw new SlcException("unable to get internationalized values", - ioe); + throw new SlcException("unable to get internationalized values", ioe); } finally { IOUtils.closeQuietly(jarIn); } } - protected void addOsgiMetadata(Node fileNode, Attributes attrs) - throws RepositoryException { + protected void addOsgiMetadata(Node fileNode, Attributes attrs) throws RepositoryException { // TODO remove this ? // Compulsory for the time being, because bundle artifact extends @@ -250,12 +241,9 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { addAttr(Constants.BUNDLE_LOCALIZATION, fileNode, attrs); // required execution environment - if (attrs.containsKey(new Name( - Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT))) - fileNode.setProperty(SlcNames.SLC_ - + Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT, attrs - .getValue(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT) - .split(",")); + if (attrs.containsKey(new Name(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT))) + fileNode.setProperty(SlcNames.SLC_ + Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT, + attrs.getValue(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT).split(",")); // bundle classpath if (attrs.containsKey(new Name(Constants.BUNDLE_CLASSPATH))) @@ -266,8 +254,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { Version version = new Version(attrs.getValue(Constants.BUNDLE_VERSION)); fileNode.setProperty(SlcNames.SLC_BUNDLE_VERSION, version.toString()); cleanSubNodes(fileNode, SlcNames.SLC_ + Constants.BUNDLE_VERSION); - Node bundleVersionNode = fileNode.addNode(SlcNames.SLC_ - + Constants.BUNDLE_VERSION, SlcTypes.SLC_OSGI_VERSION); + Node bundleVersionNode = fileNode.addNode(SlcNames.SLC_ + Constants.BUNDLE_VERSION, SlcTypes.SLC_OSGI_VERSION); mapOsgiVersion(version, bundleVersionNode); // fragment @@ -275,13 +262,11 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { if (attrs.containsKey(new Name(Constants.FRAGMENT_HOST))) { String fragmentHost = attrs.getValue(Constants.FRAGMENT_HOST); String[] tokens = fragmentHost.split(";"); - Node node = fileNode.addNode(SlcNames.SLC_ - + Constants.FRAGMENT_HOST, SlcTypes.SLC_FRAGMENT_HOST); + Node node = fileNode.addNode(SlcNames.SLC_ + Constants.FRAGMENT_HOST, SlcTypes.SLC_FRAGMENT_HOST); node.setProperty(SlcNames.SLC_SYMBOLIC_NAME, tokens[0]); for (int i = 1; i < tokens.length; i++) { if (tokens[i].startsWith(Constants.BUNDLE_VERSION_ATTRIBUTE)) { - node.setProperty(SlcNames.SLC_BUNDLE_VERSION, - attributeValue(tokens[i])); + node.setProperty(SlcNames.SLC_BUNDLE_VERSION, attributeValue(tokens[i])); } } } @@ -293,20 +278,14 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { List packages = parseCommaSeparated(importPackages); for (String pkg : packages) { String[] tokens = pkg.split(";"); - Node node = fileNode.addNode(SlcNames.SLC_ - + Constants.IMPORT_PACKAGE, - SlcTypes.SLC_IMPORTED_PACKAGE); + Node node = fileNode.addNode(SlcNames.SLC_ + Constants.IMPORT_PACKAGE, SlcTypes.SLC_IMPORTED_PACKAGE); node.setProperty(SlcNames.SLC_NAME, tokens[0]); for (int i = 1; i < tokens.length; i++) { if (tokens[i].startsWith(Constants.VERSION_ATTRIBUTE)) { - node.setProperty(SlcNames.SLC_VERSION, - attributeValue(tokens[i])); - } else if (tokens[i] - .startsWith(Constants.RESOLUTION_DIRECTIVE)) { - node.setProperty( - SlcNames.SLC_OPTIONAL, - directiveValue(tokens[i]).equals( - Constants.RESOLUTION_OPTIONAL)); + node.setProperty(SlcNames.SLC_VERSION, attributeValue(tokens[i])); + } else if (tokens[i].startsWith(Constants.RESOLUTION_DIRECTIVE)) { + node.setProperty(SlcNames.SLC_OPTIONAL, + directiveValue(tokens[i]).equals(Constants.RESOLUTION_OPTIONAL)); } } } @@ -315,19 +294,16 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { // dynamic import package cleanSubNodes(fileNode, SlcNames.SLC_ + Constants.DYNAMICIMPORT_PACKAGE); if (attrs.containsKey(new Name(Constants.DYNAMICIMPORT_PACKAGE))) { - String importPackages = attrs - .getValue(Constants.DYNAMICIMPORT_PACKAGE); + String importPackages = attrs.getValue(Constants.DYNAMICIMPORT_PACKAGE); List packages = parseCommaSeparated(importPackages); for (String pkg : packages) { String[] tokens = pkg.split(";"); - Node node = fileNode.addNode(SlcNames.SLC_ - + Constants.DYNAMICIMPORT_PACKAGE, + Node node = fileNode.addNode(SlcNames.SLC_ + Constants.DYNAMICIMPORT_PACKAGE, SlcTypes.SLC_DYNAMIC_IMPORTED_PACKAGE); node.setProperty(SlcNames.SLC_NAME, tokens[0]); for (int i = 1; i < tokens.length; i++) { if (tokens[i].startsWith(Constants.VERSION_ATTRIBUTE)) { - node.setProperty(SlcNames.SLC_VERSION, - attributeValue(tokens[i])); + node.setProperty(SlcNames.SLC_VERSION, attributeValue(tokens[i])); } } } @@ -340,9 +316,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { List packages = parseCommaSeparated(exportPackages); for (String pkg : packages) { String[] tokens = pkg.split(";"); - Node node = fileNode.addNode(SlcNames.SLC_ - + Constants.EXPORT_PACKAGE, - SlcTypes.SLC_EXPORTED_PACKAGE); + Node node = fileNode.addNode(SlcNames.SLC_ + Constants.EXPORT_PACKAGE, SlcTypes.SLC_EXPORTED_PACKAGE); node.setProperty(SlcNames.SLC_NAME, tokens[0]); // TODO: are these cleans really necessary? cleanSubNodes(node, SlcNames.SLC_USES); @@ -350,8 +324,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { for (int i = 1; i < tokens.length; i++) { if (tokens[i].startsWith(Constants.VERSION_ATTRIBUTE)) { String versionStr = attributeValue(tokens[i]); - Node versionNode = node.addNode(SlcNames.SLC_VERSION, - SlcTypes.SLC_OSGI_VERSION); + Node versionNode = node.addNode(SlcNames.SLC_VERSION, SlcTypes.SLC_OSGI_VERSION); mapOsgiVersion(new Version(versionStr), versionNode); } else if (tokens[i].startsWith(Constants.USES_DIRECTIVE)) { String usedPackages = directiveValue(tokens[i]); @@ -360,8 +333,7 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { // log.debug("usedPackage='" + // usedPackage + // "'"); - Node usesNode = node.addNode(SlcNames.SLC_USES, - SlcTypes.SLC_JAVA_PACKAGE); + Node usesNode = node.addNode(SlcNames.SLC_USES, SlcTypes.SLC_JAVA_PACKAGE); usesNode.setProperty(SlcNames.SLC_NAME, usedPackage); } } @@ -376,21 +348,14 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { List bundles = parseCommaSeparated(requireBundle); for (String bundle : bundles) { String[] tokens = bundle.split(";"); - Node node = fileNode.addNode(SlcNames.SLC_ - + Constants.REQUIRE_BUNDLE, - SlcTypes.SLC_REQUIRED_BUNDLE); + Node node = fileNode.addNode(SlcNames.SLC_ + Constants.REQUIRE_BUNDLE, SlcTypes.SLC_REQUIRED_BUNDLE); node.setProperty(SlcNames.SLC_SYMBOLIC_NAME, tokens[0]); for (int i = 1; i < tokens.length; i++) { - if (tokens[i] - .startsWith(Constants.BUNDLE_VERSION_ATTRIBUTE)) { - node.setProperty(SlcNames.SLC_BUNDLE_VERSION, - attributeValue(tokens[i])); - } else if (tokens[i] - .startsWith(Constants.RESOLUTION_DIRECTIVE)) { - node.setProperty( - SlcNames.SLC_OPTIONAL, - directiveValue(tokens[i]).equals( - Constants.RESOLUTION_OPTIONAL)); + if (tokens[i].startsWith(Constants.BUNDLE_VERSION_ATTRIBUTE)) { + node.setProperty(SlcNames.SLC_BUNDLE_VERSION, attributeValue(tokens[i])); + } else if (tokens[i].startsWith(Constants.RESOLUTION_DIRECTIVE)) { + node.setProperty(SlcNames.SLC_OPTIONAL, + directiveValue(tokens[i]).equals(Constants.RESOLUTION_OPTIONAL)); } } } @@ -398,21 +363,18 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { } - private void addAttr(String key, Node node, Attributes attrs) - throws RepositoryException { + private void addAttr(String key, Node node, Attributes attrs) throws RepositoryException { addAttr(new Name(key), node, attrs); } - private void addAttr(Name key, Node node, Attributes attrs) - throws RepositoryException { + private void addAttr(Name key, Node node, Attributes attrs) throws RepositoryException { if (attrs.containsKey(key)) { String value = attrs.getValue(key); node.setProperty(SlcNames.SLC_ + key, value); } } - private void cleanSubNodes(Node node, String name) - throws RepositoryException { + private void cleanSubNodes(Node node, String name) throws RepositoryException { if (node.hasNode(name)) { NodeIterator nit = node.getNodes(name); while (nit.hasNext()) @@ -465,15 +427,13 @@ public class JarFileIndexer implements NodeIndexer, SlcNames { return res; } - protected void mapOsgiVersion(Version version, Node versionNode) - throws RepositoryException { + protected void mapOsgiVersion(Version version, Node versionNode) throws RepositoryException { versionNode.setProperty(SlcNames.SLC_AS_STRING, version.toString()); versionNode.setProperty(SlcNames.SLC_MAJOR, version.getMajor()); versionNode.setProperty(SlcNames.SLC_MINOR, version.getMinor()); versionNode.setProperty(SlcNames.SLC_MICRO, version.getMicro()); if (!version.getQualifier().equals("")) - versionNode.setProperty(SlcNames.SLC_QUALIFIER, - version.getQualifier()); + versionNode.setProperty(SlcNames.SLC_QUALIFIER, version.getQualifier()); } public void setForce(Boolean force) { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java index 77e8f8422..7d854a1c5 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionIndexer.java @@ -18,8 +18,7 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.DefaultCategoryNameVersion; @@ -42,7 +41,7 @@ import org.osgi.framework.Constants; * file contains a tag "dependencyManagement" that list all modules */ public class ModularDistributionIndexer implements NodeIndexer, SlcNames { - private final static Log log = LogFactory.getLog(ModularDistributionIndexer.class); + private final static CmsLog log = CmsLog.getLog(ModularDistributionIndexer.class); // Constants for csv indexing private final static String INDEX_FILE_NAME = "modularDistribution.csv"; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java index 0ce3ba920..6b8aee95e 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/PdeSourcesIndexer.java @@ -7,8 +7,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -22,7 +21,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; * "...-sources.jar" */ public class PdeSourcesIndexer implements NodeIndexer { - private Log log = LogFactory.getLog(PdeSourcesIndexer.class); + private CmsLog log = CmsLog.getLog(PdeSourcesIndexer.class); private String artifactBasePath = RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoConstants.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoConstants.java index 0645664c8..38f274ad8 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoConstants.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoConstants.java @@ -1,6 +1,6 @@ package org.argeo.slc.repo; -import org.argeo.api.NodeConstants; +import org.argeo.api.cms.CmsConstants; /** SLC repository constants */ public interface RepoConstants { @@ -23,5 +23,5 @@ public interface RepoConstants { String SLC_CATEGORY_ID = "SLC-Category"; // TODO find a more generic way - String DEFAULT_DEFAULT_WORKSPACE = NodeConstants.SYS_WORKSPACE; + String DEFAULT_DEFAULT_WORKSPACE = CmsConstants.SYS_WORKSPACE; } diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java index 8041cf0f3..567ea36d5 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java @@ -27,8 +27,7 @@ import javax.jcr.query.Query; import javax.jcr.query.QueryResult; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.jcr.CmsJcrUtils; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; @@ -44,7 +43,7 @@ import org.xml.sax.SAXException; * we copy the content of the source workspace into the target one. */ public class RepoSync implements Runnable { - private final static Log log = LogFactory.getLog(RepoSync.class); + private final static CmsLog log = CmsLog.getLog(RepoSync.class); // Centralizes definition of workspaces that must be ignored by the sync. private final static List IGNORED_WKSP_LIST = Arrays.asList("security", "localrepo"); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java index cad15d64c..3daa8079b 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoUtils.java @@ -34,14 +34,13 @@ import javax.jcr.nodetype.NodeType; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ArgeoNames; import org.argeo.cms.ArgeoTypes; import org.argeo.cms.jcr.CmsJcrUtils; +import org.argeo.cms.security.Keyring; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; -import org.argeo.api.security.Keyring; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -55,7 +54,7 @@ import org.osgi.framework.Constants; /** Utilities around repo */ public class RepoUtils implements ArgeoNames, SlcNames { - private final static Log log = LogFactory.getLog(RepoUtils.class); + private final static CmsLog log = CmsLog.getLog(RepoUtils.class); /** Packages a regular sources jar as PDE source. */ public static void packagesAsPdeSource(File sourceFile, @@ -627,8 +626,7 @@ public class RepoUtils implements ArgeoNames, SlcNames { monitor.worked(1); } catch (RepositoryException e) { - throw new SlcException("Cannot copy " + fromNode + " to " + toNode, - e); + throw new SlcException("Cannot copy " + fromNode + " to " + toNode, e); } } diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/AbstractJcrRepoManager.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/AbstractJcrRepoManager.java index 4bdda83cf..8099d7dce 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/AbstractJcrRepoManager.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/AbstractJcrRepoManager.java @@ -9,8 +9,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcConstants; import org.argeo.slc.SlcException; @@ -18,8 +17,7 @@ import org.argeo.slc.repo.NodeIndexer; /** Generic operations on a JCR-based repo. */ abstract class AbstractJcrRepoManager { - private final static Log log = LogFactory - .getLog(AbstractJcrRepoManager.class); + private final static CmsLog log = CmsLog.getLog(AbstractJcrRepoManager.class); private String securityWorkspace = "security"; private Repository jcrRepository; @@ -33,8 +31,7 @@ abstract class AbstractJcrRepoManager { public void init() { try { adminSession = jcrRepository.login(); - String[] workspaceNames = adminSession.getWorkspace() - .getAccessibleWorkspaceNames(); + String[] workspaceNames = adminSession.getWorkspace().getAccessibleWorkspaceNames(); for (String workspaceName : workspaceNames) { if (workspaceName.equals(securityWorkspace)) continue; @@ -62,16 +59,14 @@ abstract class AbstractJcrRepoManager { try { try { jcrRepository.login(workspaceName); - throw new SlcException("Workspace " + workspaceName - + " exists already."); + throw new SlcException("Workspace " + workspaceName + " exists already."); } catch (NoSuchWorkspaceException e) { // try to create workspace adminSession.getWorkspace().createWorkspace(workspaceName); workspaceInit(workspaceName); } } catch (RepositoryException e) { - throw new SlcException("Cannot create workspace " + workspaceName, - e); + throw new SlcException("Cannot create workspace " + workspaceName, e); } } @@ -80,10 +75,8 @@ abstract class AbstractJcrRepoManager { try { workspaceAdminSession = jcrRepository.login(workspaceName); workspaceSessions.put(workspaceName, adminSession); - JcrUtils.addPrivilege(workspaceAdminSession, "/", - SlcConstants.ROLE_SLC, "jcr:all"); - WorkspaceIndexer workspaceIndexer = new WorkspaceIndexer( - workspaceAdminSession, nodeIndexers); + JcrUtils.addPrivilege(workspaceAdminSession, "/", SlcConstants.ROLE_SLC, "jcr:all"); + WorkspaceIndexer workspaceIndexer = new WorkspaceIndexer(workspaceAdminSession, nodeIndexers); workspaceIndexers.put(workspaceName, workspaceIndexer); } catch (RepositoryException e) { log.error("Cannot initialize workspace " + workspaceName, e); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java index bca40cb01..fcd6ba99b 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/RepoServiceImpl.java @@ -4,7 +4,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryFactory; import javax.jcr.Session; -import org.argeo.api.security.Keyring; +import org.argeo.cms.security.Keyring; import org.argeo.slc.repo.RepoService; import org.argeo.slc.repo.RepoUtils; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/WorkspaceIndexer.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/WorkspaceIndexer.java index d0233c39d..958165d19 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/core/WorkspaceIndexer.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/core/WorkspaceIndexer.java @@ -9,15 +9,14 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventIterator; import javax.jcr.observation.EventListener; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.repo.NodeIndexer; /** Maintains the metadata of a workspace, using listeners */ public class WorkspaceIndexer { - private final static Log log = LogFactory.getLog(WorkspaceIndexer.class); + private final static CmsLog log = CmsLog.getLog(WorkspaceIndexer.class); private final Session adminSession; private IndexingListener artifactListener; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/AetherUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/AetherUtils.java index e9360f9f2..e8b07c12c 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/AetherUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/AetherUtils.java @@ -3,8 +3,7 @@ package org.argeo.slc.repo.maven; import java.util.regex.Pattern; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; @@ -17,7 +16,7 @@ public class AetherUtils { public static final Pattern SNAPSHOT_TIMESTAMP = Pattern .compile("^(.*-)?([0-9]{8}.[0-9]{6}-[0-9]+)$"); - private final static Log log = LogFactory.getLog(AetherUtils.class); + private final static CmsLog log = CmsLog.getLog(AetherUtils.class); /** Logs a dependency node and its transitive dependencies as a tree. */ public static void logDependencyNode(int depth, diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java index 3ccc164c7..095b37176 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/GenerateBinaries.java @@ -13,8 +13,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -32,7 +31,7 @@ import org.osgi.framework.Version; * group. */ public class GenerateBinaries implements Runnable, SlcNames { - private final static Log log = LogFactory.getLog(GenerateBinaries.class); + private final static CmsLog log = CmsLog.getLog(GenerateBinaries.class); // Connection info private Repository repository; @@ -49,10 +48,8 @@ public class GenerateBinaries implements Runnable, SlcNames { private List excludedSuffixes = new ArrayList(); // Indexes - private Set binaries = new TreeSet( - new ArtifactIdComparator()); - private Set sources = new TreeSet( - new ArtifactIdComparator()); + private Set binaries = new TreeSet(new ArtifactIdComparator()); + private Set sources = new TreeSet(new ArtifactIdComparator()); // local cache private ArtifactIndexer artifactIndexer = new ArtifactIndexer(); @@ -62,13 +59,11 @@ public class GenerateBinaries implements Runnable, SlcNames { Session session = null; try { session = repository.login(credentials, workspace); - Node groupNode = session.getNode(MavenConventionsUtils.groupPath( - artifactBasePath, groupId)); + Node groupNode = session.getNode(MavenConventionsUtils.groupPath(artifactBasePath, groupId)); internalPreProcessing(groupNode, null); internalProcessing(groupNode, null); } catch (Exception e) { - throw new SlcException("Cannot normalize group " + groupId + " in " - + workspace, e); + throw new SlcException("Cannot normalize group " + groupId + " in " + workspace, e); } finally { JcrUtils.logoutQuietly(session); } @@ -78,18 +73,15 @@ public class GenerateBinaries implements Runnable, SlcNames { * Generates binaries-, sources- and sdk-version.pom artifacts for the given * version (or the highest of all children version if none is precised). * - * By default, it includes each latest version of all artifact of this - * group. + * By default, it includes each latest version of all artifact of this group. * * The 3 generated artifacts are then marked as modular distributions and * indexed. */ - public static void processGroupNode(Node groupNode, String version, - JcrMonitor monitor) throws RepositoryException { + public static void processGroupNode(Node groupNode, String version, JcrMonitor monitor) throws RepositoryException { // TODO set artifactsBase based on group node GenerateBinaries gb = new GenerateBinaries(); - String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID) - .getString(); + String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID).getString(); gb.setGroupId(groupId); gb.setVersion(version); // TODO use already done pre-processing @@ -98,12 +90,10 @@ public class GenerateBinaries implements Runnable, SlcNames { } /** Only builds local indexes. Does not change anything in the local Session */ - public static GenerateBinaries preProcessGroupNode(Node groupNode, - JcrMonitor monitor) throws RepositoryException { + public static GenerateBinaries preProcessGroupNode(Node groupNode, JcrMonitor monitor) throws RepositoryException { // TODO set artifactsBase based on group node GenerateBinaries gb = new GenerateBinaries(); - String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID) - .getString(); + String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID).getString(); gb.setGroupId(groupId); // gb.setVersion(version); // gb.setOverridePoms(overridePoms); @@ -117,8 +107,7 @@ public class GenerateBinaries implements Runnable, SlcNames { } public Artifact getHighestArtifactVersion() throws RepositoryException { - return allArtifactsHighestVersion == null ? null : RepoUtils - .asArtifact(allArtifactsHighestVersion); + return allArtifactsHighestVersion == null ? null : RepoUtils.asArtifact(allArtifactsHighestVersion); } // ////////////////////////////////////// @@ -128,12 +117,11 @@ public class GenerateBinaries implements Runnable, SlcNames { * Browse all children of a Node considered as a folder that follows Aether * conventions i.e that has Aether's artifact base as children. * - * Each of such child contains a set of Aether artifact versions. This - * methods build the binaries {@code Set} and other indexes. It - * does not impact the + * Each of such child contains a set of Aether artifact versions. This methods + * build the binaries {@code Set} and other indexes. It does not + * impact the */ - protected void internalPreProcessing(Node groupNode, JcrMonitor monitor) - throws RepositoryException { + protected void internalPreProcessing(Node groupNode, JcrMonitor monitor) throws RepositoryException { if (monitor != null) monitor.subTask("Pre processing group " + groupId); @@ -141,8 +129,7 @@ public class GenerateBinaries implements Runnable, SlcNames { // gathering latest versions of each artifact allArtifactsHighestVersion = null; - aBases: for (NodeIterator aBases = groupNode.getNodes(); aBases - .hasNext();) { + aBases: for (NodeIterator aBases = groupNode.getNodes(); aBases.hasNext();) { Node aBase = aBases.nextNode(); if (aBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { Node highestAVersion = getArtifactLatestVersion(aBase); @@ -151,8 +138,7 @@ public class GenerateBinaries implements Runnable, SlcNames { else { // retrieve relevant child node // Information is stored on the NT_FILE child node. - for (NodeIterator files = highestAVersion.getNodes(); files - .hasNext();) { + for (NodeIterator files = highestAVersion.getNodes(); files.hasNext();) { Node file = files.nextNode(); if (file.isNodeType(SlcTypes.SLC_BUNDLE_ARTIFACT)) { if (log.isDebugEnabled()) @@ -171,8 +157,7 @@ public class GenerateBinaries implements Runnable, SlcNames { } /** Does the real job : writes JCR META-DATA and generates binaries */ - protected void internalProcessing(Node groupNode, JcrMonitor monitor) - throws RepositoryException { + protected void internalProcessing(Node groupNode, JcrMonitor monitor) throws RepositoryException { if (monitor != null) monitor.subTask("Processing group " + groupId); @@ -184,11 +169,9 @@ public class GenerateBinaries implements Runnable, SlcNames { // => the version can then be left empty if (version == null || version.trim().equals("")) if (allArtifactsHighestVersion != null) - version = allArtifactsHighestVersion.getProperty( - SLC_ARTIFACT_VERSION).getString(); + version = allArtifactsHighestVersion.getProperty(SLC_ARTIFACT_VERSION).getString(); else - throw new SlcException("Group version " + version - + " is empty."); + throw new SlcException("Group version " + version + " is empty."); // int bundleCount = symbolicNamesToNodes.size(); // int count = 1; @@ -203,16 +186,13 @@ public class GenerateBinaries implements Runnable, SlcNames { // } // indexes - Set indexes = new TreeSet( - new ArtifactIdComparator()); + Set indexes = new TreeSet(new ArtifactIdComparator()); Artifact indexArtifact; - indexArtifact = writeIndex(session, RepoConstants.BINARIES_ARTIFACT_ID, - binaries); + indexArtifact = writeIndex(session, RepoConstants.BINARIES_ARTIFACT_ID, binaries); indexes.add(indexArtifact); - indexArtifact = writeIndex(session, RepoConstants.SOURCES_ARTIFACT_ID, - sources); + indexArtifact = writeIndex(session, RepoConstants.SOURCES_ARTIFACT_ID, sources); indexes.add(indexArtifact); // sdk @@ -222,8 +202,7 @@ public class GenerateBinaries implements Runnable, SlcNames { monitor.worked(1); } - protected void preProcessBundleArtifact(Node bundleNode) - throws RepositoryException { + protected void preProcessBundleArtifact(Node bundleNode) throws RepositoryException { String symbolicName = JcrUtils.get(bundleNode, SLC_SYMBOLIC_NAME); // Sanity check. @@ -233,8 +212,7 @@ public class GenerateBinaries implements Runnable, SlcNames { // Manage source bundles if (symbolicName.endsWith(".source")) { // TODO make a shared node with classifier 'sources'? - String bundleName = RepoUtils - .extractBundleNameFromSourceName(symbolicName); + String bundleName = RepoUtils.extractBundleNameFromSourceName(symbolicName); for (String excludedSuffix : excludedSuffixes) { if (bundleName.endsWith(excludedSuffix)) return;// skip adding to sources @@ -262,8 +240,7 @@ public class GenerateBinaries implements Runnable, SlcNames { // Extra check. to remove if (bundleNode.getSession().hasPendingChanges()) - throw new SlcException("Pending changes in the session, " - + "this should not be true here."); + throw new SlcException("Pending changes in the session, " + "this should not be true here."); } // protected void processBundleArtifact(Node bundleNode) @@ -292,25 +269,19 @@ public class GenerateBinaries implements Runnable, SlcNames { // LOCAL WRITERS // - private Artifact writeIndex(Session session, String artifactId, - Set artifacts) throws RepositoryException { - Artifact artifact = new DefaultArtifact(groupId, artifactId, "pom", - version); - Artifact parentArtifact = parentPomCoordinates != null ? new DefaultArtifact( - parentPomCoordinates) : null; - String pom = MavenConventionsUtils.artifactsAsDependencyPom(artifact, - artifacts, parentArtifact); - Node node = RepoUtils.copyBytesAsArtifact( - session.getNode(artifactBasePath), artifact, pom.getBytes()); + private Artifact writeIndex(Session session, String artifactId, Set artifacts) + throws RepositoryException { + Artifact artifact = new DefaultArtifact(groupId, artifactId, "pom", version); + Artifact parentArtifact = parentPomCoordinates != null ? new DefaultArtifact(parentPomCoordinates) : null; + String pom = MavenConventionsUtils.artifactsAsDependencyPom(artifact, artifacts, parentArtifact); + Node node = RepoUtils.copyBytesAsArtifact(session.getNode(artifactBasePath), artifact, pom.getBytes()); artifactIndexer.index(node); // TODO factorize String pomSha = JcrUtils.checksumFile(node, "SHA-1"); - JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".sha1", - pomSha.getBytes()); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".sha1", pomSha.getBytes()); String pomMd5 = JcrUtils.checksumFile(node, "MD5"); - JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".md5", - pomMd5.getBytes()); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".md5", pomMd5.getBytes()); session.save(); return artifact; } @@ -319,8 +290,7 @@ public class GenerateBinaries implements Runnable, SlcNames { private Node getArtifactLatestVersion(Node artifactBase) { try { Node highestAVersion = null; - for (NodeIterator aVersions = artifactBase.getNodes(); aVersions - .hasNext();) { + for (NodeIterator aVersions = artifactBase.getNodes(); aVersions.hasNext();) { Node aVersion = aVersions.nextNode(); if (aVersion.isNodeType(SlcTypes.SLC_ARTIFACT_VERSION_BASE)) { if (highestAVersion == null) { @@ -341,8 +311,7 @@ public class GenerateBinaries implements Runnable, SlcNames { if (currVersion.compareTo(currentHighestVersion) > 0) { highestAVersion = aVersion; } - if (currVersion - .compareTo(extractOsgiVersion(allArtifactsHighestVersion)) > 0) { + if (currVersion.compareTo(extractOsgiVersion(allArtifactsHighestVersion)) > 0) { allArtifactsHighestVersion = aVersion; } } @@ -351,15 +320,12 @@ public class GenerateBinaries implements Runnable, SlcNames { } return highestAVersion; } catch (RepositoryException re) { - throw new SlcException("Unable to get latest version for node " - + artifactBase, re); + throw new SlcException("Unable to get latest version for node " + artifactBase, re); } } - private Version extractOsgiVersion(Node artifactVersion) - throws RepositoryException { - String rawVersion = artifactVersion.getProperty(SLC_ARTIFACT_VERSION) - .getString(); + private Version extractOsgiVersion(Node artifactVersion) throws RepositoryException { + String rawVersion = artifactVersion.getProperty(SLC_ARTIFACT_VERSION).getString(); String cleanVersion = rawVersion.replace("-SNAPSHOT", ".SNAPSHOT"); Version osgiVersion = null; // log invalid version value to enable tracking them @@ -410,7 +376,10 @@ public class GenerateBinaries implements Runnable, SlcNames { // // // XML header // p.append("\n"); - // p.append("\n"); + // p.append("\n"); // p.append("4.0.0"); // // // Artifact diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java index 1d013f57d..fec27166a 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/IndexDistribution.java @@ -9,8 +9,7 @@ import javax.jcr.Repository; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.SlcNames; @@ -20,7 +19,7 @@ import org.eclipse.aether.artifact.Artifact; /** Create a distribution node from a set of artifacts */ public class IndexDistribution implements Runnable { - private final static Log log = LogFactory.getLog(IndexDistribution.class); + private final static CmsLog log = CmsLog.getLog(IndexDistribution.class); private Repository repository; private String workspace; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java index 9487e4d8d..f3e359fc9 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenConventionsUtils.java @@ -3,8 +3,7 @@ package org.argeo.slc.repo.maven; import java.io.File; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.eclipse.aether.artifact.Artifact; /** @@ -12,7 +11,7 @@ import org.eclipse.aether.artifact.Artifact; * based). */ public class MavenConventionsUtils { - private final static Log log = LogFactory.getLog(MavenConventionsUtils.class); + private final static CmsLog log = CmsLog.getLog(MavenConventionsUtils.class); /** * Path to the file identified by this artifact without using Maven diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java index 9a88534a0..caee12b7f 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/MavenProxyServiceImpl.java @@ -11,8 +11,7 @@ import javax.jcr.nodetype.NodeType; import javax.jcr.security.AccessControlException; import javax.jcr.security.Privilege; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.cms.ArgeoNames; import org.argeo.jcr.JcrUtils; import org.argeo.jcr.proxy.AbstractUrlProxy; @@ -25,40 +24,31 @@ import org.argeo.slc.repo.RepoConstants; import org.eclipse.aether.repository.RemoteRepository; /** Synchronises the node repository with remote Maven repositories */ -public class MavenProxyServiceImpl extends AbstractUrlProxy implements - MavenProxyService, ArgeoNames, SlcNames { - private final static Log log = LogFactory - .getLog(MavenProxyServiceImpl.class); +public class MavenProxyServiceImpl extends AbstractUrlProxy implements MavenProxyService, ArgeoNames, SlcNames { + private final static CmsLog log = CmsLog.getLog(MavenProxyServiceImpl.class); private List defaultRepositories = new ArrayList(); /** Initialises the artifacts area. */ @Override - protected void beforeInitSessionSave(Session session) - throws RepositoryException { + protected void beforeInitSessionSave(Session session) throws RepositoryException { JcrUtils.addPrivilege(session, "/", SlcConstants.USER_ANONYMOUS, Privilege.JCR_READ); try { - JcrUtils.addPrivilege(session, "/", SlcConstants.ROLE_SLC, - Privilege.JCR_ALL); + JcrUtils.addPrivilege(session, "/", SlcConstants.ROLE_SLC, Privilege.JCR_ALL); } catch (AccessControlException e) { if (log.isTraceEnabled()) - log.trace("Cannot give jcr:all privileges to " - + SlcConstants.ROLE_SLC); + log.trace("Cannot give jcr:all privileges to " + SlcConstants.ROLE_SLC); } JcrUtils.mkdirsSafe(session, RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH); - Node proxiedRepositories = JcrUtils.mkdirsSafe(session, - RepoConstants.PROXIED_REPOSITORIES); + Node proxiedRepositories = JcrUtils.mkdirsSafe(session, RepoConstants.PROXIED_REPOSITORIES); for (RemoteRepository repository : defaultRepositories) { if (!proxiedRepositories.hasNode(repository.getId())) { - Node proxiedRepository = proxiedRepositories.addNode(repository - .getId()); + Node proxiedRepository = proxiedRepositories.addNode(repository.getId()); proxiedRepository.addMixin(NodeType.MIX_REFERENCEABLE); - JcrUtils.urlToAddressProperties(proxiedRepository, - repository.getUrl()); + JcrUtils.urlToAddressProperties(proxiedRepository, repository.getUrl()); // proxiedRepository.setProperty(SLC_URL, repository.getUrl()); - proxiedRepository.setProperty(SLC_TYPE, - repository.getContentType()); + proxiedRepository.setProperty(SLC_TYPE, repository.getContentType()); } } } @@ -73,13 +63,11 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements throw new SlcException("Session has pending changed"); Node node = null; for (Node proxiedRepository : getBaseUrls(session)) { - String baseUrl = JcrUtils - .urlFromAddressProperties(proxiedRepository); + String baseUrl = JcrUtils.urlFromAddressProperties(proxiedRepository); node = proxyUrl(session, baseUrl, path); if (node != null) { node.addMixin(SlcTypes.SLC_KNOWN_ORIGIN); - Node origin = node - .addNode(SLC_ORIGIN, SlcTypes.SLC_PROXIED); + Node origin = node.addNode(SLC_ORIGIN, SlcTypes.SLC_PROXIED); origin.setProperty(SLC_PROXY, proxiedRepository); JcrUtils.urlToAddressProperties(origin, baseUrl + path); if (log.isDebugEnabled()) @@ -95,19 +83,16 @@ public class MavenProxyServiceImpl extends AbstractUrlProxy implements } } - protected synchronized List getBaseUrls(Session session) - throws RepositoryException { + protected synchronized List getBaseUrls(Session session) throws RepositoryException { List baseUrls = new ArrayList(); - for (NodeIterator nit = session.getNode( - RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit.hasNext();) { + for (NodeIterator nit = session.getNode(RepoConstants.PROXIED_REPOSITORIES).getNodes(); nit.hasNext();) { Node proxiedRepository = nit.nextNode(); baseUrls.add(proxiedRepository); } return baseUrls; } - public void setDefaultRepositories( - List defaultRepositories) { + public void setDefaultRepositories(List defaultRepositories) { this.defaultRepositories = defaultRepositories; } } diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java index a7f7d169d..8e201253a 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/maven/Migration_01_03.java @@ -23,8 +23,7 @@ import javax.jcr.query.qom.QueryObjectModel; import javax.jcr.query.qom.QueryObjectModelFactory; import javax.jcr.query.qom.Selector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -49,7 +48,7 @@ import org.osgi.framework.Constants; */ public class Migration_01_03 implements Runnable, SlcNames { final String SPRING_SOURCE_PREFIX = "com.springsource"; - private final static Log log = LogFactory.getLog(Migration_01_03.class); + private final static CmsLog log = CmsLog.getLog(Migration_01_03.class); private Repository repository; private String sourceWorkspace; @@ -61,8 +60,7 @@ public class Migration_01_03 implements Runnable, SlcNames { private Session origSession; private Session targetSession; - private List systemPackages = OsgiProfile.PROFILE_JAVA_SE_1_6 - .getSystemPackages(); + private List systemPackages = OsgiProfile.PROFILE_JAVA_SE_1_6.getSystemPackages(); private String artifactBasePath = "/"; @@ -70,10 +68,8 @@ public class Migration_01_03 implements Runnable, SlcNames { private JarFileIndexer jarFileIndexer = new JarFileIndexer(); public void init() throws RepositoryException { - origSession = JcrUtils.loginOrCreateWorkspace(repository, - sourceWorkspace); - targetSession = JcrUtils.loginOrCreateWorkspace(repository, - targetWorkspace); + origSession = JcrUtils.loginOrCreateWorkspace(repository, sourceWorkspace); + targetSession = JcrUtils.loginOrCreateWorkspace(repository, targetWorkspace); // works only in OSGi!! // systemPackages = Arrays.asList(System.getProperty( @@ -89,12 +85,10 @@ public class Migration_01_03 implements Runnable, SlcNames { try { // clear target - NodeIterator nit = targetSession.getNode(artifactBasePath) - .getNodes(); + NodeIterator nit = targetSession.getNode(artifactBasePath).getNodes(); while (nit.hasNext()) { Node node = nit.nextNode(); - if (node.isNodeType(NodeType.NT_FOLDER) - || node.isNodeType(NodeType.NT_UNSTRUCTURED)) { + if (node.isNodeType(NodeType.NT_FOLDER) || node.isNodeType(NodeType.NT_UNSTRUCTURED)) { node.remove(); node.getSession().save(); if (log.isDebugEnabled()) @@ -112,23 +106,21 @@ public class Migration_01_03 implements Runnable, SlcNames { processOrigArtifactVersion(origArtifactNode); } } catch (Exception e) { - throw new SlcException("Cannot perform v1.3 migration from " - + sourceWorkspace + " to " + targetWorkspace, e); + throw new SlcException("Cannot perform v1.3 migration from " + sourceWorkspace + " to " + targetWorkspace, + e); } finally { JcrUtils.discardQuietly(targetSession); } } - protected void processOrigArtifactVersion(Node origArtifactNode) - throws RepositoryException, IOException { + protected void processOrigArtifactVersion(Node origArtifactNode) throws RepositoryException, IOException { Artifact origArtifact = RepoUtils.asArtifact(origArtifactNode); // skip eclipse artifacts - if ((origArtifact.getGroupId().startsWith("org.eclipse") && !(origArtifact - .getArtifactId().equals("org.eclipse.osgi") - || origArtifact.getArtifactId().equals( - "org.eclipse.osgi.source") || origArtifact - .getArtifactId().startsWith("org.eclipse.rwt.widgets.upload"))) + if ((origArtifact.getGroupId().startsWith("org.eclipse") + && !(origArtifact.getArtifactId().equals("org.eclipse.osgi") + || origArtifact.getArtifactId().equals("org.eclipse.osgi.source") + || origArtifact.getArtifactId().startsWith("org.eclipse.rwt.widgets.upload"))) || origArtifact.getArtifactId().startsWith("com.ibm.icu")) { if (log.isDebugEnabled()) log.debug("Skip " + origArtifact); @@ -136,20 +128,16 @@ public class Migration_01_03 implements Runnable, SlcNames { } // skip SpringSource ActiveMQ - if (origArtifact.getArtifactId().startsWith( - "com.springsource.org.apache.activemq")) + if (origArtifact.getArtifactId().startsWith("com.springsource.org.apache.activemq")) return; - String origJarNodeName = MavenConventionsUtils - .artifactFileName(origArtifact); + String origJarNodeName = MavenConventionsUtils.artifactFileName(origArtifact); if (!origArtifactNode.hasNode(origJarNodeName)) - throw new SlcException("Cannot find jar node for " - + origArtifactNode); + throw new SlcException("Cannot find jar node for " + origArtifactNode); Node origJarNode = origArtifactNode.getNode(origJarNodeName); // read MANIFEST - Binary manifestBinary = origJarNode.getProperty(SLC_MANIFEST) - .getBinary(); + Binary manifestBinary = origJarNode.getProperty(SLC_MANIFEST).getBinary(); Manifest origManifest = new Manifest(manifestBinary.getStream()); JcrUtils.closeQuietly(manifestBinary); @@ -157,26 +145,23 @@ public class Migration_01_03 implements Runnable, SlcNames { Manifest targetManifest = new Manifest(origManifest); // transform symbolic name - String origSymbolicName = origManifest.getMainAttributes().getValue( - Constants.BUNDLE_SYMBOLICNAME); + String origSymbolicName = origManifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME); final String targetSymbolicName; if (symbolicNamesMapping.containsKey(origSymbolicName)) { targetSymbolicName = symbolicNamesMapping.get(origSymbolicName); } else if (origSymbolicName.startsWith(SPRING_SOURCE_PREFIX) && !origSymbolicName.equals(SPRING_SOURCE_PREFIX + ".json")) { - targetSymbolicName = origSymbolicName - .substring(SPRING_SOURCE_PREFIX.length() + 1); + targetSymbolicName = origSymbolicName.substring(SPRING_SOURCE_PREFIX.length() + 1); } else { targetSymbolicName = origSymbolicName; } if (!targetSymbolicName.equals(origSymbolicName)) { - targetManifest.getMainAttributes().putValue( - Constants.BUNDLE_SYMBOLICNAME, targetSymbolicName); + targetManifest.getMainAttributes().putValue(Constants.BUNDLE_SYMBOLICNAME, targetSymbolicName); manifestModified = true; if (log.isDebugEnabled()) - log.debug(Constants.BUNDLE_SYMBOLICNAME + " to " - + targetSymbolicName + " \t\tfrom " + origSymbolicName); + log.debug( + Constants.BUNDLE_SYMBOLICNAME + " to " + targetSymbolicName + " \t\tfrom " + origSymbolicName); } // skip excluded bundles @@ -184,19 +169,15 @@ public class Migration_01_03 implements Runnable, SlcNames { return; // check fragment host - if (origManifest.getMainAttributes().containsKey( - new Name(Constants.FRAGMENT_HOST))) { - String origFragmentHost = origManifest.getMainAttributes() - .getValue(Constants.FRAGMENT_HOST); + if (origManifest.getMainAttributes().containsKey(new Name(Constants.FRAGMENT_HOST))) { + String origFragmentHost = origManifest.getMainAttributes().getValue(Constants.FRAGMENT_HOST); String targetFragmentHost; if (symbolicNamesMapping.containsKey(origFragmentHost)) { targetFragmentHost = symbolicNamesMapping.get(origFragmentHost); } else if (origFragmentHost.startsWith(SPRING_SOURCE_PREFIX) && !origFragmentHost.equals(SPRING_SOURCE_PREFIX + ".json")) { - targetFragmentHost = origFragmentHost - .substring(SPRING_SOURCE_PREFIX.length() + 1); - } else if (origFragmentHost - .equals("org.argeo.dep.jacob;bundle-version=\"[1.14.3,1.14.4)\"")) { + targetFragmentHost = origFragmentHost.substring(SPRING_SOURCE_PREFIX.length() + 1); + } else if (origFragmentHost.equals("org.argeo.dep.jacob;bundle-version=\"[1.14.3,1.14.4)\"")) { // this one for those who think I cannot be pragmatic - mbaudier targetFragmentHost = "com.jacob;bundle-version=\"[1.14.3,1.14.4)\""; } else { @@ -204,12 +185,10 @@ public class Migration_01_03 implements Runnable, SlcNames { } if (!targetFragmentHost.equals(origFragmentHost)) { - targetManifest.getMainAttributes().putValue( - Constants.FRAGMENT_HOST, targetFragmentHost); + targetManifest.getMainAttributes().putValue(Constants.FRAGMENT_HOST, targetFragmentHost); manifestModified = true; if (log.isDebugEnabled()) - log.debug(Constants.FRAGMENT_HOST + " to " - + targetFragmentHost + " from " + origFragmentHost); + log.debug(Constants.FRAGMENT_HOST + " to " + targetFragmentHost + " from " + origFragmentHost); } } @@ -217,35 +196,28 @@ public class Migration_01_03 implements Runnable, SlcNames { // javax with versions StringBuffer targetImportPackages = new StringBuffer(""); - NodeIterator origImportPackages = origJarNode.getNodes(SLC_ - + Constants.IMPORT_PACKAGE); + NodeIterator origImportPackages = origJarNode.getNodes(SLC_ + Constants.IMPORT_PACKAGE); Boolean importPackagesModified = false; while (origImportPackages.hasNext()) { Node importPackage = origImportPackages.nextNode(); String pkg = importPackage.getProperty(SLC_NAME).getString(); targetImportPackages.append(pkg); if (importPackage.hasProperty(SLC_VERSION)) { - String sourceVersion = importPackage.getProperty(SLC_VERSION) - .getString(); + String sourceVersion = importPackage.getProperty(SLC_VERSION).getString(); String targetVersion = sourceVersion; if (systemPackages.contains(pkg)) { - if (!(sourceVersion.trim().equals("0") || sourceVersion - .trim().equals("0.0.0"))) { + if (!(sourceVersion.trim().equals("0") || sourceVersion.trim().equals("0.0.0"))) { targetVersion = null; importPackagesModified = true; if (log.isDebugEnabled()) - log.debug(origSymbolicName - + ": Nullify version of " + pkg + " from " - + sourceVersion); + log.debug(origSymbolicName + ": Nullify version of " + pkg + " from " + sourceVersion); } } if (targetVersion != null) - targetImportPackages.append(";version=\"") - .append(targetVersion).append("\""); + targetImportPackages.append(";version=\"").append(targetVersion).append("\""); } if (importPackage.hasProperty(SLC_OPTIONAL)) { - Boolean optional = importPackage.getProperty(SLC_OPTIONAL) - .getBoolean(); + Boolean optional = importPackage.getProperty(SLC_OPTIONAL).getBoolean(); if (optional) targetImportPackages.append(";resolution:=\"optional\""); @@ -255,8 +227,7 @@ public class Migration_01_03 implements Runnable, SlcNames { } if (importPackagesModified) { - targetManifest.getMainAttributes().putValue( - Constants.IMPORT_PACKAGE, targetImportPackages.toString()); + targetManifest.getMainAttributes().putValue(Constants.IMPORT_PACKAGE, targetImportPackages.toString()); manifestModified = true; } @@ -266,8 +237,7 @@ public class Migration_01_03 implements Runnable, SlcNames { // target coordinates final String targetGroupId; - if (origArtifact.getArtifactId().startsWith( - "org.eclipse.rwt.widgets.upload")) + if (origArtifact.getArtifactId().startsWith("org.eclipse.rwt.widgets.upload")) targetGroupId = "org.argeo.tp.rap"; else if (origArtifact.getArtifactId().startsWith("org.polymap")) targetGroupId = "org.argeo.tp.rap"; @@ -280,29 +250,22 @@ public class Migration_01_03 implements Runnable, SlcNames { targetGroupId = "org.argeo.tp"; String targetArtifactId = targetSymbolicName.split(";")[0]; - Artifact targetArtifact = new DefaultArtifact(targetGroupId, - targetArtifactId, "jar", origArtifact.getVersion()); - String targetParentPath = MavenConventionsUtils.artifactParentPath( - artifactBasePath, targetArtifact); - String targetFileName = MavenConventionsUtils - .artifactFileName(targetArtifact); + Artifact targetArtifact = new DefaultArtifact(targetGroupId, targetArtifactId, "jar", + origArtifact.getVersion()); + String targetParentPath = MavenConventionsUtils.artifactParentPath(artifactBasePath, targetArtifact); + String targetFileName = MavenConventionsUtils.artifactFileName(targetArtifact); String targetJarPath = targetParentPath + '/' + targetFileName; // copy - Node targetParentNode = JcrUtils.mkfolders(targetSession, - targetParentPath); + Node targetParentNode = JcrUtils.mkfolders(targetSession, targetParentPath); targetSession.save(); if (manifestModified) { - Binary origBinary = origJarNode.getNode(Node.JCR_CONTENT) - .getProperty(Property.JCR_DATA).getBinary(); - byte[] targetJarBytes = RepoUtils.modifyManifest( - origBinary.getStream(), targetManifest); - JcrUtils.copyBytesAsFile(targetParentNode, targetFileName, - targetJarBytes); + Binary origBinary = origJarNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary(); + byte[] targetJarBytes = RepoUtils.modifyManifest(origBinary.getStream(), targetManifest); + JcrUtils.copyBytesAsFile(targetParentNode, targetFileName, targetJarBytes); JcrUtils.closeQuietly(origBinary); } else {// just copy - targetSession.getWorkspace().copy(sourceWorkspace, - origJarNode.getPath(), targetJarPath); + targetSession.getWorkspace().copy(sourceWorkspace, origJarNode.getPath(), targetJarPath); } targetSession.save(); @@ -314,47 +277,36 @@ public class Migration_01_03 implements Runnable, SlcNames { targetSession.save(); // sources - Artifact origSourceArtifact = new DefaultArtifact( - origArtifact.getGroupId(), origArtifact.getArtifactId() - + ".source", "jar", origArtifact.getVersion()); - String origSourcePath = MavenConventionsUtils.artifactPath( - artifactBasePath, origSourceArtifact); + Artifact origSourceArtifact = new DefaultArtifact(origArtifact.getGroupId(), + origArtifact.getArtifactId() + ".source", "jar", origArtifact.getVersion()); + String origSourcePath = MavenConventionsUtils.artifactPath(artifactBasePath, origSourceArtifact); if (origSession.itemExists(origSourcePath)) { Node origSourceJarNode = origSession.getNode(origSourcePath); - Artifact targetSourceArtifact = new DefaultArtifact(targetGroupId, - targetArtifactId + ".source", "jar", + Artifact targetSourceArtifact = new DefaultArtifact(targetGroupId, targetArtifactId + ".source", "jar", origArtifact.getVersion()); - String targetSourceParentPath = MavenConventionsUtils - .artifactParentPath(artifactBasePath, targetSourceArtifact); - String targetSourceFileName = MavenConventionsUtils - .artifactFileName(targetSourceArtifact); - String targetSourceJarPath = targetSourceParentPath + '/' - + targetSourceFileName; - - Node targetSourceParentNode = JcrUtils.mkfolders(targetSession, - targetSourceParentPath); + String targetSourceParentPath = MavenConventionsUtils.artifactParentPath(artifactBasePath, + targetSourceArtifact); + String targetSourceFileName = MavenConventionsUtils.artifactFileName(targetSourceArtifact); + String targetSourceJarPath = targetSourceParentPath + '/' + targetSourceFileName; + + Node targetSourceParentNode = JcrUtils.mkfolders(targetSession, targetSourceParentPath); targetSession.save(); if (!targetSymbolicName.equals(origSymbolicName)) { - Binary origBinary = origSourceJarNode.getNode(Node.JCR_CONTENT) - .getProperty(Property.JCR_DATA).getBinary(); - NameVersion targetNameVersion = RepoUtils - .readNameVersion(targetManifest); - byte[] targetJarBytes = RepoUtils.packageAsPdeSource( - origBinary.getStream(), targetNameVersion); - JcrUtils.copyBytesAsFile(targetSourceParentNode, - targetSourceFileName, targetJarBytes); + Binary origBinary = origSourceJarNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA) + .getBinary(); + NameVersion targetNameVersion = RepoUtils.readNameVersion(targetManifest); + byte[] targetJarBytes = RepoUtils.packageAsPdeSource(origBinary.getStream(), targetNameVersion); + JcrUtils.copyBytesAsFile(targetSourceParentNode, targetSourceFileName, targetJarBytes); JcrUtils.closeQuietly(origBinary); } else {// just copy - targetSession.getWorkspace().copy(sourceWorkspace, - origSourceJarNode.getPath(), targetSourceJarPath); + targetSession.getWorkspace().copy(sourceWorkspace, origSourceJarNode.getPath(), targetSourceJarPath); } targetSession.save(); // reindex - Node targetSourceJarNode = targetSession - .getNode(targetSourceJarPath); + Node targetSourceJarNode = targetSession.getNode(targetSourceJarPath); artifactIndexer.index(targetSourceJarNode); jarFileIndexer.index(targetSourceJarNode); @@ -366,21 +318,18 @@ public class Migration_01_03 implements Runnable, SlcNames { * UTILITIES */ - static NodeIterator listArtifactVersions(Session session) - throws RepositoryException { + static NodeIterator listArtifactVersions(Session session) throws RepositoryException { QueryManager queryManager = session.getWorkspace().getQueryManager(); QueryObjectModelFactory factory = queryManager.getQOMFactory(); final String artifactVersionsSelector = "artifactVersions"; - Selector source = factory.selector(SlcTypes.SLC_ARTIFACT_VERSION_BASE, - artifactVersionsSelector); + Selector source = factory.selector(SlcTypes.SLC_ARTIFACT_VERSION_BASE, artifactVersionsSelector); - Ordering orderByArtifactId = factory.ascending(factory.propertyValue( - artifactVersionsSelector, SlcNames.SLC_ARTIFACT_ID)); + Ordering orderByArtifactId = factory + .ascending(factory.propertyValue(artifactVersionsSelector, SlcNames.SLC_ARTIFACT_ID)); Ordering[] orderings = { orderByArtifactId }; - QueryObjectModel query = factory.createQuery(source, null, orderings, - null); + QueryObjectModel query = factory.createQuery(source, null, orderings, null); QueryResult result = query.execute(); return result.getNodes(); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java index ab52c7069..9088e2803 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveSourcesProvider.java @@ -14,15 +14,13 @@ import javax.jcr.Session; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.repo.OsgiFactory; public class ArchiveSourcesProvider implements SourcesProvider { - private final static Log log = LogFactory - .getLog(ArchiveSourcesProvider.class); + private final static CmsLog log = CmsLog.getLog(ArchiveSourcesProvider.class); private OsgiFactory osgiFactory; private String uri; @@ -39,8 +37,8 @@ public class ArchiveSourcesProvider implements SourcesProvider { log.debug("Wrapping " + uri); Node distNode = osgiFactory.getDist(distSession, uri); - zin = new ZipInputStream(distNode.getNode(Node.JCR_CONTENT) - .getProperty(Property.JCR_DATA).getBinary().getStream()); + zin = new ZipInputStream( + distNode.getNode(Node.JCR_CONTENT).getProperty(Property.JCR_DATA).getBinary().getStream()); // prepare Set directories = new TreeSet(); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java index 2a3e5b0ed..3cb1e9c8f 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArchiveWrapper.java @@ -22,8 +22,7 @@ import javax.jcr.Session; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.DefaultNameVersion; @@ -48,7 +47,7 @@ import aQute.bnd.osgi.Jar; * need further modification. */ public class ArchiveWrapper implements Runnable, ModuleSet, Distribution { - private final static Log log = LogFactory.getLog(ArchiveWrapper.class); + private final static CmsLog log = CmsLog.getLog(ArchiveWrapper.class); private OsgiFactory osgiFactory; private String version; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java index e199fcc5a..3d6adcd7b 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java @@ -15,8 +15,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.ModuleSet; import org.argeo.slc.NameVersion; @@ -32,7 +31,7 @@ import org.osgi.framework.Constants; * A consistent and versioned OSGi distribution, which can be built and tested. */ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements ArgeoOsgiDistribution { - private final static Log log = LogFactory.getLog(ArgeoOsgiDistributionImpl.class); + private final static CmsLog log = CmsLog.getLog(ArgeoOsgiDistributionImpl.class); private List modules = new ArrayList(); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java index ddb569bbd..efd1591cd 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/BndWrapper.java @@ -7,8 +7,7 @@ import java.util.Properties; import java.util.jar.Manifest; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.build.Distribution; @@ -23,7 +22,7 @@ import aQute.bnd.osgi.Jar; /** Utilities around the BND library, which manipulates OSGi metadata. */ public class BndWrapper implements Constants, CategoryNameVersion, Distribution { - private final static Log log = LogFactory.getLog(BndWrapper.class); + private final static CmsLog log = CmsLog.getLog(BndWrapper.class); private String groupId; private String name; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java index 0518bbf1a..626fa72e2 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ImportBundlesZip.java @@ -14,8 +14,7 @@ import javax.jcr.Repository; import javax.jcr.Session; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -33,7 +32,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; */ @Deprecated public class ImportBundlesZip implements Runnable { - private final static Log log = LogFactory.getLog(ImportBundlesZip.class); + private final static CmsLog log = CmsLog.getLog(ImportBundlesZip.class); private Repository repository; private String workspace; private String groupId; @@ -68,8 +67,7 @@ public class ImportBundlesZip implements Runnable { ZipEntry zipEntry = null; entries: while ((zipEntry = zipIn.getNextEntry()) != null) { String entryName = zipEntry.getName(); - if (!entryName.endsWith(".jar") - || entryName.contains("feature")) + if (!entryName.endsWith(".jar") || entryName.contains("feature")) continue entries;// skip byte[] jarBytes = IOUtils.toByteArray(zipIn); zipIn.closeEntry(); @@ -88,8 +86,7 @@ public class ImportBundlesZip implements Runnable { continue entries; } - String bundleName = RepoUtils - .extractBundleNameFromSourceName(nv.getName()); + String bundleName = RepoUtils.extractBundleNameFromSourceName(nv.getName()); // skip excluded bundles and their sources if (excludedBundles.contains(bundleName)) continue entries; @@ -98,10 +95,9 @@ public class ImportBundlesZip implements Runnable { // continue entries; // } - Artifact artifact = new DefaultArtifact(groupId, nv.getName(), - "jar", nv.getVersion()); - Node artifactNode = RepoUtils.copyBytesAsArtifact( - session.getNode(artifactBasePath), artifact, jarBytes); + Artifact artifact = new DefaultArtifact(groupId, nv.getName(), "jar", nv.getVersion()); + Node artifactNode = RepoUtils.copyBytesAsArtifact(session.getNode(artifactBasePath), artifact, + jarBytes); jarBytes = null;// superstition, in order to free memory // indexes @@ -112,8 +108,7 @@ public class ImportBundlesZip implements Runnable { log.debug("Imported " + entryName + " to " + artifactNode); } } catch (Exception e) { - throw new SlcException("Cannot import zip " + zipFile + " to " - + workspace, e); + throw new SlcException("Cannot import zip " + zipFile + " to " + workspace, e); } finally { IOUtils.closeQuietly(zipIn); IOUtils.closeQuietly(jarIn); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java index 6ab23099c..84d29a895 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/MavenWrapper.java @@ -8,8 +8,7 @@ import javax.jcr.Property; import javax.jcr.Session; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.SlcException; @@ -23,7 +22,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; * repositories. */ public class MavenWrapper extends BndWrapper implements Runnable { - private final static Log log = LogFactory.getLog(MavenWrapper.class); + private final static CmsLog log = CmsLog.getLog(MavenWrapper.class); private String sourceCoords; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java index 7a25c4bff..8679c8ce8 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java @@ -15,8 +15,7 @@ import javax.jcr.RepositoryException; import javax.jcr.Session; import org.apache.commons.io.FilenameUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrMonitor; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcException; @@ -41,7 +40,7 @@ import org.osgi.framework.Version; */ @Deprecated public class NormalizeGroup implements Runnable, SlcNames { - private final static Log log = LogFactory.getLog(NormalizeGroup.class); + private final static CmsLog log = CmsLog.getLog(NormalizeGroup.class); private Repository repository; private String workspace; @@ -57,59 +56,49 @@ public class NormalizeGroup implements Runnable, SlcNames { // private JarFileIndexer jarFileIndexer = new JarFileIndexer(); /** TODO make it more generic */ - private List systemPackages = OsgiProfile.PROFILE_JAVA_SE_1_6 - .getSystemPackages(); + private List systemPackages = OsgiProfile.PROFILE_JAVA_SE_1_6.getSystemPackages(); // indexes private Map packagesToSymbolicNames = new HashMap(); private Map symbolicNamesToNodes = new HashMap(); - private Set binaries = new TreeSet( - new ArtifactIdComparator()); - private Set sources = new TreeSet( - new ArtifactIdComparator()); + private Set binaries = new TreeSet(new ArtifactIdComparator()); + private Set sources = new TreeSet(new ArtifactIdComparator()); public void run() { Session session = null; try { session = repository.login(workspace); - Node groupNode = session.getNode(MavenConventionsUtils.groupPath( - artifactBasePath, groupId)); + Node groupNode = session.getNode(MavenConventionsUtils.groupPath(artifactBasePath, groupId)); processGroupNode(groupNode, null); } catch (Exception e) { - throw new SlcException("Cannot normalize group " + groupId + " in " - + workspace, e); + throw new SlcException("Cannot normalize group " + groupId + " in " + workspace, e); } finally { JcrUtils.logoutQuietly(session); } } - public static void processGroupNode(Node groupNode, String version, - Boolean overridePoms, JcrMonitor monitor) + public static void processGroupNode(Node groupNode, String version, Boolean overridePoms, JcrMonitor monitor) throws RepositoryException { // TODO set artifactsBase based on group node NormalizeGroup ng = new NormalizeGroup(); - String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID) - .getString(); + String groupId = groupNode.getProperty(SlcNames.SLC_GROUP_BASE_ID).getString(); ng.setGroupId(groupId); ng.setVersion(version); ng.setOverridePoms(overridePoms); ng.processGroupNode(groupNode, monitor); } - protected void processGroupNode(Node groupNode, JcrMonitor monitor) - throws RepositoryException { + protected void processGroupNode(Node groupNode, JcrMonitor monitor) throws RepositoryException { if (monitor != null) monitor.subTask("Group " + groupId); Node allArtifactsHighestVersion = null; Session session = groupNode.getSession(); - aBases: for (NodeIterator aBases = groupNode.getNodes(); aBases - .hasNext();) { + aBases: for (NodeIterator aBases = groupNode.getNodes(); aBases.hasNext();) { Node aBase = aBases.nextNode(); if (aBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE)) { Node highestAVersion = null; - for (NodeIterator aVersions = aBase.getNodes(); aVersions - .hasNext();) { + for (NodeIterator aVersions = aBase.getNodes(); aVersions.hasNext();) { Node aVersion = aVersions.nextNode(); if (aVersion.isNodeType(SlcTypes.SLC_ARTIFACT_VERSION_BASE)) { if (highestAVersion == null) { @@ -134,8 +123,7 @@ public class NormalizeGroup implements Runnable, SlcNames { if (currVersion.compareTo(currentHighestVersion) > 0) { highestAVersion = aVersion; } - if (currVersion - .compareTo(extractOsgiVersion(allArtifactsHighestVersion)) > 0) { + if (currVersion.compareTo(extractOsgiVersion(allArtifactsHighestVersion)) > 0) { allArtifactsHighestVersion = aVersion; } } @@ -145,8 +133,7 @@ public class NormalizeGroup implements Runnable, SlcNames { } if (highestAVersion == null) continue aBases; - for (NodeIterator files = highestAVersion.getNodes(); files - .hasNext();) { + for (NodeIterator files = highestAVersion.getNodes(); files.hasNext();) { Node file = files.nextNode(); if (file.isNodeType(SlcTypes.SLC_BUNDLE_ARTIFACT)) { preProcessBundleArtifact(file); @@ -165,8 +152,7 @@ public class NormalizeGroup implements Runnable, SlcNames { // => the version can then be left empty if (version == null || version.trim().equals("")) if (allArtifactsHighestVersion != null) - version = allArtifactsHighestVersion.getProperty( - SLC_ARTIFACT_VERSION).getString(); + version = allArtifactsHighestVersion.getProperty(SLC_ARTIFACT_VERSION).getString(); else version = "0.0"; // throw new SlcException("Group version " + version @@ -181,19 +167,15 @@ public class NormalizeGroup implements Runnable, SlcNames { processBundleArtifact(bundleNode); bundleNode.getSession().save(); if (log.isDebugEnabled()) - log.debug(count + "/" + bundleCount + " Processed " - + bundleNode.getName()); + log.debug(count + "/" + bundleCount + " Processed " + bundleNode.getName()); count++; } // indexes - Set indexes = new TreeSet( - new ArtifactIdComparator()); - Artifact indexArtifact = writeIndex(session, - RepoConstants.BINARIES_ARTIFACT_ID, binaries); + Set indexes = new TreeSet(new ArtifactIdComparator()); + Artifact indexArtifact = writeIndex(session, RepoConstants.BINARIES_ARTIFACT_ID, binaries); indexes.add(indexArtifact); - indexArtifact = writeIndex(session, RepoConstants.SOURCES_ARTIFACT_ID, - sources); + indexArtifact = writeIndex(session, RepoConstants.SOURCES_ARTIFACT_ID, sources); indexes.add(indexArtifact); // sdk writeIndex(session, RepoConstants.SDK_ARTIFACT_ID, indexes); @@ -201,10 +183,8 @@ public class NormalizeGroup implements Runnable, SlcNames { monitor.worked(1); } - private Version extractOsgiVersion(Node artifactVersion) - throws RepositoryException { - String rawVersion = artifactVersion.getProperty(SLC_ARTIFACT_VERSION) - .getString(); + private Version extractOsgiVersion(Node artifactVersion) throws RepositoryException { + String rawVersion = artifactVersion.getProperty(SLC_ARTIFACT_VERSION).getString(); String cleanVersion = rawVersion.replace("-SNAPSHOT", ".SNAPSHOT"); Version osgiVersion = null; // log invalid version value to enable tracking them @@ -248,37 +228,29 @@ public class NormalizeGroup implements Runnable, SlcNames { return tmpVersion; } - private Artifact writeIndex(Session session, String artifactId, - Set artifacts) throws RepositoryException { - Artifact artifact = new DefaultArtifact(groupId, artifactId, "pom", - version); - Artifact parentArtifact = parentPomCoordinates != null ? new DefaultArtifact( - parentPomCoordinates) : null; - String pom = MavenConventionsUtils.artifactsAsDependencyPom(artifact, - artifacts, parentArtifact); - Node node = RepoUtils.copyBytesAsArtifact( - session.getNode(artifactBasePath), artifact, pom.getBytes()); + private Artifact writeIndex(Session session, String artifactId, Set artifacts) + throws RepositoryException { + Artifact artifact = new DefaultArtifact(groupId, artifactId, "pom", version); + Artifact parentArtifact = parentPomCoordinates != null ? new DefaultArtifact(parentPomCoordinates) : null; + String pom = MavenConventionsUtils.artifactsAsDependencyPom(artifact, artifacts, parentArtifact); + Node node = RepoUtils.copyBytesAsArtifact(session.getNode(artifactBasePath), artifact, pom.getBytes()); artifactIndexer.index(node); // TODO factorize String pomSha = JcrUtils.checksumFile(node, "SHA-1"); - JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".sha1", - pomSha.getBytes()); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".sha1", pomSha.getBytes()); String pomMd5 = JcrUtils.checksumFile(node, "MD5"); - JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".md5", - pomMd5.getBytes()); + JcrUtils.copyBytesAsFile(node.getParent(), node.getName() + ".md5", pomMd5.getBytes()); session.save(); return artifact; } - protected void preProcessBundleArtifact(Node bundleNode) - throws RepositoryException { + protected void preProcessBundleArtifact(Node bundleNode) throws RepositoryException { String symbolicName = JcrUtils.get(bundleNode, SLC_SYMBOLIC_NAME); if (symbolicName.endsWith(".source")) { // TODO make a shared node with classifier 'sources'? - String bundleName = RepoUtils - .extractBundleNameFromSourceName(symbolicName); + String bundleName = RepoUtils.extractBundleNameFromSourceName(symbolicName); for (String excludedSuffix : excludedSuffixes) { if (bundleName.endsWith(excludedSuffix)) return;// skip adding to sources @@ -287,8 +259,7 @@ public class NormalizeGroup implements Runnable, SlcNames { return; } - NodeIterator exportPackages = bundleNode.getNodes(SLC_ - + Constants.EXPORT_PACKAGE); + NodeIterator exportPackages = bundleNode.getNodes(SLC_ + Constants.EXPORT_PACKAGE); while (exportPackages.hasNext()) { Node exportPackage = exportPackages.nextNode(); String pkg = JcrUtils.get(exportPackage, SLC_NAME); @@ -306,8 +277,7 @@ public class NormalizeGroup implements Runnable, SlcNames { bundleNode.getSession().save(); } - protected void processBundleArtifact(Node bundleNode) - throws RepositoryException { + protected void processBundleArtifact(Node bundleNode) throws RepositoryException { Node artifactFolder = bundleNode.getParent(); String baseName = FilenameUtils.getBaseName(bundleNode.getName()); @@ -317,15 +287,12 @@ public class NormalizeGroup implements Runnable, SlcNames { return;// skip String pom = generatePomForBundle(bundleNode); - Node pomNode = JcrUtils.copyBytesAsFile(artifactFolder, pomName, - pom.getBytes()); + Node pomNode = JcrUtils.copyBytesAsFile(artifactFolder, pomName, pom.getBytes()); // checksum String bundleSha = JcrUtils.checksumFile(bundleNode, "SHA-1"); - JcrUtils.copyBytesAsFile(artifactFolder, - bundleNode.getName() + ".sha1", bundleSha.getBytes()); + JcrUtils.copyBytesAsFile(artifactFolder, bundleNode.getName() + ".sha1", bundleSha.getBytes()); String pomSha = JcrUtils.checksumFile(pomNode, "SHA-1"); - JcrUtils.copyBytesAsFile(artifactFolder, pomNode.getName() + ".sha1", - pomSha.getBytes()); + JcrUtils.copyBytesAsFile(artifactFolder, pomNode.getName() + ".sha1", pomSha.getBytes()); } private String generatePomForBundle(Node n) throws RepositoryException { @@ -335,53 +302,42 @@ public class NormalizeGroup implements Runnable, SlcNames { // XML header p.append("\n"); - p.append("\n"); + p.append( + "\n"); p.append("4.0.0"); // Artifact - p.append("").append(JcrUtils.get(n, SLC_GROUP_ID)) - .append("\n"); - p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_ID)) - .append("\n"); - p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_VERSION)) - .append("\n"); + p.append("").append(JcrUtils.get(n, SLC_GROUP_ID)).append("\n"); + p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_ID)).append("\n"); + p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_VERSION)).append("\n"); p.append("pom\n"); if (n.hasProperty(SLC_ + Constants.BUNDLE_NAME)) - p.append("") - .append(JcrUtils.get(n, SLC_ + Constants.BUNDLE_NAME)) - .append("\n"); + p.append("").append(JcrUtils.get(n, SLC_ + Constants.BUNDLE_NAME)).append("\n"); if (n.hasProperty(SLC_ + Constants.BUNDLE_DESCRIPTION)) - p.append("") - .append(JcrUtils - .get(n, SLC_ + Constants.BUNDLE_DESCRIPTION)) + p.append("").append(JcrUtils.get(n, SLC_ + Constants.BUNDLE_DESCRIPTION)) .append("\n"); // Dependencies Set dependenciesSymbolicNames = new TreeSet(); Set optionalSymbolicNames = new TreeSet(); - NodeIterator importPackages = n.getNodes(SLC_ - + Constants.IMPORT_PACKAGE); + NodeIterator importPackages = n.getNodes(SLC_ + Constants.IMPORT_PACKAGE); while (importPackages.hasNext()) { Node importPackage = importPackages.nextNode(); String pkg = JcrUtils.get(importPackage, SLC_NAME); if (packagesToSymbolicNames.containsKey(pkg)) { - String dependencySymbolicName = packagesToSymbolicNames - .get(pkg); + String dependencySymbolicName = packagesToSymbolicNames.get(pkg); if (JcrUtils.check(importPackage, SLC_OPTIONAL)) optionalSymbolicNames.add(dependencySymbolicName); else dependenciesSymbolicNames.add(dependencySymbolicName); } else { - if (!JcrUtils.check(importPackage, SLC_OPTIONAL) - && !systemPackages.contains(pkg)) + if (!JcrUtils.check(importPackage, SLC_OPTIONAL) && !systemPackages.contains(pkg)) log.warn("No bundle found for pkg " + pkg); } } if (n.hasNode(SLC_ + Constants.FRAGMENT_HOST)) { - String fragmentHost = JcrUtils.get( - n.getNode(SLC_ + Constants.FRAGMENT_HOST), - SLC_SYMBOLIC_NAME); + String fragmentHost = JcrUtils.get(n.getNode(SLC_ + Constants.FRAGMENT_HOST), SLC_SYMBOLIC_NAME); dependenciesSymbolicNames.add(fragmentHost); } @@ -400,8 +356,7 @@ public class NormalizeGroup implements Runnable, SlcNames { List optionalDependencyNodes = new ArrayList(); for (String depSymbName : optionalSymbolicNames) { if (symbolicNamesToNodes.containsKey(depSymbName)) - optionalDependencyNodes.add(symbolicNamesToNodes - .get(depSymbName)); + optionalDependencyNodes.add(symbolicNamesToNodes.get(depSymbName)); else log.warn("Could not find node for " + depSymbName); } @@ -409,12 +364,8 @@ public class NormalizeGroup implements Runnable, SlcNames { p.append("\n"); for (Node dependencyNode : dependencyNodes) { p.append("\n"); - p.append("\t") - .append(JcrUtils.get(dependencyNode, SLC_GROUP_ID)) - .append("\n"); - p.append("\t") - .append(JcrUtils.get(dependencyNode, SLC_ARTIFACT_ID)) - .append("\n"); + p.append("\t").append(JcrUtils.get(dependencyNode, SLC_GROUP_ID)).append("\n"); + p.append("\t").append(JcrUtils.get(dependencyNode, SLC_ARTIFACT_ID)).append("\n"); p.append("\n"); } @@ -422,12 +373,8 @@ public class NormalizeGroup implements Runnable, SlcNames { p.append("\n"); for (Node dependencyNode : optionalDependencyNodes) { p.append("\n"); - p.append("\t") - .append(JcrUtils.get(dependencyNode, SLC_GROUP_ID)) - .append("\n"); - p.append("\t") - .append(JcrUtils.get(dependencyNode, SLC_ARTIFACT_ID)) - .append("\n"); + p.append("\t").append(JcrUtils.get(dependencyNode, SLC_GROUP_ID)).append("\n"); + p.append("\t").append(JcrUtils.get(dependencyNode, SLC_ARTIFACT_ID)).append("\n"); p.append("\ttrue\n"); p.append("\n"); } @@ -438,10 +385,8 @@ public class NormalizeGroup implements Runnable, SlcNames { p.append("\n"); p.append("\n"); p.append("\t").append(groupId).append("\n"); - p.append("\t") - .append(ownSymbolicName.endsWith(".source") ? RepoConstants.SOURCES_ARTIFACT_ID - : RepoConstants.BINARIES_ARTIFACT_ID) - .append("\n"); + p.append("\t").append(ownSymbolicName.endsWith(".source") ? RepoConstants.SOURCES_ARTIFACT_ID + : RepoConstants.BINARIES_ARTIFACT_ID).append("\n"); p.append("\t").append(version).append("\n"); p.append("\tpom\n"); p.append("\timport\n"); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java index e372afdfe..a844f2021 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiFactoryImpl.java @@ -19,8 +19,7 @@ import javax.jcr.Session; import javax.jcr.security.Privilege; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.SlcConstants; import org.argeo.slc.SlcException; @@ -35,7 +34,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; /** Default implementation of {@link OsgiFactory}. */ public class OsgiFactoryImpl implements OsgiFactory, SlcNames { - private final static Log log = LogFactory.getLog(OsgiFactoryImpl.class); + private final static CmsLog log = CmsLog.getLog(OsgiFactoryImpl.class); private String workspace; private Repository distRepository; diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiProfile.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiProfile.java index b15ed5d29..0d97c980e 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiProfile.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/OsgiProfile.java @@ -17,8 +17,7 @@ import org.argeo.slc.SlcException; public class OsgiProfile { public final static String PROP_SYSTEM_PACKAGES = "org.osgi.framework.system.packages"; - public final static OsgiProfile PROFILE_JAVA_SE_1_6 = new OsgiProfile( - "JavaSE-1.6.profile"); + public final static OsgiProfile PROFILE_JAVA_SE_1_6 = new OsgiProfile("JavaSE-1.6.profile"); private final URL url; private final Properties properties; @@ -37,15 +36,12 @@ public class OsgiProfile { } public OsgiProfile(String name) { - this(OsgiProfile.class.getClassLoader().getResource( - '/' - + OsgiProfile.class.getPackage().getName() - .replace('.', '/') + '/' + name)); + this(OsgiProfile.class.getClassLoader() + .getResource('/' + OsgiProfile.class.getPackage().getName().replace('.', '/') + '/' + name)); } public List getSystemPackages() { - String[] splitted = properties.getProperty(PROP_SYSTEM_PACKAGES).split( - ","); + String[] splitted = properties.getProperty(PROP_SYSTEM_PACKAGES).split(","); List res = new ArrayList(); for (String pkg : splitted) { res.add(pkg.trim()); diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java index 7d5d77900..0c6581425 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java @@ -5,8 +5,7 @@ import java.util.Iterator; import javax.jcr.RepositoryException; import javax.jcr.Session; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.NameVersion; @@ -18,9 +17,11 @@ import org.argeo.slc.repo.maven.MavenConventionsUtils; import org.eclipse.aether.artifact.Artifact; import org.eclipse.aether.artifact.DefaultArtifact; -/** Executes the processes required so that all managed bundles are available. */ +/** + * Executes the processes required so that all managed bundles are available. + */ public class ProcessDistribution implements Runnable { - private final static Log log = LogFactory.getLog(ProcessDistribution.class); + private final static CmsLog log = CmsLog.getLog(ProcessDistribution.class); private ArgeoOsgiDistribution osgiDistribution; private OsgiFactory osgiFactory; @@ -29,16 +30,14 @@ public class ProcessDistribution implements Runnable { Session javaSession = null; try { javaSession = osgiFactory.openJavaSession(); - for (Iterator it = osgiDistribution - .nameVersions(); it.hasNext();) + for (Iterator it = osgiDistribution.nameVersions(); it.hasNext();) processNameVersion(javaSession, it.next()); // Check sources - for (Iterator it = osgiDistribution - .nameVersions(); it.hasNext();) { + for (Iterator it = osgiDistribution.nameVersions(); it.hasNext();) { CategoryNameVersion nv = (CategoryNameVersion) it.next(); - Artifact artifact = new DefaultArtifact(nv.getCategory(), - nv.getName() + ".source", "jar", nv.getVersion()); + Artifact artifact = new DefaultArtifact(nv.getCategory(), nv.getName() + ".source", "jar", + nv.getVersion()); String path = MavenConventionsUtils.artifactPath("/", artifact); if (!javaSession.itemExists(path)) log.warn("No source available for " + nv); @@ -46,27 +45,23 @@ public class ProcessDistribution implements Runnable { // explicitly create the corresponding modular distribution as we // have here all necessary info. - ModularDistributionFactory mdf = new ModularDistributionFactory( - osgiFactory, osgiDistribution); + ModularDistributionFactory mdf = new ModularDistributionFactory(osgiFactory, osgiDistribution); mdf.run(); } catch (RepositoryException e) { - throw new SlcException("Cannot process distribution " - + osgiDistribution, e); + throw new SlcException("Cannot process distribution " + osgiDistribution, e); } finally { JcrUtils.logoutQuietly(javaSession); } } - protected void processNameVersion(Session javaSession, - NameVersion nameVersion) throws RepositoryException { + protected void processNameVersion(Session javaSession, NameVersion nameVersion) throws RepositoryException { if (log.isTraceEnabled()) log.trace("Check " + nameVersion + "..."); if (!(nameVersion instanceof CategoryNameVersion)) throw new SlcException("Unsupported type " + nameVersion.getClass()); CategoryNameVersion nv = (CategoryNameVersion) nameVersion; - Artifact artifact = new DefaultArtifact(nv.getCategory(), nv.getName(), - "jar", nv.getVersion()); + Artifact artifact = new DefaultArtifact(nv.getCategory(), nv.getName(), "jar", nv.getVersion()); String path = MavenConventionsUtils.artifactPath("/", artifact); if (!javaSession.itemExists(path)) { if (nv instanceof BndWrapper) { diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SourcesProvider.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SourcesProvider.java index a0a20f61d..a3b3fc9f8 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SourcesProvider.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SourcesProvider.java @@ -8,10 +8,8 @@ public interface SourcesProvider { /** * Writes sources into a ZIP (or a JAR), under the same sirectory structure. * - * @param packages - * the packages to import - * @param out - * the ZIP or JAR to write to + * @param packages the packages to import + * @param out the ZIP or JAR to write to */ public void writeSources(List packages, ZipOutputStream zout); } diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SubArtifact.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SubArtifact.java index 9ce84555d..4c567f8ca 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SubArtifact.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/SubArtifact.java @@ -7,208 +7,198 @@ import org.eclipse.aether.artifact.AbstractArtifact; import org.eclipse.aether.artifact.Artifact; /** - * An artifact whose identity is derived from another artifact. Note: Instances of this class are immutable and - * the exposed mutators return new objects rather than changing the current instance. + * An artifact whose identity is derived from another artifact. Note: + * Instances of this class are immutable and the exposed mutators return new + * objects rather than changing the current instance. */ -final class SubArtifact - extends AbstractArtifact -{ - - private final Artifact mainArtifact; - - private final String classifier; - - private final String extension; - - private final File file; - - private final Map properties; - - /** - * Creates a new sub artifact. The classifier and extension specified for this artifact may use the asterisk - * character "*" to refer to the corresponding property of the main artifact. For instance, the classifier - * "*-sources" can be used to refer to the source attachment of an artifact. Likewise, the extension "*.asc" can be - * used to refer to the GPG signature of an artifact. - * - * @param mainArtifact The artifact from which to derive the identity, must not be {@code null}. - * @param classifier The classifier for this artifact, may be {@code null} if none. - * @param extension The extension for this artifact, may be {@code null} if none. - */ - public SubArtifact( Artifact mainArtifact, String classifier, String extension ) - { - this( mainArtifact, classifier, extension, (File) null ); - } - - /** - * Creates a new sub artifact. The classifier and extension specified for this artifact may use the asterisk - * character "*" to refer to the corresponding property of the main artifact. For instance, the classifier - * "*-sources" can be used to refer to the source attachment of an artifact. Likewise, the extension "*.asc" can be - * used to refer to the GPG signature of an artifact. - * - * @param mainArtifact The artifact from which to derive the identity, must not be {@code null}. - * @param classifier The classifier for this artifact, may be {@code null} if none. - * @param extension The extension for this artifact, may be {@code null} if none. - * @param file The file for this artifact, may be {@code null} if unresolved. - */ - public SubArtifact( Artifact mainArtifact, String classifier, String extension, File file ) - { - this( mainArtifact, classifier, extension, null, file ); - } - - /** - * Creates a new sub artifact. The classifier and extension specified for this artifact may use the asterisk - * character "*" to refer to the corresponding property of the main artifact. For instance, the classifier - * "*-sources" can be used to refer to the source attachment of an artifact. Likewise, the extension "*.asc" can be - * used to refer to the GPG signature of an artifact. - * - * @param mainArtifact The artifact from which to derive the identity, must not be {@code null}. - * @param classifier The classifier for this artifact, may be {@code null} if none. - * @param extension The extension for this artifact, may be {@code null} if none. - * @param properties The properties of the artifact, may be {@code null}. - */ - public SubArtifact( Artifact mainArtifact, String classifier, String extension, Map properties ) - { - this( mainArtifact, classifier, extension, properties, null ); - } - - /** - * Creates a new sub artifact. The classifier and extension specified for this artifact may use the asterisk - * character "*" to refer to the corresponding property of the main artifact. For instance, the classifier - * "*-sources" can be used to refer to the source attachment of an artifact. Likewise, the extension "*.asc" can be - * used to refer to the GPG signature of an artifact. - * - * @param mainArtifact The artifact from which to derive the identity, must not be {@code null}. - * @param classifier The classifier for this artifact, may be {@code null} if none. - * @param extension The extension for this artifact, may be {@code null} if none. - * @param properties The properties of the artifact, may be {@code null}. - * @param file The file for this artifact, may be {@code null} if unresolved. - */ - public SubArtifact( Artifact mainArtifact, String classifier, String extension, Map properties, - File file ) - { - if ( mainArtifact == null ) - { - throw new IllegalArgumentException( "no artifact specified" ); - } - this.mainArtifact = mainArtifact; - this.classifier = classifier; - this.extension = extension; - this.file = file; - this.properties = copyProperties( properties ); - } - - private SubArtifact( Artifact mainArtifact, String classifier, String extension, File file, - Map properties ) - { - // NOTE: This constructor assumes immutability of the provided properties, for internal use only - this.mainArtifact = mainArtifact; - this.classifier = classifier; - this.extension = extension; - this.file = file; - this.properties = properties; - } - - public String getGroupId() - { - return mainArtifact.getGroupId(); - } - - public String getArtifactId() - { - return mainArtifact.getArtifactId(); - } - - public String getVersion() - { - return mainArtifact.getVersion(); - } - - public String getBaseVersion() - { - return mainArtifact.getBaseVersion(); - } - - public boolean isSnapshot() - { - return mainArtifact.isSnapshot(); - } - - public String getClassifier() - { - return expand( classifier, mainArtifact.getClassifier() ); - } - - public String getExtension() - { - return expand( extension, mainArtifact.getExtension() ); - } - - public File getFile() - { - return file; - } - - public Artifact setFile( File file ) - { - if ( ( this.file == null ) ? file == null : this.file.equals( file ) ) - { - return this; - } - return new SubArtifact( mainArtifact, classifier, extension, file, properties ); - } - - public Map getProperties() - { - return properties; - } - - public Artifact setProperties( Map properties ) - { - if ( this.properties.equals( properties ) || ( properties == null && this.properties.isEmpty() ) ) - { - return this; - } - return new SubArtifact( mainArtifact, classifier, extension, properties, file ); - } - - private static String expand( String pattern, String replacement ) - { - String result = ""; - if ( pattern != null ) - { - result = pattern.replace( "*", replacement ); - - if ( replacement.length() <= 0 ) - { - if ( pattern.startsWith( "*" ) ) - { - int i = 0; - for ( ; i < result.length(); i++ ) - { - char c = result.charAt( i ); - if ( c != '-' && c != '.' ) - { - break; - } - } - result = result.substring( i ); - } - if ( pattern.endsWith( "*" ) ) - { - int i = result.length() - 1; - for ( ; i >= 0; i-- ) - { - char c = result.charAt( i ); - if ( c != '-' && c != '.' ) - { - break; - } - } - result = result.substring( 0, i + 1 ); - } - } - } - return result; - } +final class SubArtifact extends AbstractArtifact { + + private final Artifact mainArtifact; + + private final String classifier; + + private final String extension; + + private final File file; + + private final Map properties; + + /** + * Creates a new sub artifact. The classifier and extension specified for this + * artifact may use the asterisk character "*" to refer to the corresponding + * property of the main artifact. For instance, the classifier "*-sources" can + * be used to refer to the source attachment of an artifact. Likewise, the + * extension "*.asc" can be used to refer to the GPG signature of an artifact. + * + * @param mainArtifact The artifact from which to derive the identity, must not + * be {@code null}. + * @param classifier The classifier for this artifact, may be {@code null} if + * none. + * @param extension The extension for this artifact, may be {@code null} if + * none. + */ + public SubArtifact(Artifact mainArtifact, String classifier, String extension) { + this(mainArtifact, classifier, extension, (File) null); + } + + /** + * Creates a new sub artifact. The classifier and extension specified for this + * artifact may use the asterisk character "*" to refer to the corresponding + * property of the main artifact. For instance, the classifier "*-sources" can + * be used to refer to the source attachment of an artifact. Likewise, the + * extension "*.asc" can be used to refer to the GPG signature of an artifact. + * + * @param mainArtifact The artifact from which to derive the identity, must not + * be {@code null}. + * @param classifier The classifier for this artifact, may be {@code null} if + * none. + * @param extension The extension for this artifact, may be {@code null} if + * none. + * @param file The file for this artifact, may be {@code null} if + * unresolved. + */ + public SubArtifact(Artifact mainArtifact, String classifier, String extension, File file) { + this(mainArtifact, classifier, extension, null, file); + } + + /** + * Creates a new sub artifact. The classifier and extension specified for this + * artifact may use the asterisk character "*" to refer to the corresponding + * property of the main artifact. For instance, the classifier "*-sources" can + * be used to refer to the source attachment of an artifact. Likewise, the + * extension "*.asc" can be used to refer to the GPG signature of an artifact. + * + * @param mainArtifact The artifact from which to derive the identity, must not + * be {@code null}. + * @param classifier The classifier for this artifact, may be {@code null} if + * none. + * @param extension The extension for this artifact, may be {@code null} if + * none. + * @param properties The properties of the artifact, may be {@code null}. + */ + public SubArtifact(Artifact mainArtifact, String classifier, String extension, Map properties) { + this(mainArtifact, classifier, extension, properties, null); + } + + /** + * Creates a new sub artifact. The classifier and extension specified for this + * artifact may use the asterisk character "*" to refer to the corresponding + * property of the main artifact. For instance, the classifier "*-sources" can + * be used to refer to the source attachment of an artifact. Likewise, the + * extension "*.asc" can be used to refer to the GPG signature of an artifact. + * + * @param mainArtifact The artifact from which to derive the identity, must not + * be {@code null}. + * @param classifier The classifier for this artifact, may be {@code null} if + * none. + * @param extension The extension for this artifact, may be {@code null} if + * none. + * @param properties The properties of the artifact, may be {@code null}. + * @param file The file for this artifact, may be {@code null} if + * unresolved. + */ + public SubArtifact(Artifact mainArtifact, String classifier, String extension, Map properties, + File file) { + if (mainArtifact == null) { + throw new IllegalArgumentException("no artifact specified"); + } + this.mainArtifact = mainArtifact; + this.classifier = classifier; + this.extension = extension; + this.file = file; + this.properties = copyProperties(properties); + } + + private SubArtifact(Artifact mainArtifact, String classifier, String extension, File file, + Map properties) { + // NOTE: This constructor assumes immutability of the provided properties, for + // internal use only + this.mainArtifact = mainArtifact; + this.classifier = classifier; + this.extension = extension; + this.file = file; + this.properties = properties; + } + + public String getGroupId() { + return mainArtifact.getGroupId(); + } + + public String getArtifactId() { + return mainArtifact.getArtifactId(); + } + + public String getVersion() { + return mainArtifact.getVersion(); + } + + public String getBaseVersion() { + return mainArtifact.getBaseVersion(); + } + + public boolean isSnapshot() { + return mainArtifact.isSnapshot(); + } + + public String getClassifier() { + return expand(classifier, mainArtifact.getClassifier()); + } + + public String getExtension() { + return expand(extension, mainArtifact.getExtension()); + } + + public File getFile() { + return file; + } + + public Artifact setFile(File file) { + if ((this.file == null) ? file == null : this.file.equals(file)) { + return this; + } + return new SubArtifact(mainArtifact, classifier, extension, file, properties); + } + + public Map getProperties() { + return properties; + } + + public Artifact setProperties(Map properties) { + if (this.properties.equals(properties) || (properties == null && this.properties.isEmpty())) { + return this; + } + return new SubArtifact(mainArtifact, classifier, extension, properties, file); + } + + private static String expand(String pattern, String replacement) { + String result = ""; + if (pattern != null) { + result = pattern.replace("*", replacement); + + if (replacement.length() <= 0) { + if (pattern.startsWith("*")) { + int i = 0; + for (; i < result.length(); i++) { + char c = result.charAt(i); + if (c != '-' && c != '.') { + break; + } + } + result = result.substring(i); + } + if (pattern.endsWith("*")) { + int i = result.length() - 1; + for (; i >= 0; i--) { + char c = result.charAt(i); + if (c != '-' && c != '.') { + break; + } + } + result = result.substring(0, i + 1); + } + } + } + return result; + } } \ No newline at end of file diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java index 262246fdf..e2c785a1c 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/UriWrapper.java @@ -11,8 +11,7 @@ import javax.jcr.Property; import javax.jcr.Session; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.jcr.JcrUtils; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.SlcException; @@ -24,7 +23,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; import aQute.bnd.osgi.Jar; public class UriWrapper extends BndWrapper implements Runnable { - private final static Log log = LogFactory.getLog(UriWrapper.class); + private final static CmsLog log = CmsLog.getLog(UriWrapper.class); private String uri; private String baseUri; diff --git a/org.argeo.slc.runtime/pom.xml b/org.argeo.slc.runtime/pom.xml index 0c3283969..8ae2f9918 100644 --- a/org.argeo.slc.runtime/pom.xml +++ b/org.argeo.slc.runtime/pom.xml @@ -15,5 +15,11 @@ org.argeo.slc.api 2.3-SNAPSHOT + + + org.argeo.commons + org.argeo.api + ${version.argeo-commons} + \ No newline at end of file diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java b/org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java index 892df5060..2d5def5c5 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java +++ b/org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java @@ -2,13 +2,12 @@ package org.argeo.cli.fs; import java.nio.file.Path; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.fs.BasicSyncFileVisitor; /** Synchronises two directory structures. */ public class SyncFileVisitor extends BasicSyncFileVisitor { - private final static Log log = LogFactory.getLog(SyncFileVisitor.class); + private final static CmsLog log = CmsLog.getLog(SyncFileVisitor.class); public SyncFileVisitor(Path sourceBasePath, Path targetBasePath, boolean delete, boolean recursive) { super(sourceBasePath, targetBasePath, delete, recursive); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java index a31f18c25..ff69dda25 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/AbstractExecutionModulesManager.java @@ -2,8 +2,7 @@ package org.argeo.slc.runtime; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionFlowDescriptorConverter; @@ -13,7 +12,7 @@ import org.argeo.slc.execution.RealizedFlow; /** Provides the base feature of an execution module manager. */ public abstract class AbstractExecutionModulesManager implements ExecutionModulesManager { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(AbstractExecutionModulesManager.class); // private List filteredNotifiers = Collections diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java index 6fc255a01..31b5396cf 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgent.java @@ -21,7 +21,7 @@ import org.argeo.slc.execution.SlcAgent; /** Implements the base methods of an SLC agent. */ public class DefaultAgent implements SlcAgent { - // private final static Log log = LogFactory.getLog(DefaultAgent.class); + // private final static CmsLog log = CmsLog.getLog(DefaultAgent.class); /** UTF-8 charset for encoding. */ private final static String UTF8 = "UTF-8"; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java index 2e6d7f16b..11a79d07f 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultAgentCli.java @@ -8,8 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; @@ -25,7 +24,7 @@ import org.argeo.slc.execution.SlcAgentCli; * Reference implementation of args to URIs algorithm. */ public class DefaultAgentCli implements SlcAgentCli { - private final static Log log = LogFactory.getLog(DefaultAgentCli.class); + private final static CmsLog log = CmsLog.getLog(DefaultAgentCli.class); private final static String UTF8 = "UTF-8"; private SlcAgent agent; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java index f99ce9d71..7726177cc 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionFlow.java @@ -6,8 +6,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionContext; import org.argeo.slc.execution.ExecutionFlow; @@ -16,7 +15,7 @@ import org.argeo.slc.execution.ExecutionSpecAttribute; /** Default implementation of an execution flow. */ public class DefaultExecutionFlow implements ExecutionFlow { - private final static Log log = LogFactory.getLog(DefaultExecutionFlow.class); + private final static CmsLog log = CmsLog.getLog(DefaultExecutionFlow.class); private final ExecutionSpec executionSpec; private String name = null; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java index af98a16be..9b5460bd9 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/DefaultExecutionStack.java @@ -5,8 +5,7 @@ import java.util.Map; import java.util.Stack; import java.util.UUID; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionSpecAttribute; @@ -15,7 +14,7 @@ import org.argeo.slc.execution.ExecutionStack; /** Canonical implementation of an execution stack. */ public class DefaultExecutionStack implements ExecutionStack { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(DefaultExecutionStack.class); private final Stack stack = new Stack(); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java index d940905f6..c5be2cf0a 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ExecutionThread.java @@ -9,8 +9,7 @@ import java.util.List; import javax.security.auth.Subject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.execution.ExecutionFlowDescriptor; import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.execution.ExecutionStep; @@ -20,7 +19,7 @@ import org.argeo.slc.execution.RealizedFlow; /** Thread of a single execution */ public class ExecutionThread extends Thread { public final static String SYSPROP_EXECUTION_AUTO_UPGRADE = "slc.execution.autoupgrade"; - private final static Log log = LogFactory.getLog(ExecutionThread.class); + private final static CmsLog log = CmsLog.getLog(ExecutionThread.class); private ExecutionModulesManager executionModulesManager; private final RealizedFlow realizedFlow; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java index 4aea94fdf..ecac292e2 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/InstantiationManager.java @@ -2,8 +2,7 @@ package org.argeo.slc.runtime; import java.util.Stack; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionFlow; import org.argeo.slc.execution.ExecutionSpecAttribute; @@ -14,7 +13,7 @@ import org.argeo.slc.primitive.PrimitiveUtils; /** Manage parameters that need to be set during the instantiation of a flow */ public class InstantiationManager { - private final static Log log = LogFactory + private final static CmsLog log = CmsLog .getLog(InstantiationManager.class); private ThreadLocal> flowStack = new ThreadLocal>(); diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java index 2c4f73c7e..97f83e2f9 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ProcessThread.java @@ -12,8 +12,7 @@ import java.util.Set; import javax.security.auth.Subject; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.execution.ExecutionProcess; @@ -25,7 +24,7 @@ import org.argeo.slc.execution.RealizedFlow; * sequential {@link ExecutionThread}s. */ public class ProcessThread extends Thread { - private final static Log log = LogFactory.getLog(ProcessThread.class); + private final static CmsLog log = CmsLog.getLog(ProcessThread.class); private final ExecutionModulesManager executionModulesManager; private final ExecutionProcess process; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java index a6e60d36b..778550aa2 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/Echo.java @@ -5,15 +5,14 @@ import java.io.IOException; import java.nio.file.Path; import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; public class Echo implements Runnable { - private final static Log defaultLog = LogFactory.getLog(Echo.class); + private final static CmsLog defaultLog = CmsLog.getLog(Echo.class); private Path writeTo = null; - private Log log; + private CmsLog log; private Object message; public void run() { @@ -32,7 +31,7 @@ public class Echo implements Runnable { } } - private Log log() { + private CmsLog log() { return log != null ? log : defaultLog; } diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java index f5e850201..5b9f9dce0 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/tasks/SystemCall.java @@ -32,8 +32,7 @@ import org.apache.commons.exec.PumpStreamHandler; import org.apache.commons.exec.ShutdownHookProcessDestroyer; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.UnsupportedException; import org.argeo.slc.execution.ExecutionResources; @@ -45,7 +44,7 @@ import org.argeo.slc.test.TestStatus; public class SystemCall implements Runnable { public final static String LOG_STDOUT = "System.out"; - private final Log log = LogFactory.getLog(getClass()); + private final CmsLog log = CmsLog.getLog(getClass()); private String execDir; diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java index 97d7305c1..f3ce14a3d 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/ContextUtils.java @@ -3,8 +3,7 @@ package org.argeo.slc.runtime.test; import java.util.Map; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.test.TestResult; import org.argeo.slc.test.TestStatus; import org.argeo.slc.test.context.ContextAware; @@ -12,7 +11,7 @@ import org.argeo.slc.test.context.ParentContextAware; /** Utilities for comparing and synchronising contexts. */ public class ContextUtils { - private final static Log log = LogFactory.getLog(ContextUtils.class); + private final static CmsLog log = CmsLog.getLog(ContextUtils.class); public static void compareReachedExpected(ContextAware contextAware, TestResult testResult) { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java index 3791a7ec6..436903317 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/runtime/test/SimpleTestResult.java @@ -7,8 +7,7 @@ import java.util.TreeMap; import java.util.UUID; import java.util.Vector; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.SlcException; import org.argeo.slc.test.TestResult; import org.argeo.slc.test.TestResultPart; @@ -18,7 +17,7 @@ import org.argeo.slc.test.TestRun; * Basic implementation of a test result containing only a list of result parts. */ public class SimpleTestResult implements TestResult { - private static Log log = LogFactory.getLog(SimpleTestResult.class); + private static CmsLog log = CmsLog.getLog(SimpleTestResult.class); private String uuid; private String currentTestRunUuid;