parent
9113eeebb9
commit
b28155a752
@ -1,150 +1,145 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<modelVersion>4.0.0</modelVersion>
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
<groupId>com.olexyn.ensync</groupId>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<artifactId>ensync</artifactId>
|
||||||
|
<version>0.1</version>
|
||||||
<groupId>com.olexyn.ensync</groupId>
|
<name>ensync</name>
|
||||||
<artifactId>ensync</artifactId>
|
<properties>
|
||||||
<version>0.1</version>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<vaadin.version>7.3.1</vaadin.version>
|
||||||
<name>ensync</name>
|
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
|
||||||
<url>http://www.example.com</url>
|
<failOnMissingWebXml>false</failOnMissingWebXml>
|
||||||
|
<maven.compiler.source>18</maven.compiler.source>
|
||||||
<properties>
|
<maven.compiler.target>18</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<kotlin.version>1.6.20-RC2</kotlin.version>
|
||||||
<vaadin.version>7.3.1</vaadin.version>
|
</properties>
|
||||||
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
|
<dependencies>
|
||||||
<failOnMissingWebXml>false</failOnMissingWebXml>
|
<dependency>
|
||||||
<maven.compiler.source>1.11</maven.compiler.source>
|
<groupId>junit</groupId>
|
||||||
<maven.compiler.target>1.11</maven.compiler.target>
|
<artifactId>junit</artifactId>
|
||||||
<kotlin.version>1.6.20-RC2</kotlin.version>
|
<version>4.11</version>
|
||||||
</properties>
|
<scope>test</scope>
|
||||||
|
</dependency>
|
||||||
<dependencies>
|
<dependency>
|
||||||
<dependency>
|
<groupId>org.json</groupId>
|
||||||
<groupId>junit</groupId>
|
<artifactId>json</artifactId>
|
||||||
<artifactId>junit</artifactId>
|
<version>20190722</version>
|
||||||
<version>4.11</version>
|
</dependency>
|
||||||
<scope>test</scope>
|
<dependency>
|
||||||
</dependency>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<dependency>
|
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
||||||
<groupId>org.json</groupId>
|
<version>${kotlin.version}</version>
|
||||||
<artifactId>json</artifactId>
|
</dependency>
|
||||||
<version>20190722</version>
|
<dependency>
|
||||||
</dependency>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<dependency>
|
<artifactId>kotlin-test</artifactId>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<version>${kotlin.version}</version>
|
||||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
<scope>test</scope>
|
||||||
<version>${kotlin.version}</version>
|
</dependency>
|
||||||
</dependency>
|
<dependency>
|
||||||
<dependency>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
||||||
<artifactId>kotlin-test</artifactId>
|
<version>${kotlin.version}</version>
|
||||||
<version>${kotlin.version}</version>
|
</dependency>
|
||||||
<scope>test</scope>
|
<dependency>
|
||||||
</dependency>
|
<groupId>commons-io</groupId>
|
||||||
<dependency>
|
<artifactId>commons-io</artifactId>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<version>2.11.0</version>
|
||||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
</dependency>
|
||||||
<version>${kotlin.version}</version>
|
<dependency>
|
||||||
</dependency>
|
<groupId>com.olexyn.min.log</groupId>
|
||||||
<dependency>
|
<artifactId>min-log</artifactId>
|
||||||
<groupId>commons-io</groupId>
|
<version>0.1.1</version>
|
||||||
<artifactId>commons-io</artifactId>
|
<scope>compile</scope>
|
||||||
<version>2.11.0</version>
|
</dependency>
|
||||||
</dependency>
|
</dependencies>
|
||||||
</dependencies>
|
<build>
|
||||||
|
<pluginManagement>
|
||||||
<build>
|
<plugins>
|
||||||
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
|
<plugin>
|
||||||
<plugins>
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
|
<version>3.1.0</version>
|
||||||
<plugin>
|
</plugin>
|
||||||
<artifactId>maven-clean-plugin</artifactId>
|
<plugin>
|
||||||
<version>3.1.0</version>
|
<artifactId>maven-resources-plugin</artifactId>
|
||||||
</plugin>
|
<version>3.0.2</version>
|
||||||
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-resources-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.8.0</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>3.8.0</version>
|
<version>2.22.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
<version>2.22.1</version>
|
<version>3.0.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
<artifactId>maven-install-plugin</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>2.5.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-install-plugin</artifactId>
|
<artifactId>maven-deploy-plugin</artifactId>
|
||||||
<version>2.5.2</version>
|
<version>2.8.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-deploy-plugin</artifactId>
|
<artifactId>maven-site-plugin</artifactId>
|
||||||
<version>2.8.2</version>
|
<version>3.7.1</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
|
<plugin>
|
||||||
<plugin>
|
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||||
<artifactId>maven-site-plugin</artifactId>
|
<version>3.0.0</version>
|
||||||
<version>3.7.1</version>
|
</plugin>
|
||||||
</plugin>
|
</plugins>
|
||||||
<plugin>
|
</pluginManagement>
|
||||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
<plugins>
|
||||||
<version>3.0.0</version>
|
<plugin>
|
||||||
</plugin>
|
<groupId>org.jetbrains.kotlin</groupId>
|
||||||
</plugins>
|
<artifactId>kotlin-maven-plugin</artifactId>
|
||||||
</pluginManagement>
|
<version>${kotlin.version}</version>
|
||||||
<plugins>
|
<executions>
|
||||||
<plugin>
|
<execution>
|
||||||
<groupId>org.jetbrains.kotlin</groupId>
|
<id>compile</id>
|
||||||
<artifactId>kotlin-maven-plugin</artifactId>
|
<phase>compile</phase>
|
||||||
<version>${kotlin.version}</version>
|
<goals>
|
||||||
<executions>
|
<goal>compile</goal>
|
||||||
<execution>
|
</goals>
|
||||||
<id>compile</id>
|
</execution>
|
||||||
<phase>compile</phase>
|
<execution>
|
||||||
<goals>
|
<id>test-compile</id>
|
||||||
<goal>compile</goal>
|
<phase>test-compile</phase>
|
||||||
</goals>
|
<goals>
|
||||||
</execution>
|
<goal>test-compile</goal>
|
||||||
<execution>
|
</goals>
|
||||||
<id>test-compile</id>
|
</execution>
|
||||||
<phase>test-compile</phase>
|
</executions>
|
||||||
<goals>
|
<configuration>
|
||||||
<goal>test-compile</goal>
|
<jvmTarget>18</jvmTarget>
|
||||||
</goals>
|
</configuration>
|
||||||
</execution>
|
</plugin>
|
||||||
</executions>
|
<plugin>
|
||||||
<configuration>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<jvmTarget>1.8</jvmTarget>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
</configuration>
|
<executions>
|
||||||
</plugin>
|
<execution>
|
||||||
<plugin>
|
<id>compile</id>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<phase>compile</phase>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<goals>
|
||||||
<executions>
|
<goal>compile</goal>
|
||||||
<execution>
|
</goals>
|
||||||
<id>compile</id>
|
</execution>
|
||||||
<phase>compile</phase>
|
<execution>
|
||||||
<goals>
|
<id>testCompile</id>
|
||||||
<goal>compile</goal>
|
<phase>test-compile</phase>
|
||||||
</goals>
|
<goals>
|
||||||
</execution>
|
<goal>testCompile</goal>
|
||||||
<execution>
|
</goals>
|
||||||
<id>testCompile</id>
|
</execution>
|
||||||
<phase>test-compile</phase>
|
</executions>
|
||||||
<goals>
|
</plugin>
|
||||||
<goal>testCompile</goal>
|
</plugins>
|
||||||
</goals>
|
</build>
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@ -1,54 +0,0 @@
|
|||||||
package com.olexyn.ensync;
|
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class Execute {
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param cmd an array representing a shell command
|
|
||||||
* @return <i>TwoBr</i> class, containing two BufferedReaders,
|
|
||||||
* <i>output</i> and <i>error</i>
|
|
||||||
* @see <i>output</i> BufferedReader, corresponds to STDOUT
|
|
||||||
* <i>error</i> BufferedReader, corresponds to STDERR
|
|
||||||
*/
|
|
||||||
public TwoBr execute(String cmd[]) {
|
|
||||||
TwoBr twobr = new TwoBr();
|
|
||||||
try {
|
|
||||||
Process process = Runtime.getRuntime().exec(cmd);
|
|
||||||
process.waitFor();
|
|
||||||
twobr.output = new BufferedReader(new InputStreamReader(process.getInputStream()));
|
|
||||||
twobr.error = new BufferedReader(new InputStreamReader(process.getErrorStream()));
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return twobr;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public TwoBr execute(List<String> cmd) {
|
|
||||||
|
|
||||||
String[] cmdArr = new String[cmd.size()];
|
|
||||||
for (int i = 0; i < cmd.size(); i++) {
|
|
||||||
cmdArr[i] = cmd.get(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
return execute(cmdArr);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void executeBatch(List<String[]> batch) {
|
|
||||||
|
|
||||||
for (String[] strings : batch) {
|
|
||||||
execute(strings);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public class TwoBr {
|
|
||||||
public BufferedReader output;
|
|
||||||
public BufferedReader error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
package com.olexyn.ensync;
|
|
||||||
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Date;
|
|
||||||
import java.util.logging.FileHandler;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.logging.LogRecord;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
import java.util.logging.SimpleFormatter;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public class LogUtil {
|
|
||||||
|
|
||||||
private static final String format = "[%1$tF %1$tT] [%4$-7s] %5$-100s [%2$s]\n";
|
|
||||||
|
|
||||||
public static Logger get(Class<?> c) {
|
|
||||||
return get(c, Level.INFO);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Logger get(Class<?> c, Level level) {
|
|
||||||
System.setProperty("java.util.logging.SimpleFormatter.format", format);
|
|
||||||
Logger logger = Logger.getLogger(c.getName());
|
|
||||||
try {
|
|
||||||
String dir = System.getProperty("user.dir") + "/logs/main.log";
|
|
||||||
FileHandler fh = new FileHandler(dir, true);
|
|
||||||
fh.setFormatter(new SimpleFormatter() {
|
|
||||||
@Override
|
|
||||||
public synchronized String format(LogRecord logRecord) {
|
|
||||||
String msg = logRecord.getMessage();
|
|
||||||
return String.format(format,
|
|
||||||
new Date(logRecord.getMillis()),
|
|
||||||
logRecord.getSourceClassName() + " " + logRecord.getSourceMethodName(),
|
|
||||||
"",
|
|
||||||
logRecord.getLevel().getLocalizedName(),
|
|
||||||
msg
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.addHandler(fh);
|
|
||||||
logger.setLevel(level);
|
|
||||||
} catch (NullPointerException | IOException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
return logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
package com.olexyn.ensync;
|
|
||||||
|
|
||||||
public enum OperationMode {
|
|
||||||
JAVA_FX,
|
|
||||||
JSON
|
|
||||||
}
|
|
||||||
Loading…
Reference in new issue