diff --git a/jena-tdb1/src/main/java/org/apache/jena/tdb/assembler/Vocab.java b/jena-arq/src/main/java/org/apache/jena/system/Vocab.java similarity index 97% rename from jena-tdb1/src/main/java/org/apache/jena/tdb/assembler/Vocab.java rename to jena-arq/src/main/java/org/apache/jena/system/Vocab.java index 27d4f9fe3bc..2706264d3ae 100644 --- a/jena-tdb1/src/main/java/org/apache/jena/tdb/assembler/Vocab.java +++ b/jena-arq/src/main/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/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/VocabSecurity.java b/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/VocabSecurity.java index f6caf0b51a5..c3ed62cfa09 100644 --- a/jena-fuseki2/jena-fuseki-access/src/main/java/org/apache/jena/fuseki/access/VocabSecurity.java +++ b/jena-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 index 6c4ba0a07b2..21bb283fd51 100644 --- 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 index b7f9ba13635..b4631b827d0 100644 --- 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 deleted file mode 100644 index f902ebe2ce9..00000000000 --- a/jena-tdb2/src/main/java/org/apache/jena/tdb2/assembler/Vocab.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.jena.tdb2.assembler; - -import org.apache.jena.rdf.model.Property; -import org.apache.jena.rdf.model.Resource; -import org.apache.jena.rdf.model.ResourceFactory; - -public class Vocab { - - private Vocab() {} - - public static Resource type(String namespace, String localName) { - return ResourceFactory.createResource(namespace + localName); - } - - public static Resource resource(String namespace, String localName) { - return ResourceFactory.createResource(namespace + localName); - } - - public static Property property(String namespace, String localName) { - return ResourceFactory.createProperty(namespace + localName); - } -} 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 index d1517dc4995..0495269c64a 100644 --- 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 index be01200eeec..005942b7eb1 100644 --- 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 {