projects
/
lgpl
/
argeo-commons.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d91553e
)
Remove dependencies to Apache Commons IO
author
Mathieu Baudier <mbaudier@argeo.org>
Tue, 1 Nov 2022 09:41:34 +0000
(10:41 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Tue, 1 Nov 2022 09:41:34 +0000
(10:41 +0100)
org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
patch
|
blob
|
history
org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java
patch
|
blob
|
history
swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
patch
|
blob
|
history
diff --git
a/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
b/org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
index 71b6365761f7ee5a7752747f554d230a1b5b69fc..660db5967890f86051e03d47e3497dcc6accfa13 100644
(file)
--- a/
org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
+++ b/
org.argeo.cms.lib.sshd/src/org/argeo/cms/ssh/SshSync.java
@@
-11,7
+11,6
@@
import java.security.KeyPair;
import java.util.Map;
import java.util.Scanner;
import java.util.Map;
import java.util.Scanner;
-import org.apache.commons.io.IOUtils;
import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.agent.SshAgentFactory;
import org.apache.sshd.agent.local.LocalAgentFactory;
import org.apache.sshd.agent.SshAgent;
import org.apache.sshd.agent.SshAgentFactory;
import org.apache.sshd.agent.local.LocalAgentFactory;
@@
-25,6
+24,7
@@
import org.apache.sshd.common.config.keys.FilePasswordProvider;
import org.apache.sshd.sftp.client.fs.SftpFileSystem;
import org.apache.sshd.sftp.client.fs.SftpFileSystemProvider;
import org.argeo.api.cms.CmsLog;
import org.apache.sshd.sftp.client.fs.SftpFileSystem;
import org.apache.sshd.sftp.client.fs.SftpFileSystemProvider;
import org.argeo.api.cms.CmsLog;
+import org.argeo.util.StreamUtils;
public class SshSync {
private final static CmsLog log = CmsLog.getLog(SshSync.class);
public class SshSync {
private final static CmsLog log = CmsLog.getLog(SshSync.class);
@@
-124,7
+124,7
@@
public class SshSync {
log.debug("Relative copied file " + relativeCopiedFile);
try (OutputStream out = Files.newOutputStream(copiedFile);
InputStream in = Files.newInputStream(testPath)) {
log.debug("Relative copied file " + relativeCopiedFile);
try (OutputStream out = Files.newOutputStream(copiedFile);
InputStream in = Files.newInputStream(testPath)) {
-
IO
Utils.copy(in, out);
+
Stream
Utils.copy(in, out);
}
log.debug("Copied " + testPath + " to " + copiedFile);
Files.delete(testPath);
}
log.debug("Copied " + testPath + " to " + copiedFile);
Files.delete(testPath);
diff --git
a/org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java
b/org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java
index eadefa593d237725405e24e516b4d9971237dce5..852cb522158d95ab18b727e8b444be60ad68eb2b 100644
(file)
--- a/
org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java
+++ b/
org.argeo.cms.ux/src/org/argeo/cms/media/SvgToPng.java
@@
-12,12
+12,11
@@
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.ImageTranscoder;
import org.apache.batik.transcoder.image.PNGTranscoder;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.ImageTranscoder;
import org.apache.batik.transcoder.image.PNGTranscoder;
-import org.apache.commons.io.FilenameUtils;
public class SvgToPng {
public void convertSvgDir(Path sourceDir, Path targetDir, int width) {
public class SvgToPng {
public void convertSvgDir(Path sourceDir, Path targetDir, int width) {
- System.out.println("##\n## " + width + "px - " + sourceDir
+
"\n##");
+ System.out.println("##\n## " + width + "px - " + sourceDir
+
"\n##");
try {
if (targetDir == null)
targetDir = sourceDir.getParent().resolve(Integer.toString(width));
try {
if (targetDir == null)
targetDir = sourceDir.getParent().resolve(Integer.toString(width));
@@
-30,7
+29,8
@@
public class SvgToPng {
transcoder.addTranscodingHint(PNGTranscoder.KEY_HEIGHT, (float) width);
for (Path source : Files.newDirectoryStream(sourceDir, "*.svg")) {
transcoder.addTranscodingHint(PNGTranscoder.KEY_HEIGHT, (float) width);
for (Path source : Files.newDirectoryStream(sourceDir, "*.svg")) {
- String baseName = FilenameUtils.getBaseName(source.toString());
+ // FIXME extract base name
+ String baseName = null; // = FilenameUtils.getBaseName(source.toString());
Path target = targetDir.resolve(baseName + ".png");
convertSvgFile(transcoder, source, target);
}
Path target = targetDir.resolve(baseName + ".png");
convertSvgFile(transcoder, source, target);
}
diff --git
a/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
b/swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
index 1bca333c99d5c5b7988883add6cbd2d9f8948424..764234e18d010db581446ccd99532e02b57b05b7 100644
(file)
--- a/
swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
+++ b/
swt/rap/org.argeo.cms.e4.rap/src/org/argeo/cms/e4/rap/SimpleRapE4App.java
@@
-2,7
+2,6
@@
package org.argeo.cms.e4.rap;
import java.util.Enumeration;
import java.util.Enumeration;
-import org.apache.commons.io.FilenameUtils;
import org.argeo.api.cms.CmsLog;
import org.eclipse.rap.rwt.application.Application;
import org.osgi.framework.Bundle;
import org.argeo.api.cms.CmsLog;
import org.eclipse.rap.rwt.application.Application;
import org.osgi.framework.Bundle;
@@
-21,7
+20,8
@@
public class SimpleRapE4App extends AbstractRapE4App {
String p = paths.nextElement();
if (p.endsWith(".e4xmi")) {
String e4xmiPath = bundle.getSymbolicName() + '/' + p;
String p = paths.nextElement();
if (p.endsWith(".e4xmi")) {
String e4xmiPath = bundle.getSymbolicName() + '/' + p;
- String name = '/' + FilenameUtils.removeExtension(FilenameUtils.getName(p));
+ // FIXME deal with base name
+ String name=null;// = '/' + FilenameUtils.removeExtension(FilenameUtils.getName(p));
addE4EntryPoint(application, name, e4xmiPath, getBaseProperties());
if (log.isDebugEnabled())
log.debug("Registered " + e4xmiPath + " as " + getContextName() + name);
addE4EntryPoint(application, name, e4xmiPath, getBaseProperties());
if (log.isDebugEnabled())
log.debug("Registered " + e4xmiPath + " as " + getContextName() + name);