You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/10/02 12:10:24 UTC
[2/5] jena git commit: JENA-1039: Ensure dependent OWL constants
initialized before proceeding
JENA-1039: Ensure dependent OWL constants initialized before proceeding
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/873993cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/873993cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/873993cf
Branch: refs/heads/master
Commit: 873993cfb74b0a6728d8bb29532a0583e0912fb9
Parents: 390c371
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Oct 2 09:20:48 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Oct 2 09:20:48 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java | 3 +++
.../src/main/java/org/apache/jena/sparql/expr/NodeValue.java | 3 +++
.../src/main/java/org/apache/jena/sparql/graph/NodeConst.java | 5 ++++-
3 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/873993cf/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
index ffa319e..4a46d21 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/ARQConstants.java
@@ -22,6 +22,7 @@ import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.shared.impl.PrefixMappingImpl ;
import org.apache.jena.sparql.util.Symbol ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.OWL ;
import org.apache.jena.vocabulary.RDF ;
import org.apache.jena.vocabulary.RDFS ;
@@ -31,6 +32,8 @@ import org.apache.jena.vocabulary.RDFS ;
*/
public class ARQConstants
{
+ static { JenaSystem.init() ; }
+
/** The prefix of XQuery/Xpath functions and operator */
public static final String fnPrefix = "http://www.w3.org/2005/xpath-functions#" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/873993cf/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
index 68ce1ff..b83e3ba 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/NodeValue.java
@@ -57,12 +57,15 @@ import org.apache.jena.sparql.graph.NodeConst ;
import org.apache.jena.sparql.graph.NodeTransform ;
import org.apache.jena.sparql.serializer.SerializationContext ;
import org.apache.jena.sparql.util.* ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.RDF ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
public abstract class NodeValue extends ExprNode
{
+ static { JenaSystem.init() ; }
+
// Maybe:: NodeValueStringLang - strings with language tag
/* Naming:
http://git-wip-us.apache.org/repos/asf/jena/blob/873993cf/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
index 28915c5..0638ed4 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/NodeConst.java
@@ -22,12 +22,14 @@ import org.apache.jena.datatypes.RDFDatatype ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.system.JenaSystem ;
import org.apache.jena.vocabulary.OWL ;
import org.apache.jena.vocabulary.RDF ;
/** Some node constants */
public class NodeConst
{
+ static { JenaSystem.init(); }
public static final Node nodeTrue = NodeFactory.createLiteral("true", XSDDatatype.XSDboolean) ;
public static final Node nodeFalse = NodeFactory.createLiteral("false",XSDDatatype.XSDboolean) ;
public static final Node nodeZero = NodeFactory.createLiteral("0", XSDDatatype.XSDinteger) ;
@@ -42,7 +44,8 @@ public class NodeConst
public static final Node nodeNil = RDF.Nodes.nil ;
public static final Node nodeANY = Node.ANY ;
- public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ;
+ // Avoid OWL.sameAs.asNode() ;
+ public static final Node nodeOwlSameAs = OWL.sameAs.asNode() ; // NodeFactory.createURI("http://www.w3.org/2002/07/owl#sameAs") ;
public static final Node rdfLangString = RDF.Nodes.langString ;
public static final RDFDatatype dtLangString = RDF.dtLangString ;
}