From 16bcd8d75886f4d9d8ad4e6833147aa516358adf Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 27 Mar 2023 13:25:57 +0200 Subject: [PATCH] Move atomix-storage to a top-level directory The directory structure no longer makes sense here, move the single component to a top-level directory. JIRA: CONTROLLER-2072 Change-Id: Ib011d88908547059e21a11820b0531c6edb5a680 Signed-off-by: Robert Varga --- .../atomix/storage => atomix-storage}/LICENSE | 0 .../atomix/storage => atomix-storage}/pom.xml | 2 +- .../atomix/storage/journal/BufferCleaner.java | 0 .../io/atomix/storage/journal/Cleaner.java | 0 .../FileChannelJournalSegmentReader.java | 0 .../FileChannelJournalSegmentWriter.java | 0 .../io/atomix/storage/journal/Indexed.java | 0 .../io/atomix/storage/journal/Journal.java | 0 .../atomix/storage/journal/JournalReader.java | 0 .../storage/journal/JournalSegment.java | 0 .../journal/JournalSegmentDescriptor.java | 0 .../storage/journal/JournalSegmentFile.java | 0 .../atomix/storage/journal/JournalSerdes.java | 0 .../atomix/storage/journal/JournalWriter.java | 0 .../journal/MappableJournalSegmentReader.java | 0 .../journal/MappableJournalSegmentWriter.java | 0 .../journal/MappedJournalSegmentReader.java | 0 .../journal/MappedJournalSegmentWriter.java | 0 .../storage/journal/SegmentedJournal.java | 0 .../journal/SegmentedJournalReader.java | 0 .../journal/SegmentedJournalWriter.java | 0 .../storage/journal/StorageException.java | 0 .../atomix/storage/journal/StorageLevel.java | 0 .../storage/journal/index/JournalIndex.java | 0 .../storage/journal/index/Position.java | 0 .../journal/index/SparseJournalIndex.java | 0 .../storage/journal/index/package-info.java | 0 .../atomix/storage/journal/package-info.java | 0 .../BufferAwareByteArrayOutputStream.java | 0 .../utils/serializer/ByteArrayOutput.java | 0 .../utils/serializer/EntrySerializer.java | 0 .../utils/serializer/KryoEntryInput.java | 0 .../utils/serializer/KryoEntryOutput.java | 0 .../atomix/utils/serializer/KryoIOPool.java | 0 .../utils/serializer/KryoInputPool.java | 0 .../utils/serializer/KryoJournalSerdes.java | 0 .../serializer/KryoJournalSerdesBuilder.java | 0 .../utils/serializer/KryoOutputPool.java | 0 .../utils/serializer/RegisteredType.java | 0 .../atomix/utils/serializer/package-info.java | 0 .../storage/journal/AbstractJournalTest.java | 0 .../storage/journal/ByteArraySerdes.java | 0 .../storage/journal/DiskJournalTest.java | 0 .../journal/JournalSegmentDescriptorTest.java | 0 .../journal/JournalSegmentFileTest.java | 0 .../storage/journal/MappedJournalTest.java | 0 .../storage/journal/MemoryJournalTest.java | 0 .../journal/PersistentJournalTest.java | 0 .../io/atomix/storage/journal/TestEntry.java | 0 .../storage/journal/TestEntrySerdes.java | 0 .../journal/index/SparseJournalIndexTest.java | 0 .../BufferAwareByteArrayOutputStreamTest.java | 0 .../utils/serializer/KryoInputPoolTest.java | 0 .../utils/serializer/KryoOutputPoolTest.java | 0 .../src/test/resources/logback.xml | 0 pom.xml | 3 +-- third-party/atomix/pom.xml | 25 ------------------- 57 files changed, 2 insertions(+), 28 deletions(-) rename {third-party/atomix/storage => atomix-storage}/LICENSE (100%) rename {third-party/atomix/storage => atomix-storage}/pom.xml (98%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/BufferCleaner.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/Cleaner.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/Indexed.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/Journal.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/JournalReader.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/JournalSegment.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/JournalSerdes.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/JournalWriter.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/SegmentedJournal.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/StorageException.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/StorageLevel.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/index/JournalIndex.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/index/Position.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/index/package-info.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/storage/journal/package-info.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/EntrySerializer.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoIOPool.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoInputPool.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/RegisteredType.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/main/java/io/atomix/utils/serializer/package-info.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/DiskJournalTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/MappedJournalTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/TestEntry.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java (100%) rename {third-party/atomix/storage => atomix-storage}/src/test/resources/logback.xml (100%) delete mode 100644 third-party/atomix/pom.xml diff --git a/third-party/atomix/storage/LICENSE b/atomix-storage/LICENSE similarity index 100% rename from third-party/atomix/storage/LICENSE rename to atomix-storage/LICENSE diff --git a/third-party/atomix/storage/pom.xml b/atomix-storage/pom.xml similarity index 98% rename from third-party/atomix/storage/pom.xml rename to atomix-storage/pom.xml index c0747c25ad..baf7aee6e1 100644 --- a/third-party/atomix/storage/pom.xml +++ b/atomix-storage/pom.xml @@ -21,7 +21,7 @@ org.opendaylight.controller bundle-parent 7.0.5-SNAPSHOT - ../../../bundle-parent + ../bundle-parent atomix-storage diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java b/atomix-storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Cleaner.java b/atomix-storage/src/main/java/io/atomix/storage/journal/Cleaner.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Cleaner.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/Cleaner.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Indexed.java b/atomix-storage/src/main/java/io/atomix/storage/journal/Indexed.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Indexed.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/Indexed.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Journal.java b/atomix-storage/src/main/java/io/atomix/storage/journal/Journal.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Journal.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/Journal.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalReader.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalWriter.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalWriter.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/JournalWriter.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageException.java b/atomix-storage/src/main/java/io/atomix/storage/journal/StorageException.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageException.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/StorageException.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageLevel.java b/atomix-storage/src/main/java/io/atomix/storage/journal/StorageLevel.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageLevel.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/StorageLevel.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/JournalIndex.java b/atomix-storage/src/main/java/io/atomix/storage/journal/index/JournalIndex.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/JournalIndex.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/index/JournalIndex.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/Position.java b/atomix-storage/src/main/java/io/atomix/storage/journal/index/Position.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/Position.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/index/Position.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java b/atomix-storage/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/package-info.java b/atomix-storage/src/main/java/io/atomix/storage/journal/index/package-info.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/package-info.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/index/package-info.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/storage/journal/package-info.java b/atomix-storage/src/main/java/io/atomix/storage/journal/package-info.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/package-info.java rename to atomix-storage/src/main/java/io/atomix/storage/journal/package-info.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java diff --git a/third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/package-info.java b/atomix-storage/src/main/java/io/atomix/utils/serializer/package-info.java similarity index 100% rename from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/package-info.java rename to atomix-storage/src/main/java/io/atomix/utils/serializer/package-info.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java b/atomix-storage/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/TestEntry.java b/atomix-storage/src/test/java/io/atomix/storage/journal/TestEntry.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/TestEntry.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/TestEntry.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java b/atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java b/atomix-storage/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java rename to atomix-storage/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java b/atomix-storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java rename to atomix-storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java b/atomix-storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java rename to atomix-storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java diff --git a/third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java b/atomix-storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java similarity index 100% rename from third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java rename to atomix-storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java diff --git a/third-party/atomix/storage/src/test/resources/logback.xml b/atomix-storage/src/test/resources/logback.xml similarity index 100% rename from third-party/atomix/storage/src/test/resources/logback.xml rename to atomix-storage/src/test/resources/logback.xml diff --git a/pom.xml b/pom.xml index a008335772..c755875fc0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,6 +27,7 @@ karaf akka + atomix-storage bundle-parent benchmark jolokia @@ -37,8 +38,6 @@ opendaylight/config opendaylight/blueprint - - third-party/atomix diff --git a/third-party/atomix/pom.xml b/third-party/atomix/pom.xml deleted file mode 100644 index 6b3a318594..0000000000 --- a/third-party/atomix/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 12.0.3 - - - - org.opendaylight.controller - atomix - 7.0.5-SNAPSHOT - pom - - - true - true - - - - storage - - -- 2.36.6