Consolidate Vocab support code into one place

apache · Nov 16, 2022 · d378e8c · d378e8c
1 parent b7a9b3d
commit d378e8c
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 44 deletions.
diff --git a/.../org/apache/jena/tdb/assembler/Vocab.java → ...in/java/org/apache/jena/system/Vocab.java b/.../org/apache/jena/tdb/assembler/Vocab.java → ...in/java/org/apache/jena/system/Vocab.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.jena.tdb.assembler;
+package org.apache.jena.system;
 
 import org.apache.jena.rdf.model.Property ;
 import org.apache.jena.rdf.model.Resource ;

diff --git a/...fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/VocabSecurity.java b/...fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/VocabSecurity.java
@@ -21,7 +21,7 @@
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.sparql.core.assembler.AssemblerUtils;
-import org.apache.jena.tdb.assembler.Vocab;
+import org.apache.jena.system.Vocab;
 
 public class VocabSecurity {
     private static final String NS = "http://jena.apache.org/access#";

diff --git a/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/filelog/VocabPatch.java b/jena-rdfpatch/src/main/java/org/apache/jena/rdfpatch/filelog/VocabPatch.java
@@ -22,7 +22,7 @@
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.sparql.core.assembler.AssemblerUtils;
 import org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab;
-import org.apache.jena.tdb.assembler.Vocab;
+import org.apache.jena.system.Vocab;
 
 public class VocabPatch {
 

diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java b/jena-tdb1/src/main/java/org/apache/jena/tdb/assembler/VocabTDB.java
@@ -21,6 +21,7 @@
 import org.apache.jena.rdf.model.Property ;
 import org.apache.jena.rdf.model.Resource ;
 import org.apache.jena.sparql.core.assembler.AssemblerUtils ;
+import org.apache.jena.system.Vocab;
 import org.apache.jena.tdb.TDB ;
 
 public class VocabTDB

diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/Vocab.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/Vocab.java
diff --git a/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/VocabTDB2.java b/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/VocabTDB2.java
@@ -26,6 +26,7 @@
 import org.apache.jena.rdf.model.Property;
 import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.sparql.core.assembler.AssemblerUtils;
+import org.apache.jena.system.Vocab;
 import org.apache.jena.tdb2.TDB2;
 
 public class VocabTDB2

diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextVocab.java
@@ -20,7 +20,7 @@
 
 import org.apache.jena.rdf.model.Property ;
 import org.apache.jena.rdf.model.Resource ;
-import org.apache.jena.tdb.assembler.Vocab ;
+import org.apache.jena.system.Vocab ;
 
 public class TextVocab
 {