Move atomix-storage to a top-level directory 35/105035/3
authorRobert Varga <robert.varga@pantheon.tech>
Mon, 27 Mar 2023 11:25:57 +0000 (13:25 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Mon, 27 Mar 2023 12:14:57 +0000 (14:14 +0200)
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 <robert.varga@pantheon.tech>
57 files changed:
atomix-storage/LICENSE [moved from third-party/atomix/storage/LICENSE with 100% similarity]
atomix-storage/pom.xml [moved from third-party/atomix/storage/pom.xml with 98% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/BufferCleaner.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/Cleaner.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Cleaner.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/Indexed.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Indexed.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/Journal.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/Journal.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/JournalReader.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalReader.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegment.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegmentDescriptor.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSegmentFile.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalSerdes.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/JournalWriter.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/JournalWriter.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentReader.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappableJournalSegmentWriter.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentReader.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournal.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/SegmentedJournalWriter.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/StorageException.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageException.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/StorageLevel.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/StorageLevel.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/index/JournalIndex.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/JournalIndex.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/index/Position.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/Position.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/SparseJournalIndex.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/index/package-info.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/index/package-info.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/storage/journal/package-info.java [moved from third-party/atomix/storage/src/main/java/io/atomix/storage/journal/package-info.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStream.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/ByteArrayOutput.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/EntrySerializer.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoEntryInput.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoEntryOutput.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoIOPool.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoInputPool.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdes.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoJournalSerdesBuilder.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/KryoOutputPool.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/RegisteredType.java with 100% similarity]
atomix-storage/src/main/java/io/atomix/utils/serializer/package-info.java [moved from third-party/atomix/storage/src/main/java/io/atomix/utils/serializer/package-info.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/ByteArraySerdes.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/DiskJournalTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/JournalSegmentDescriptorTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/JournalSegmentFileTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MappedJournalTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/MemoryJournalTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/PersistentJournalTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/TestEntry.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/TestEntry.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/TestEntrySerdes.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/storage/journal/index/SparseJournalIndexTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/BufferAwareByteArrayOutputStreamTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoInputPoolTest.java with 100% similarity]
atomix-storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java [moved from third-party/atomix/storage/src/test/java/io/atomix/utils/serializer/KryoOutputPoolTest.java with 100% similarity]
atomix-storage/src/test/resources/logback.xml [moved from third-party/atomix/storage/src/test/resources/logback.xml with 100% similarity]
pom.xml
third-party/atomix/pom.xml [deleted file]

similarity index 98%
rename from third-party/atomix/storage/pom.xml
rename to atomix-storage/pom.xml
index c0747c25adbe8fa1b831e7bc46c8236ae751a322..baf7aee6e1174e220efc03ab9ff6566135e598c9 100644 (file)
@@ -21,7 +21,7 @@
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>bundle-parent</artifactId>
     <version>7.0.5-SNAPSHOT</version>
-    <relativePath>../../../bundle-parent</relativePath>
+    <relativePath>../bundle-parent</relativePath>
   </parent>
 
   <artifactId>atomix-storage</artifactId>
diff --git a/pom.xml b/pom.xml
index a00833577289e90d779a1de2317de1795a9dac7b..c755875fc0c13a51be7893f59b4d3d06db5e2147 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
     <module>karaf</module>
 
     <module>akka</module>
+    <module>atomix-storage</module>
     <module>bundle-parent</module>
     <module>benchmark</module>
     <module>jolokia</module>
@@ -37,8 +38,6 @@
     <module>opendaylight/config</module>
 
     <module>opendaylight/blueprint</module>
-
-    <module>third-party/atomix</module>
   </modules>
 
   <profiles>
diff --git a/third-party/atomix/pom.xml b/third-party/atomix/pom.xml
deleted file mode 100644 (file)
index 6b3a318..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>12.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>atomix</artifactId>
-    <version>7.0.5-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-
-    <modules>
-        <module>storage</module>
-    </modules>
-</project>