Issue #859: Include repository config ns prefix in config.till files

James Leigh · James Leigh · commit 3b44db1c9216 · 2017-07-28T15:18:37.000-04:00
Signed-off-by: James Leigh &lt;james.leigh@ontotext.com&gt;
diff --git a/core/repository/api/src/main/java/org/eclipse/rdf4j/repository/config/RepositoryConfig.java b/core/repository/api/src/main/java/org/eclipse/rdf4j/repository/config/RepositoryConfig.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.repository.config;
 
+import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.NAMESPACE;
 import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.REPOSITORY;
 import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.REPOSITORYID;
 import static org.eclipse.rdf4j.repository.config.RepositoryConfigSchema.REPOSITORYIMPL;
@@ -19,6 +20,7 @@
 import org.eclipse.rdf4j.model.util.Models;
 import org.eclipse.rdf4j.model.vocabulary.RDF;
 import org.eclipse.rdf4j.model.vocabulary.RDFS;
+import org.eclipse.rdf4j.model.vocabulary.XMLSchema;
 
 /**
  * @author Arjohn Kampman
@@ -131,6 +133,9 @@ public void export(Model model) {
 	 */
 	public void export(Model model, Resource repositoryNode) {
 		ValueFactory vf = SimpleValueFactory.getInstance();
+		model.setNamespace(RDFS.NS);
+		model.setNamespace(XMLSchema.NS);
+		model.setNamespace("rep", NAMESPACE);
 		model.add(repositoryNode, RDF.TYPE, REPOSITORY);
 
 		if (id != null) {
diff --git a/core/repository/http/src/main/java/org/eclipse/rdf4j/repository/http/config/HTTPRepositoryConfig.java b/core/repository/http/src/main/java/org/eclipse/rdf4j/repository/http/config/HTTPRepositoryConfig.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.repository.http.config;
 
+import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.NAMESPACE;
 import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.PASSWORD;
 import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.REPOSITORYURL;
 import static org.eclipse.rdf4j.repository.http.config.HTTPRepositorySchema.USERNAME;
@@ -78,6 +79,7 @@ public Resource export(Model graph) {
 		Resource implNode = super.export(graph);
 
 		if (url != null) {
+			graph.setNamespace("http", NAMESPACE);
 			graph.add(implNode, REPOSITORYURL, SimpleValueFactory.getInstance().createIRI(url));
 		}
 		// if (username != null) {
diff --git a/core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/ProxyRepositoryConfig.java b/core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/ProxyRepositoryConfig.java
@@ -50,6 +50,7 @@ public void validate()
 	public Resource export(Model model) {
 		Resource implNode = super.export(model);
 		if (null != this.proxiedID) {
+			model.setNamespace("proxy", ProxyRepositorySchema.NAMESPACE);
 			model.add(implNode, ProxyRepositorySchema.PROXIED_ID,
 					SimpleValueFactory.getInstance().createLiteral(this.proxiedID));
 		}
diff --git a/core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/SailRepositoryConfig.java b/core/repository/sail/src/main/java/org/eclipse/rdf4j/repository/sail/config/SailRepositoryConfig.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.repository.sail.config;
 
+import static org.eclipse.rdf4j.repository.sail.config.SailRepositorySchema.NAMESPACE;
 import static org.eclipse.rdf4j.repository.sail.config.SailRepositorySchema.SAILIMPL;
 import static org.eclipse.rdf4j.sail.config.SailConfigSchema.SAILTYPE;
 
@@ -69,6 +70,7 @@ public Resource export(Model model) {
 		Resource repImplNode = super.export(model);
 
 		if (sailImplConfig != null) {
+			model.setNamespace("sr", NAMESPACE);
 			Resource sailImplNode = sailImplConfig.export(model);
 			model.add(repImplNode, SAILIMPL, sailImplNode);
 		}
diff --git a/core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/config/SPARQLRepositoryConfig.java b/core/repository/sparql/src/main/java/org/eclipse/rdf4j/repository/sparql/config/SPARQLRepositoryConfig.java
@@ -26,6 +26,8 @@ public class SPARQLRepositoryConfig extends AbstractRepositoryImplConfig {
 
 	private static final ValueFactory vf = SimpleValueFactory.getInstance();
 
+	public static final String NAMESPACE = "http://www.openrdf.org/config/repository/sparql#";
+
 	public static final IRI QUERY_ENDPOINT = vf.createIRI(
 			"http://www.openrdf.org/config/repository/sparql#query-endpoint");
 
@@ -80,6 +82,7 @@ public void validate()
 	public Resource export(Model m) {
 		Resource implNode = super.export(m);
 
+		m.setNamespace("sparql", NAMESPACE);
 		if (getQueryEndpointUrl() != null) {
 			m.add(implNode, QUERY_ENDPOINT, vf.createIRI(getQueryEndpointUrl()));
 		}
diff --git a/core/sail/api/src/main/java/org/eclipse/rdf4j/sail/config/AbstractSailImplConfig.java b/core/sail/api/src/main/java/org/eclipse/rdf4j/sail/config/AbstractSailImplConfig.java
@@ -63,6 +63,7 @@ public Resource export(Model m) {
 		ValueFactory vf = SimpleValueFactory.getInstance();
 		BNode implNode = vf.createBNode();
 
+		m.setNamespace("sail", SailConfigSchema.NAMESPACE);
 		if (type != null) {
 			m.add(implNode, SAILTYPE, vf.createLiteral(type));
 		}
diff --git a/core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/config/BaseSailConfig.java b/core/sail/base/src/main/java/org/eclipse/rdf4j/sail/base/config/BaseSailConfig.java
@@ -55,6 +55,7 @@ public Resource export(Model graph) {
 		Resource implNode = super.export(graph);
 
 		if (evalStratFactoryClassName != null) {
+			graph.setNamespace("sb", NAMESPACE);
 			graph.add(implNode, EVALUATION_STRATEGY_FACTORY,
 					SimpleValueFactory.getInstance().createLiteral(evalStratFactoryClassName));
 		}
diff --git a/core/sail/federation/src/main/java/org/eclipse/rdf4j/sail/federation/config/FederationConfig.java b/core/sail/federation/src/main/java/org/eclipse/rdf4j/sail/federation/config/FederationConfig.java
@@ -109,6 +109,7 @@ public void setReadOnly(boolean readOnly) {
 	public Resource export(Model model) {
 		ValueFactory valueFactory = SimpleValueFactory.getInstance();
 		Resource self = super.export(model);
+		model.setNamespace("sf", NAMESPACE);
 		for (RepositoryImplConfig member : getMembers()) {
 			model.add(self, MEMBER, member.export(model));
 		}
diff --git a/core/sail/fts/lucene-api/src/main/java/org/eclipse/rdf4j/sail/lucene/config/AbstractLuceneSailConfig.java b/core/sail/fts/lucene-api/src/main/java/org/eclipse/rdf4j/sail/lucene/config/AbstractLuceneSailConfig.java
@@ -83,6 +83,7 @@ public Resource export(Model m) {
 		Resource implNode = super.export(m);
 
 		ValueFactory vf = SimpleValueFactory.getInstance();
+		m.setNamespace("sl", LuceneSailConfigSchema.NAMESPACE);
 		if (indexDir != null) {
 			m.add(implNode, INDEX_DIR, SimpleValueFactory.getInstance().createLiteral(indexDir));
 		}
diff --git a/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/config/CustomGraphQueryInferencerConfig.java b/core/sail/inferencer/src/main/java/org/eclipse/rdf4j/sail/inferencer/fc/config/CustomGraphQueryInferencerConfig.java
@@ -162,6 +162,7 @@ public void validate()
 	@Override
 	public Resource export(Model m) {
 		Resource implNode = super.export(m);
+		m.setNamespace("cgqi", CustomGraphQueryInferencerSchema.NAMESPACE);
 		if (null != language) {
 			m.add(implNode, QUERY_LANGUAGE,
 					SimpleValueFactory.getInstance().createLiteral(language.getName()));
diff --git a/core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/config/MemoryStoreConfig.java b/core/sail/memory/src/main/java/org/eclipse/rdf4j/sail/memory/config/MemoryStoreConfig.java
@@ -7,6 +7,7 @@
  *******************************************************************************/
 package org.eclipse.rdf4j.sail.memory.config;
 
+import static org.eclipse.rdf4j.sail.memory.config.MemoryStoreSchema.NAMESPACE;
 import static org.eclipse.rdf4j.sail.memory.config.MemoryStoreSchema.PERSIST;
 import static org.eclipse.rdf4j.sail.memory.config.MemoryStoreSchema.SYNC_DELAY;
 
@@ -62,6 +63,7 @@ public void setSyncDelay(long syncDelay) {
 	public Resource export(Model graph) {
 		Resource implNode = super.export(graph);
 
+		graph.setNamespace("ms", NAMESPACE);
 		if (persist) {
 			graph.add(implNode, PERSIST, BooleanLiteral.TRUE);
 		}
diff --git a/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/config/NativeStoreConfig.java b/core/sail/nativerdf/src/main/java/org/eclipse/rdf4j/sail/nativerdf/config/NativeStoreConfig.java
@@ -8,6 +8,7 @@
 package org.eclipse.rdf4j.sail.nativerdf.config;
 
 import static org.eclipse.rdf4j.sail.nativerdf.config.NativeStoreSchema.FORCE_SYNC;
+import static org.eclipse.rdf4j.sail.nativerdf.config.NativeStoreSchema.NAMESPACE;
 import static org.eclipse.rdf4j.sail.nativerdf.config.NativeStoreSchema.NAMESPACE_CACHE_SIZE;
 import static org.eclipse.rdf4j.sail.nativerdf.config.NativeStoreSchema.NAMESPACE_ID_CACHE_SIZE;
 import static org.eclipse.rdf4j.sail.nativerdf.config.NativeStoreSchema.TRIPLE_INDEXES;
@@ -119,6 +120,7 @@ public Resource export(Model m) {
 		Resource implNode = super.export(m);
 		ValueFactory vf = SimpleValueFactory.getInstance();
 
+		m.setNamespace("ns", NAMESPACE);
 		if (tripleIndexes != null) {
 			m.add(implNode, TRIPLE_INDEXES, vf.createLiteral(tripleIndexes));
 		}

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ public void validate()`
`50`	`50`	`public Resource export(Model model) {`
`51`	`51`	`Resource implNode = super.export(model);`
`52`	`52`	`if (null != this.proxiedID) {`
	`53`	`+ model.setNamespace("proxy", ProxyRepositorySchema.NAMESPACE);`
`53`	`54`	`model.add(implNode, ProxyRepositorySchema.PROXIED_ID,`
`54`	`55`	`SimpleValueFactory.getInstance().createLiteral(this.proxiedID));`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public Resource export(Model m) {`
`63`	`63`	`ValueFactory vf = SimpleValueFactory.getInstance();`
`64`	`64`	`BNode implNode = vf.createBNode();`
`65`	`65`
	`66`	`+ m.setNamespace("sail", SailConfigSchema.NAMESPACE);`
`66`	`67`	`if (type != null) {`
`67`	`68`	`m.add(implNode, SAILTYPE, vf.createLiteral(type));`
`68`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ public Resource export(Model graph) {`
`55`	`55`	`Resource implNode = super.export(graph);`
`56`	`56`
`57`	`57`	`if (evalStratFactoryClassName != null) {`
	`58`	`+ graph.setNamespace("sb", NAMESPACE);`
`58`	`59`	`graph.add(implNode, EVALUATION_STRATEGY_FACTORY,`
`59`	`60`	`SimpleValueFactory.getInstance().createLiteral(evalStratFactoryClassName));`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ public void setReadOnly(boolean readOnly) {`
`109`	`109`	`public Resource export(Model model) {`
`110`	`110`	`ValueFactory valueFactory = SimpleValueFactory.getInstance();`
`111`	`111`	`Resource self = super.export(model);`
	`112`	`+ model.setNamespace("sf", NAMESPACE);`
`112`	`113`	`for (RepositoryImplConfig member : getMembers()) {`
`113`	`114`	`model.add(self, MEMBER, member.export(model));`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,7 @@ public Resource export(Model m) {`
`83`	`83`	`Resource implNode = super.export(m);`
`84`	`84`
`85`	`85`	`ValueFactory vf = SimpleValueFactory.getInstance();`
	`86`	`+ m.setNamespace("sl", LuceneSailConfigSchema.NAMESPACE);`
`86`	`87`	`if (indexDir != null) {`
`87`	`88`	`m.add(implNode, INDEX_DIR, SimpleValueFactory.getInstance().createLiteral(indexDir));`
`88`	`89`	`}`