This is an automated email from the ASF dual-hosted git repository.
andy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/main by this push:
new 5cf52164f9 Rename package in jena-dboe-index-test
new 43da3869ac Merge pull request #1504 from afs/repackage
5cf52164f9 is described below
commit 5cf52164f96005f762d07dc365a82bd51a1c28e8
Author: Andy Seaborne <[email protected]>
AuthorDate: Wed Aug 31 22:12:54 2022 +0100
Rename package in jena-dboe-index-test
---
.../java/org/apache/jena/dboe/index/{ => test}/TS_Index.java | 2 +-
.../org/apache/jena/dboe/index/{ => test}/TestIndexMem.java | 6 ++++--
.../jena/dboe/index/{test => testlib}/AbstractTestIndex.java | 4 ++--
.../dboe/index/{test => testlib}/AbstractTestRangeIndex.java | 10 +++++-----
.../apache/jena/dboe/index/{test => testlib}/IndexMaker.java | 2 +-
.../jena/dboe/index/{test => testlib}/IndexTestGenerator.java | 2 +-
.../apache/jena/dboe/index/{test => testlib}/IndexTestLib.java | 2 +-
.../jena/dboe/index/{test => testlib}/RangeIndexMaker.java | 2 +-
.../org/apache/jena/dboe/trans/bplustree/BPlusTreeMaker.java | 2 +-
.../jena/dboe/trans/bplustree/TestBPlusTreeIndexNonTxn.java | 2 +-
.../apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java | 4 ++--
.../org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java | 2 +-
.../org/apache/jena/dboe/trans/data/TestTransIndexMem.java | 2 +-
.../src/test/java/dboe/CmdTestBPlusTree.java | 2 +-
14 files changed, 23 insertions(+), 21 deletions(-)
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/TS_Index.java
similarity index 95%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/TS_Index.java
index 2095db0d17..e4e1122728 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TS_Index.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/TS_Index.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index;
+package org.apache.jena.dboe.index.test;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TestIndexMem.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/TestIndexMem.java
similarity index 85%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TestIndexMem.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/TestIndexMem.java
index f5d3425fe7..3d158973bd 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/TestIndexMem.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/TestIndexMem.java
@@ -16,10 +16,12 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index;
+package org.apache.jena.dboe.index.test;
import org.apache.jena.dboe.base.record.RecordFactory;
-import org.apache.jena.dboe.index.test.AbstractTestIndex;
+import org.apache.jena.dboe.index.Index;
+import org.apache.jena.dboe.index.IndexMap;
+import org.apache.jena.dboe.index.testlib.AbstractTestIndex;
public class TestIndexMem extends AbstractTestIndex
{
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/AbstractTestIndex.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestIndex.java
similarity index 97%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/AbstractTestIndex.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestIndex.java
index 15e50fcad2..880ed1e995 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/AbstractTestIndex.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestIndex.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index.test;
+package org.apache.jena.dboe.index.testlib;
-import static org.apache.jena.dboe.index.test.IndexTestLib.*;
+import static org.apache.jena.dboe.index.testlib.IndexTestLib.*;
import static org.apache.jena.dboe.test.RecordLib.intToRecord;
import org.apache.jena.dboe.base.record.Record;
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/AbstractTestRangeIndex.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java
similarity index 97%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/AbstractTestRangeIndex.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java
index af47dabb52..e7a48ceaa2 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/AbstractTestRangeIndex.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/AbstractTestRangeIndex.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index.test;
+package org.apache.jena.dboe.index.testlib;
-import static org.apache.jena.dboe.index.test.IndexTestLib.add;
-import static org.apache.jena.dboe.index.test.IndexTestLib.randTest;
-import static org.apache.jena.dboe.index.test.IndexTestLib.testInsert;
-import static org.apache.jena.dboe.index.test.IndexTestLib.testInsertDelete;
+import static org.apache.jena.dboe.index.testlib.IndexTestLib.add;
+import static org.apache.jena.dboe.index.testlib.IndexTestLib.randTest;
+import static org.apache.jena.dboe.index.testlib.IndexTestLib.testInsert;
+import static org.apache.jena.dboe.index.testlib.IndexTestLib.testInsertDelete;
import static org.apache.jena.dboe.test.RecordLib.intToRecord;
import static org.apache.jena.dboe.test.RecordLib.r;
import static org.apache.jena.dboe.test.RecordLib.toIntList;
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexMaker.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexMaker.java
similarity index 95%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexMaker.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexMaker.java
index 30c2fbbb33..e410dd4cfa 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexMaker.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexMaker.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index.test;
+package org.apache.jena.dboe.index.testlib;
import org.apache.jena.dboe.index.Index;
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexTestGenerator.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexTestGenerator.java
similarity index 97%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexTestGenerator.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexTestGenerator.java
index 7bc8c1bb5a..b8a722246a 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexTestGenerator.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexTestGenerator.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index.test;
+package org.apache.jena.dboe.index.testlib;
import org.apache.jena.atlas.lib.RandomLib;
import org.apache.jena.atlas.test.ExecGenerator;
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexTestLib.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexTestLib.java
similarity index 99%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexTestLib.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexTestLib.java
index 71db913e56..951bd6ce26 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/IndexTestLib.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/IndexTestLib.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index.test;
+package org.apache.jena.dboe.index.testlib;
import static java.lang.String.format;
import static org.apache.jena.atlas.lib.ListUtils.asList;
diff --git
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/RangeIndexMaker.java
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/RangeIndexMaker.java
similarity index 95%
rename from
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/RangeIndexMaker.java
rename to
jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/RangeIndexMaker.java
index 2d5a4c456b..539a5e5422 100644
---
a/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/test/RangeIndexMaker.java
+++
b/jena-db/jena-dboe-index-test/src/main/java/org/apache/jena/dboe/index/testlib/RangeIndexMaker.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.dboe.index.test;
+package org.apache.jena.dboe.index.testlib;
import org.apache.jena.dboe.index.RangeIndex;
diff --git
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/BPlusTreeMaker.java
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/BPlusTreeMaker.java
index 6318c4e3de..cbd2f7e4bd 100644
---
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/BPlusTreeMaker.java
+++
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/BPlusTreeMaker.java
@@ -20,7 +20,7 @@ package org.apache.jena.dboe.trans.bplustree;
import org.apache.jena.dboe.index.Index;
import org.apache.jena.dboe.index.RangeIndex;
-import org.apache.jena.dboe.index.test.RangeIndexMaker;
+import org.apache.jena.dboe.index.testlib.RangeIndexMaker;
import org.apache.jena.dboe.test.RecordLib;
public class BPlusTreeMaker implements RangeIndexMaker
diff --git
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeIndexNonTxn.java
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeIndexNonTxn.java
index 05bb9b4100..4fe4f2f9bd 100644
---
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeIndexNonTxn.java
+++
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeIndexNonTxn.java
@@ -20,7 +20,7 @@ package org.apache.jena.dboe.trans.bplustree;
import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.dboe.base.block.BlockMgr;
-import org.apache.jena.dboe.index.test.AbstractTestIndex;
+import org.apache.jena.dboe.index.testlib.AbstractTestIndex;
import org.apache.jena.dboe.sys.SystemIndex;
import org.apache.jena.dboe.test.RecordLib;
import org.junit.AfterClass;
diff --git
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java
index 4eb7395806..c89628c076 100644
---
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java
+++
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeNonTxn.java
@@ -18,7 +18,7 @@
package org.apache.jena.dboe.trans.bplustree;
-import static org.apache.jena.dboe.index.test.IndexTestLib.add;
+import static org.apache.jena.dboe.index.testlib.IndexTestLib.add;
import static org.apache.jena.dboe.test.RecordLib.intToRecord;
import java.util.List;
@@ -26,7 +26,7 @@ import java.util.List;
import org.apache.jena.atlas.logging.LogCtl;
import org.apache.jena.dboe.base.block.BlockMgr;
import org.apache.jena.dboe.base.record.Record;
-import org.apache.jena.dboe.index.test.AbstractTestRangeIndex;
+import org.apache.jena.dboe.index.testlib.AbstractTestRangeIndex;
import org.apache.jena.dboe.sys.SystemIndex;
import org.apache.jena.dboe.test.RecordLib;
import org.junit.AfterClass;
diff --git
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java
index a6eca4472e..85c6bcd67a 100644
---
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java
+++
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/bplustree/TestBPlusTreeTxn.java
@@ -19,7 +19,7 @@
package org.apache.jena.dboe.trans.bplustree;
import org.apache.jena.dboe.base.file.Location;
-import org.apache.jena.dboe.index.test.IndexTestLib;
+import org.apache.jena.dboe.index.testlib.IndexTestLib;
import org.apache.jena.system.Txn;
import org.apache.jena.dboe.test.RecordLib;
import org.apache.jena.dboe.transaction.Transactional;
diff --git
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTransIndexMem.java
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTransIndexMem.java
index 00effd25f3..d7b1b2c223 100644
---
a/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTransIndexMem.java
+++
b/jena-db/jena-dboe-trans-data/src/test/java/org/apache/jena/dboe/trans/data/TestTransIndexMem.java
@@ -21,7 +21,7 @@ package org.apache.jena.dboe.trans.data;
import org.apache.jena.dboe.base.record.RecordFactory;
import org.apache.jena.dboe.index.Index;
import org.apache.jena.dboe.index.IndexMap;
-import org.apache.jena.dboe.index.test.AbstractTestIndex;
+import org.apache.jena.dboe.index.testlib.AbstractTestIndex;
public class TestTransIndexMem extends AbstractTestIndex
{
diff --git a/jena-integration-tests/src/test/java/dboe/CmdTestBPlusTree.java
b/jena-integration-tests/src/test/java/dboe/CmdTestBPlusTree.java
index a7ccd60d3f..ec86c46fbf 100644
--- a/jena-integration-tests/src/test/java/dboe/CmdTestBPlusTree.java
+++ b/jena-integration-tests/src/test/java/dboe/CmdTestBPlusTree.java
@@ -19,7 +19,7 @@
package dboe;
import org.apache.jena.dboe.base.file.BlockAccessMem;
-import org.apache.jena.dboe.index.test.IndexTestLib;
+import org.apache.jena.dboe.index.testlib.IndexTestLib;
import org.apache.jena.dboe.sys.SysDB;
import org.apache.jena.dboe.sys.SystemIndex;
import org.apache.jena.dboe.trans.bplustree.BPT;
