diff --git a/.jbang/JabKitLauncher.java b/.jbang/JabKitLauncher.java index ed0234acec5..28420b505e4 100755 --- a/.jbang/JabKitLauncher.java +++ b/.jbang/JabKitLauncher.java @@ -5,20 +5,20 @@ //JAVA 24 //RUNTIME_OPTIONS --enable-native-access=ALL-UNNAMED -//SOURCES ../jabkit/src/main/java/org/jabref/cli/converter/CygWinPathConverter.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/ArgumentProcessor.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/CheckConsistency.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/CheckIntegrity.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/Convert.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/Fetch.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/GenerateBibFromAux.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/GenerateCitationKeys.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/Pdf.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/PdfUpdate.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/Preferences.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/Pseudonymize.java -//SOURCES ../jabkit/src/main/java/org/jabref/cli/Search.java -//SOURCES ../jabkit/src/main/java/org/jabref/JabKit.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/converter/CygWinPathConverter.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/ArgumentProcessor.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/CheckConsistency.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/CheckIntegrity.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Convert.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Fetch.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/GenerateBibFromAux.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/GenerateCitationKeys.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Pdf.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/PdfUpdate.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Preferences.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Pseudonymize.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/cli/Search.java +//SOURCES ../jabkit/src/main/java/org/jabref/toolkit/JabKit.java //FILES tinylog.properties=../jabkit/src/main/resources/tinylog.properties // REPOS mavencentral,snapshots=https://central.sonatype.com/repository/maven-snapshots/ @@ -38,11 +38,9 @@ //DEPS info.picocli:picocli:4.7.7 //DEPS com.github.ben-manes.caffeine:caffeine:3.2.3 -import org.jabref.JabKit; - /// This class is required for [jbang](https://www.jbang.dev/) public class JabKitLauncher { public static void main(String[] args) { - org.jabref.JabKit.main(args); + org.jabref.toolkit.JabKit.main(args); } } diff --git a/jabkit/build.gradle.kts b/jabkit/build.gradle.kts index c97012295d4..476340c9db4 100644 --- a/jabkit/build.gradle.kts +++ b/jabkit/build.gradle.kts @@ -63,7 +63,7 @@ javaModuleTesting.whitebox(testing.suites["test"]) { } application { - mainClass.set("org.jabref.JabKit") + mainClass.set("org.jabref.toolkit.JabKit") mainModule.set("org.jabref.jabkit") // Also passed to launcher by java-module-packaging plugin diff --git a/jabkit/src/main/java/module-info.java b/jabkit/src/main/java/module-info.java index 58897c8b573..507ad0ca2a9 100644 --- a/jabkit/src/main/java/module-info.java +++ b/jabkit/src/main/java/module-info.java @@ -2,8 +2,8 @@ requires org.jabref.jablib; requires info.picocli; - opens org.jabref.cli; - opens org.jabref.cli.converter; + opens org.jabref.toolkit.cli; + opens org.jabref.toolkit.cli.converter; requires transitive org.jspecify; requires java.prefs; diff --git a/jabkit/src/main/java/org/jabref/JabKit.java b/jabkit/src/main/java/org/jabref/toolkit/JabKit.java similarity index 99% rename from jabkit/src/main/java/org/jabref/JabKit.java rename to jabkit/src/main/java/org/jabref/toolkit/JabKit.java index 2265bb17fc2..054f2481a96 100644 --- a/jabkit/src/main/java/org/jabref/JabKit.java +++ b/jabkit/src/main/java/org/jabref/toolkit/JabKit.java @@ -1,4 +1,4 @@ -package org.jabref; +package org.jabref.toolkit; import java.io.File; import java.io.IOException; @@ -12,7 +12,6 @@ import javafx.util.Pair; -import org.jabref.cli.ArgumentProcessor; import org.jabref.logic.importer.SearchBasedFetcher; import org.jabref.logic.importer.WebFetcher; import org.jabref.logic.importer.WebFetchers; @@ -33,6 +32,7 @@ import org.jabref.model.entry.BibEntryTypesManager; import org.jabref.model.util.DummyFileUpdateMonitor; import org.jabref.model.util.FileUpdateMonitor; +import org.jabref.toolkit.cli.ArgumentProcessor; import com.airhacks.afterburner.injection.Injector; import org.slf4j.Logger; diff --git a/jabkit/src/main/java/org/jabref/cli/ArgumentProcessor.java b/jabkit/src/main/java/org/jabref/toolkit/cli/ArgumentProcessor.java similarity index 99% rename from jabkit/src/main/java/org/jabref/cli/ArgumentProcessor.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/ArgumentProcessor.java index e14dc409f92..7098faed038 100644 --- a/jabkit/src/main/java/org/jabref/cli/ArgumentProcessor.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/ArgumentProcessor.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.net.MalformedURLException; diff --git a/jabkit/src/main/java/org/jabref/cli/CheckConsistency.java b/jabkit/src/main/java/org/jabref/toolkit/cli/CheckConsistency.java similarity index 97% rename from jabkit/src/main/java/org/jabref/cli/CheckConsistency.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/CheckConsistency.java index 9af8ecce73f..650a55a74d5 100644 --- a/jabkit/src/main/java/org/jabref/cli/CheckConsistency.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/CheckConsistency.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.io.OutputStreamWriter; @@ -7,7 +7,6 @@ import java.util.Optional; import java.util.concurrent.Callable; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.l10n.Localization; import org.jabref.logic.quality.consistency.BibliographyConsistencyCheck; @@ -15,6 +14,7 @@ import org.jabref.logic.quality.consistency.BibliographyConsistencyCheckResultTxtWriter; import org.jabref.logic.quality.consistency.BibliographyConsistencyCheckResultWriter; import org.jabref.model.database.BibDatabaseContext; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jabkit/src/main/java/org/jabref/cli/CheckIntegrity.java b/jabkit/src/main/java/org/jabref/toolkit/cli/CheckIntegrity.java similarity index 98% rename from jabkit/src/main/java/org/jabref/cli/CheckIntegrity.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/CheckIntegrity.java index 368f6d731fb..b91347392bc 100644 --- a/jabkit/src/main/java/org/jabref/cli/CheckIntegrity.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/CheckIntegrity.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.io.OutputStreamWriter; @@ -10,7 +10,6 @@ import java.util.concurrent.Callable; import java.util.stream.Collectors; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.integrity.IntegrityCheck; import org.jabref.logic.integrity.IntegrityCheckResultCsvWriter; @@ -21,6 +20,7 @@ import org.jabref.logic.journals.JournalAbbreviationLoader; import org.jabref.logic.l10n.Localization; import org.jabref.model.database.BibDatabaseContext; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jabkit/src/main/java/org/jabref/cli/Convert.java b/jabkit/src/main/java/org/jabref/toolkit/cli/Convert.java similarity index 98% rename from jabkit/src/main/java/org/jabref/cli/Convert.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/Convert.java index dec3d2bd555..236f69a4ef3 100644 --- a/jabkit/src/main/java/org/jabref/cli/Convert.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/Convert.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.file.Path; @@ -8,7 +8,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.exporter.Exporter; import org.jabref.logic.exporter.ExporterFactory; import org.jabref.logic.exporter.SaveException; @@ -16,6 +15,7 @@ import org.jabref.logic.journals.JournalAbbreviationRepository; import org.jabref.logic.l10n.Localization; import org.jabref.model.database.BibDatabaseContext; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import com.airhacks.afterburner.injection.Injector; import org.jspecify.annotations.NonNull; diff --git a/jabkit/src/main/java/org/jabref/cli/DoiToBibtex.java b/jabkit/src/main/java/org/jabref/toolkit/cli/DoiToBibtex.java similarity index 99% rename from jabkit/src/main/java/org/jabref/cli/DoiToBibtex.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/DoiToBibtex.java index 8340e5d7232..238a861cd64 100644 --- a/jabkit/src/main/java/org/jabref/cli/DoiToBibtex.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/DoiToBibtex.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/jabkit/src/main/java/org/jabref/cli/Fetch.java b/jabkit/src/main/java/org/jabref/toolkit/cli/Fetch.java similarity index 99% rename from jabkit/src/main/java/org/jabref/cli/Fetch.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/Fetch.java index 21d870dd2e4..7122c2245c9 100644 --- a/jabkit/src/main/java/org/jabref/cli/Fetch.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/Fetch.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.nio.file.Path; import java.util.List; diff --git a/jabkit/src/main/java/org/jabref/cli/GenerateBibFromAux.java b/jabkit/src/main/java/org/jabref/toolkit/cli/GenerateBibFromAux.java similarity index 97% rename from jabkit/src/main/java/org/jabref/cli/GenerateBibFromAux.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/GenerateBibFromAux.java index ef88e995fa7..2fd4fa209ed 100644 --- a/jabkit/src/main/java/org/jabref/cli/GenerateBibFromAux.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/GenerateBibFromAux.java @@ -1,11 +1,10 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.nio.file.Files; import java.nio.file.Path; import java.util.Optional; import java.util.stream.Collectors; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.auxparser.AuxParser; import org.jabref.logic.auxparser.AuxParserResult; import org.jabref.logic.auxparser.AuxParserStatisticsProvider; @@ -14,6 +13,7 @@ import org.jabref.logic.l10n.Localization; import org.jabref.model.database.BibDatabase; import org.jabref.model.entry.BibEntry; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jabkit/src/main/java/org/jabref/cli/GenerateCitationKeys.java b/jabkit/src/main/java/org/jabref/toolkit/cli/GenerateCitationKeys.java similarity index 97% rename from jabkit/src/main/java/org/jabref/cli/GenerateCitationKeys.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/GenerateCitationKeys.java index db4d2a820d3..87e29e177ef 100644 --- a/jabkit/src/main/java/org/jabref/cli/GenerateCitationKeys.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/GenerateCitationKeys.java @@ -1,15 +1,15 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.nio.file.Path; import java.util.Optional; import java.util.stream.Collectors; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.citationkeypattern.CitationKeyGenerator; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.l10n.Localization; import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jabkit/src/main/java/org/jabref/cli/Pdf.java b/jabkit/src/main/java/org/jabref/toolkit/cli/Pdf.java similarity index 95% rename from jabkit/src/main/java/org/jabref/cli/Pdf.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/Pdf.java index a02fb458ded..79155f860d7 100644 --- a/jabkit/src/main/java/org/jabref/cli/Pdf.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/Pdf.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import static picocli.CommandLine.Command; import static picocli.CommandLine.Mixin; diff --git a/jabkit/src/main/java/org/jabref/cli/PdfUpdate.java b/jabkit/src/main/java/org/jabref/toolkit/cli/PdfUpdate.java similarity index 99% rename from jabkit/src/main/java/org/jabref/cli/PdfUpdate.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/PdfUpdate.java index 08ebb73d135..ad21dac8301 100644 --- a/jabkit/src/main/java/org/jabref/cli/PdfUpdate.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/PdfUpdate.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.file.Files; @@ -9,7 +9,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.FilePreferences; import org.jabref.logic.bibtex.FieldPreferences; import org.jabref.logic.exporter.EmbeddedBibFilePdfExporter; @@ -24,6 +23,7 @@ import org.jabref.model.database.BibDatabaseMode; import org.jabref.model.entry.BibEntry; import org.jabref.model.entry.BibEntryTypesManager; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import com.airhacks.afterburner.injection.Injector; import org.slf4j.Logger; diff --git a/jabkit/src/main/java/org/jabref/cli/Preferences.java b/jabkit/src/main/java/org/jabref/toolkit/cli/Preferences.java similarity index 99% rename from jabkit/src/main/java/org/jabref/cli/Preferences.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/Preferences.java index f2f1c554b9b..d7161b70d50 100644 --- a/jabkit/src/main/java/org/jabref/cli/Preferences.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/Preferences.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.nio.file.Path; import java.util.concurrent.Callable; diff --git a/jabkit/src/main/java/org/jabref/cli/Pseudonymize.java b/jabkit/src/main/java/org/jabref/toolkit/cli/Pseudonymize.java similarity index 97% rename from jabkit/src/main/java/org/jabref/cli/Pseudonymize.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/Pseudonymize.java index 11807baff07..c3089645c6d 100644 --- a/jabkit/src/main/java/org/jabref/cli/Pseudonymize.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/Pseudonymize.java @@ -1,17 +1,17 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Optional; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.importer.ParserResult; import org.jabref.logic.l10n.Localization; import org.jabref.logic.pseudonymization.Pseudonymization; import org.jabref.logic.pseudonymization.PseudonymizationResultCsvWriter; import org.jabref.logic.util.io.FileUtil; import org.jabref.model.database.BibDatabaseContext; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import io.github.adr.linked.ADR; import org.slf4j.Logger; diff --git a/jabkit/src/main/java/org/jabref/cli/Search.java b/jabkit/src/main/java/org/jabref/toolkit/cli/Search.java similarity index 98% rename from jabkit/src/main/java/org/jabref/cli/Search.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/Search.java index a2fb4526f29..7cbf53b9499 100644 --- a/jabkit/src/main/java/org/jabref/cli/Search.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/Search.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.file.Path; @@ -8,7 +8,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; -import org.jabref.cli.converter.CygWinPathConverter; import org.jabref.logic.exporter.Exporter; import org.jabref.logic.exporter.ExporterFactory; import org.jabref.logic.exporter.SaveException; @@ -24,6 +23,7 @@ import org.jabref.model.database.BibDatabaseContext; import org.jabref.model.entry.BibEntry; import org.jabref.model.search.query.SearchQuery; +import org.jabref.toolkit.cli.converter.CygWinPathConverter; import com.airhacks.afterburner.injection.Injector; import org.slf4j.Logger; diff --git a/jabkit/src/main/java/org/jabref/cli/converter/CygWinPathConverter.java b/jabkit/src/main/java/org/jabref/toolkit/cli/converter/CygWinPathConverter.java similarity index 90% rename from jabkit/src/main/java/org/jabref/cli/converter/CygWinPathConverter.java rename to jabkit/src/main/java/org/jabref/toolkit/cli/converter/CygWinPathConverter.java index 5c242d75ec0..b7f2c05300c 100644 --- a/jabkit/src/main/java/org/jabref/cli/converter/CygWinPathConverter.java +++ b/jabkit/src/main/java/org/jabref/toolkit/cli/converter/CygWinPathConverter.java @@ -1,4 +1,4 @@ -package org.jabref.cli.converter; +package org.jabref.toolkit.cli.converter; import java.nio.file.Path; diff --git a/jabkit/src/test/java/org/jabref/cli/AbstractJabKitTest.java b/jabkit/src/test/java/org/jabref/toolkit/cli/AbstractJabKitTest.java similarity index 99% rename from jabkit/src/test/java/org/jabref/cli/AbstractJabKitTest.java rename to jabkit/src/test/java/org/jabref/toolkit/cli/AbstractJabKitTest.java index f8b822d4cb6..5f24f57836a 100644 --- a/jabkit/src/test/java/org/jabref/cli/AbstractJabKitTest.java +++ b/jabkit/src/test/java/org/jabref/toolkit/cli/AbstractJabKitTest.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/jabkit/src/test/java/org/jabref/cli/ArgumentProcessorTest.java b/jabkit/src/test/java/org/jabref/toolkit/cli/ArgumentProcessorTest.java similarity index 99% rename from jabkit/src/test/java/org/jabref/cli/ArgumentProcessorTest.java rename to jabkit/src/test/java/org/jabref/toolkit/cli/ArgumentProcessorTest.java index 7ea471bced6..5efd1d5bb8f 100644 --- a/jabkit/src/test/java/org/jabref/cli/ArgumentProcessorTest.java +++ b/jabkit/src/test/java/org/jabref/toolkit/cli/ArgumentProcessorTest.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.net.URISyntaxException; diff --git a/jabkit/src/test/java/org/jabref/cli/ConvertTest.java b/jabkit/src/test/java/org/jabref/toolkit/cli/ConvertTest.java similarity index 99% rename from jabkit/src/test/java/org/jabref/cli/ConvertTest.java rename to jabkit/src/test/java/org/jabref/toolkit/cli/ConvertTest.java index 626d766157d..e8833bdb54f 100644 --- a/jabkit/src/test/java/org/jabref/cli/ConvertTest.java +++ b/jabkit/src/test/java/org/jabref/toolkit/cli/ConvertTest.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.file.Files; diff --git a/jabkit/src/test/java/org/jabref/cli/PseudonymizeTest.java b/jabkit/src/test/java/org/jabref/toolkit/cli/PseudonymizeTest.java similarity index 98% rename from jabkit/src/test/java/org/jabref/cli/PseudonymizeTest.java rename to jabkit/src/test/java/org/jabref/toolkit/cli/PseudonymizeTest.java index cd12060d0d3..f19f2e0a386 100644 --- a/jabkit/src/test/java/org/jabref/cli/PseudonymizeTest.java +++ b/jabkit/src/test/java/org/jabref/toolkit/cli/PseudonymizeTest.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.charset.Charset; diff --git a/jabkit/src/test/java/org/jabref/cli/SearchTest.java b/jabkit/src/test/java/org/jabref/toolkit/cli/SearchTest.java similarity index 98% rename from jabkit/src/test/java/org/jabref/cli/SearchTest.java rename to jabkit/src/test/java/org/jabref/toolkit/cli/SearchTest.java index 7b696a1280b..833a8225bb2 100644 --- a/jabkit/src/test/java/org/jabref/cli/SearchTest.java +++ b/jabkit/src/test/java/org/jabref/toolkit/cli/SearchTest.java @@ -1,4 +1,4 @@ -package org.jabref.cli; +package org.jabref.toolkit.cli; import java.io.IOException; import java.nio.file.Files; diff --git a/jabkit/src/test/resources/org/jabref/cli/ArgumentProcessorTestExportMatches.bib b/jabkit/src/test/resources/org/jabref/toolkit/cli/ArgumentProcessorTestExportMatches.bib similarity index 100% rename from jabkit/src/test/resources/org/jabref/cli/ArgumentProcessorTestExportMatches.bib rename to jabkit/src/test/resources/org/jabref/toolkit/cli/ArgumentProcessorTestExportMatches.bib diff --git a/jabkit/src/test/resources/org/jabref/cli/origin.bib b/jabkit/src/test/resources/org/jabref/toolkit/cli/origin.bib similarity index 100% rename from jabkit/src/test/resources/org/jabref/cli/origin.bib rename to jabkit/src/test/resources/org/jabref/toolkit/cli/origin.bib diff --git a/jabkit/src/test/resources/org/jabref/cli/paper.aux b/jabkit/src/test/resources/org/jabref/toolkit/cli/paper.aux similarity index 100% rename from jabkit/src/test/resources/org/jabref/cli/paper.aux rename to jabkit/src/test/resources/org/jabref/toolkit/cli/paper.aux diff --git a/test-support/src/main/java/org/jabref/support/CommonArchitectureTest.java b/test-support/src/main/java/org/jabref/support/CommonArchitectureTest.java index 5572d8be483..3ace7dec86d 100644 --- a/test-support/src/main/java/org/jabref/support/CommonArchitectureTest.java +++ b/test-support/src/main/java/org/jabref/support/CommonArchitectureTest.java @@ -31,6 +31,7 @@ public class CommonArchitectureTest { private static final String PACKAGE_ORG_JABREF_LOGIC = "org.jabref.logic.."; private static final String PACKAGE_ORG_JABREF_MODEL = "org.jabref.model.."; private static final String PACKAGE_ORG_JABREF_CLI = "org.jabref.cli.."; + private static final String PACKAGE_ORG_JABREF_TOOLKIT_CLI = "org.jabref.toolkit.cli.."; @ArchTest public void doNotUseApacheCommonsLang3(JavaClasses classes) { @@ -149,7 +150,9 @@ public void restrictToSlf4jLogger(JavaClasses classes) { @ArchTest public void restrictStandardStreams(JavaClasses classes) { - ArchRuleDefinition.noClasses().that().resideOutsideOfPackages(PACKAGE_ORG_JABREF_CLI) + ArchRuleDefinition.noClasses().that().resideOutsideOfPackages( + PACKAGE_ORG_JABREF_CLI, + PACKAGE_ORG_JABREF_TOOLKIT_CLI) .and().resideOutsideOfPackages("org.jabref.gui.openoffice..") // Uses LibreOffice SDK .and().areNotAnnotatedWith(AllowedToUseStandardStreams.class) .should(GeneralCodingRules.ACCESS_STANDARD_STREAMS)