From ed886c6490aef0d58ac262957e6d0cca7f7e07aa Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Mon, 18 Oct 2021 02:17:00 +0200 Subject: [PATCH] Finalized move packages to fr.devinsy. --- build-appjar.xml | 2 +- log4j.properties | 2 +- resources/conf/log4j-default.properties | 2 +- src/{org/april => fr/devinsy}/logar/LogarLauncher.java | 5 +++-- src/fr/devinsy/logar/app/Logar.java | 8 ++++---- src/fr/devinsy/logar/app/anonymizer/Anonymizer.java | 2 +- src/fr/devinsy/logar/app/log/LogComparator.java | 2 +- src/fr/devinsy/logar/app/log/LogFile.java | 2 +- src/{org/april => fr/devinsy}/logar/cli/LogarCLI.java | 4 ++-- .../april => fr/devinsy}/logar/cli/LogarCLIException.java | 2 +- src/fr/devinsy/logar/stats/UserAgentStator.java | 2 +- .../april => fr/devinsy}/logar/util/BuildInformation.java | 2 +- src/{org/april => fr/devinsy}/logar/util/Chrono.java | 2 +- .../april => fr/devinsy}/logar/util/CompareUtils.java | 2 +- .../april => fr/devinsy}/logar/util/FileComparator.java | 2 +- src/{org/april => fr/devinsy}/logar/util/Files.java | 2 +- src/{org/april => fr/devinsy}/logar/util/FilesUtils.java | 2 +- .../april => fr/devinsy}/logar/util/LineIterator.java | 2 +- test/{org/april => fr/devinsy}/logar/app/TestFoo.java | 2 +- 19 files changed, 25 insertions(+), 24 deletions(-) rename src/{org/april => fr/devinsy}/logar/LogarLauncher.java (97%) rename src/{org/april => fr/devinsy}/logar/cli/LogarCLI.java (99%) rename src/{org/april => fr/devinsy}/logar/cli/LogarCLIException.java (98%) rename src/{org/april => fr/devinsy}/logar/util/BuildInformation.java (99%) rename src/{org/april => fr/devinsy}/logar/util/Chrono.java (98%) rename src/{org/april => fr/devinsy}/logar/util/CompareUtils.java (99%) rename src/{org/april => fr/devinsy}/logar/util/FileComparator.java (98%) rename src/{org/april => fr/devinsy}/logar/util/Files.java (99%) rename src/{org/april => fr/devinsy}/logar/util/FilesUtils.java (99%) rename src/{org/april => fr/devinsy}/logar/util/LineIterator.java (99%) rename test/{org/april => fr/devinsy}/logar/app/TestFoo.java (98%) diff --git a/build-appjar.xml b/build-appjar.xml index 64fcb64..317c849 100644 --- a/build-appjar.xml +++ b/build-appjar.xml @@ -111,7 +111,7 @@ - + diff --git a/log4j.properties b/log4j.properties index bc9574a..203e097 100644 --- a/log4j.properties +++ b/log4j.properties @@ -3,7 +3,7 @@ # priority setting: DEBUG < INFO < WARN < ERROR log4j.rootLogger = INFO, console -log4j.logger.org.april.logar = INFO +log4j.logger.fr.devinsy.logar = INFO #-- log4j.appender.console = org.apache.log4j.ConsoleAppender diff --git a/resources/conf/log4j-default.properties b/resources/conf/log4j-default.properties index f6ac54c..7c0f346 100644 --- a/resources/conf/log4j-default.properties +++ b/resources/conf/log4j-default.properties @@ -3,7 +3,7 @@ # priority setting: DEBUG < INFO < WARN < ERROR log4j.rootLogger = INFO, stdout -log4j.logger.org.april.logar = INFO +log4j.logger.fr.devinsy.logar = INFO #-- log4j.appender.stdout = org.apache.log4j.ConsoleAppender diff --git a/src/org/april/logar/LogarLauncher.java b/src/fr/devinsy/logar/LogarLauncher.java similarity index 97% rename from src/org/april/logar/LogarLauncher.java rename to src/fr/devinsy/logar/LogarLauncher.java index e907f0a..e659d1f 100644 --- a/src/org/april/logar/LogarLauncher.java +++ b/src/fr/devinsy/logar/LogarLauncher.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar; +package fr.devinsy.logar; import java.io.File; @@ -25,10 +25,11 @@ import org.apache.log4j.ConsoleAppender; import org.apache.log4j.EnhancedPatternLayout; import org.apache.log4j.Level; import org.apache.log4j.PropertyConfigurator; -import org.april.logar.cli.LogarCLI; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import fr.devinsy.logar.cli.LogarCLI; + /** * The Class LogarLauncher. */ diff --git a/src/fr/devinsy/logar/app/Logar.java b/src/fr/devinsy/logar/app/Logar.java index 8157a0e..5c005e6 100644 --- a/src/fr/devinsy/logar/app/Logar.java +++ b/src/fr/devinsy/logar/app/Logar.java @@ -29,10 +29,6 @@ import java.util.zip.GZIPOutputStream; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.april.logar.util.Chrono; -import org.april.logar.util.Files; -import org.april.logar.util.FilesUtils; -import org.april.logar.util.LineIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,6 +37,10 @@ import fr.devinsy.logar.app.log.Log; import fr.devinsy.logar.app.log.LogFile; import fr.devinsy.logar.app.log.LogParser; import fr.devinsy.logar.stats.UserAgentStator; +import fr.devinsy.logar.util.Chrono; +import fr.devinsy.logar.util.Files; +import fr.devinsy.logar.util.FilesUtils; +import fr.devinsy.logar.util.LineIterator; import fr.devinsy.strings.StringList; /** diff --git a/src/fr/devinsy/logar/app/anonymizer/Anonymizer.java b/src/fr/devinsy/logar/app/anonymizer/Anonymizer.java index 7ec6c0a..88bb033 100644 --- a/src/fr/devinsy/logar/app/anonymizer/Anonymizer.java +++ b/src/fr/devinsy/logar/app/anonymizer/Anonymizer.java @@ -29,12 +29,12 @@ import java.util.zip.GZIPOutputStream; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.april.logar.util.LineIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import fr.devinsy.logar.app.log.Log; import fr.devinsy.logar.app.log.LogParser; +import fr.devinsy.logar.util.LineIterator; /** * The Class Anonymizer. diff --git a/src/fr/devinsy/logar/app/log/LogComparator.java b/src/fr/devinsy/logar/app/log/LogComparator.java index ce622bd..309be1f 100644 --- a/src/fr/devinsy/logar/app/log/LogComparator.java +++ b/src/fr/devinsy/logar/app/log/LogComparator.java @@ -21,7 +21,7 @@ package fr.devinsy.logar.app.log; import java.time.LocalDateTime; import java.util.Comparator; -import org.april.logar.util.CompareUtils; +import fr.devinsy.logar.util.CompareUtils; /** * The Class LogComparator. diff --git a/src/fr/devinsy/logar/app/log/LogFile.java b/src/fr/devinsy/logar/app/log/LogFile.java index b275898..f24bfbc 100644 --- a/src/fr/devinsy/logar/app/log/LogFile.java +++ b/src/fr/devinsy/logar/app/log/LogFile.java @@ -26,12 +26,12 @@ import java.io.PrintWriter; import java.util.zip.GZIPOutputStream; import org.apache.commons.io.IOUtils; -import org.april.logar.util.LineIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import fr.devinsy.cmdexec.CmdExecException; import fr.devinsy.cmdexec.CmdExecUtils; +import fr.devinsy.logar.util.LineIterator; /** * The Class LogFile. diff --git a/src/org/april/logar/cli/LogarCLI.java b/src/fr/devinsy/logar/cli/LogarCLI.java similarity index 99% rename from src/org/april/logar/cli/LogarCLI.java rename to src/fr/devinsy/logar/cli/LogarCLI.java index 3ad8fa5..6b9cadc 100644 --- a/src/org/april/logar/cli/LogarCLI.java +++ b/src/fr/devinsy/logar/cli/LogarCLI.java @@ -16,18 +16,18 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.cli; +package fr.devinsy.logar.cli; import java.io.File; import java.time.LocalDateTime; -import org.april.logar.util.BuildInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import fr.devinsy.logar.app.ExtractOptions; import fr.devinsy.logar.app.Logar; import fr.devinsy.logar.app.OnOffOption; +import fr.devinsy.logar.util.BuildInformation; import fr.devinsy.strings.StringList; /** diff --git a/src/org/april/logar/cli/LogarCLIException.java b/src/fr/devinsy/logar/cli/LogarCLIException.java similarity index 98% rename from src/org/april/logar/cli/LogarCLIException.java rename to src/fr/devinsy/logar/cli/LogarCLIException.java index d092faa..32a6d7b 100644 --- a/src/org/april/logar/cli/LogarCLIException.java +++ b/src/fr/devinsy/logar/cli/LogarCLIException.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.cli; +package fr.devinsy.logar.cli; import fr.devinsy.logar.app.LogarException; diff --git a/src/fr/devinsy/logar/stats/UserAgentStator.java b/src/fr/devinsy/logar/stats/UserAgentStator.java index a4f597c..427fd62 100644 --- a/src/fr/devinsy/logar/stats/UserAgentStator.java +++ b/src/fr/devinsy/logar/stats/UserAgentStator.java @@ -24,11 +24,11 @@ import java.io.FileOutputStream; import java.io.PrintWriter; import org.apache.commons.io.IOUtils; -import org.april.logar.util.Chrono; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import fr.devinsy.logar.app.log.Log; +import fr.devinsy.logar.util.Chrono; import fr.devinsy.strings.StringsUtils; /** diff --git a/src/org/april/logar/util/BuildInformation.java b/src/fr/devinsy/logar/util/BuildInformation.java similarity index 99% rename from src/org/april/logar/util/BuildInformation.java rename to src/fr/devinsy/logar/util/BuildInformation.java index 647bb10..eed7c74 100644 --- a/src/org/april/logar/util/BuildInformation.java +++ b/src/fr/devinsy/logar/util/BuildInformation.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.io.IOException; import java.net.URL; diff --git a/src/org/april/logar/util/Chrono.java b/src/fr/devinsy/logar/util/Chrono.java similarity index 98% rename from src/org/april/logar/util/Chrono.java rename to src/fr/devinsy/logar/util/Chrono.java index df61762..068c8ed 100644 --- a/src/org/april/logar/util/Chrono.java +++ b/src/fr/devinsy/logar/util/Chrono.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.time.Duration; import java.time.LocalDateTime; diff --git a/src/org/april/logar/util/CompareUtils.java b/src/fr/devinsy/logar/util/CompareUtils.java similarity index 99% rename from src/org/april/logar/util/CompareUtils.java rename to src/fr/devinsy/logar/util/CompareUtils.java index fad6f9a..5caeab5 100644 --- a/src/org/april/logar/util/CompareUtils.java +++ b/src/fr/devinsy/logar/util/CompareUtils.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.time.LocalDateTime; import java.util.regex.Matcher; diff --git a/src/org/april/logar/util/FileComparator.java b/src/fr/devinsy/logar/util/FileComparator.java similarity index 98% rename from src/org/april/logar/util/FileComparator.java rename to src/fr/devinsy/logar/util/FileComparator.java index 9afc4f3..3659eba 100644 --- a/src/org/april/logar/util/FileComparator.java +++ b/src/fr/devinsy/logar/util/FileComparator.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.io.File; import java.util.Comparator; diff --git a/src/org/april/logar/util/Files.java b/src/fr/devinsy/logar/util/Files.java similarity index 99% rename from src/org/april/logar/util/Files.java rename to src/fr/devinsy/logar/util/Files.java index 04a4bc4..fca5eb9 100644 --- a/src/org/april/logar/util/Files.java +++ b/src/fr/devinsy/logar/util/Files.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.io.File; import java.util.ArrayList; diff --git a/src/org/april/logar/util/FilesUtils.java b/src/fr/devinsy/logar/util/FilesUtils.java similarity index 99% rename from src/org/april/logar/util/FilesUtils.java rename to src/fr/devinsy/logar/util/FilesUtils.java index 6b40d2f..fb0060b 100644 --- a/src/org/april/logar/util/FilesUtils.java +++ b/src/fr/devinsy/logar/util/FilesUtils.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.io.File; import java.util.regex.Pattern; diff --git a/src/org/april/logar/util/LineIterator.java b/src/fr/devinsy/logar/util/LineIterator.java similarity index 99% rename from src/org/april/logar/util/LineIterator.java rename to src/fr/devinsy/logar/util/LineIterator.java index 6a7aa15..c16a1d3 100644 --- a/src/org/april/logar/util/LineIterator.java +++ b/src/fr/devinsy/logar/util/LineIterator.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.util; +package fr.devinsy.logar.util; import java.io.BufferedReader; import java.io.File; diff --git a/test/org/april/logar/app/TestFoo.java b/test/fr/devinsy/logar/app/TestFoo.java similarity index 98% rename from test/org/april/logar/app/TestFoo.java rename to test/fr/devinsy/logar/app/TestFoo.java index 1b3681a..3b54b91 100644 --- a/test/org/april/logar/app/TestFoo.java +++ b/test/fr/devinsy/logar/app/TestFoo.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Logar. If not, see . */ -package org.april.logar.app; +package fr.devinsy.logar.app; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.Level;