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 2013/03/17 18:56:32 UTC
svn commit: r1457503 - in /jena/Scratch/AFS: Dev/trunk/
Dev/trunk/src/main/java/projects/prefixes/test/
Dev/trunk/src/main/java/projects/riot_sse/
Dev/trunk/src/main/java/projects/viewgraph/ Dev/trunk/src/main/java/search/
Jena-Dev/trunk/src/dev/ Jena-...
Author: andy
Date: Sun Mar 17 17:56:32 2013
New Revision: 1457503
URL: http://svn.apache.org/r1457503
Log:
Updates to reflect NodeFactory.
Removed:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GLib.java
Modified:
jena/Scratch/AFS/Dev/trunk/.classpath
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROJECT_ViewGraphs.java
jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java
jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunBase.java
jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena149_Duration.java
jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena222_TDBTransUnicode.java
jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena233_ReificationDelete.java
jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAssignSubstitute.java
Modified: jena/Scratch/AFS/Dev/trunk/.classpath
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/.classpath?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/.classpath (original)
+++ jena/Scratch/AFS/Dev/trunk/.classpath Sun Mar 17 17:56:32 2013
@@ -11,7 +11,7 @@
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.6-SNAPSHOT/jena-iri-0.9.6-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.6-SNAPSHOT/jena-iri-0.9.6-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.8.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/AbstractTestDatasetPrefixes.java Sun Mar 17 17:56:32 2013
@@ -28,6 +28,7 @@ import org.junit.Test ;
import projects.prefixes.DatasetPrefixes ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
public abstract class AbstractTestDatasetPrefixes extends BaseTest
{
@@ -36,8 +37,8 @@ public abstract class AbstractTestDatase
/** Create a fresh view over the same storage as last create() */
protected abstract DatasetPrefixes view() ;
- protected Node g1 = Node.createURI("http://example.org/g1") ;
- protected Node g2 = Node.createURI("http://example.org/g2") ;
+ protected Node g1 = NodeFactory.createURI("http://example.org/g1") ;
+ protected Node g2 = NodeFactory.createURI("http://example.org/g2") ;
protected String pref1 = "pref1" ;
protected String pref1a = "pref1:" ;
protected String pref2 = "pref2" ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/prefixes/test/TestPrefixMappingOverDatasetPrefixes2.java Sun Mar 17 17:56:32 2013
@@ -21,12 +21,13 @@ package projects.prefixes.test;
import projects.prefixes.* ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.graph.AbstractTestPrefixMapping2 ;
public class TestPrefixMappingOverDatasetPrefixes2 extends AbstractTestPrefixMapping2
{
- static Node gn = Node.createURI("http://test/graphName") ;
+ static Node gn = NodeFactory.createURI("http://test/graphName") ;
DatasetPrefixes dsgprefixes ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Basic.java Sun Mar 17 17:56:32 2013
@@ -31,18 +31,18 @@ import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemException ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class TestSSE_Basic extends BaseTest
{
// Tests not requiring URI resolution or prefix name handling.
- static Node int1 = Node.createLiteral("1", null, XSDDatatype.XSDinteger) ;
- static Node int2 = Node.createLiteral("2", null, XSDDatatype.XSDinteger) ;
- static Node int3 = Node.createLiteral("3", null, XSDDatatype.XSDinteger) ;
- static Node strLangEN = Node.createLiteral("xyz", "en", null) ;
+ static Node int1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("1", null, XSDDatatype.XSDinteger) ;
+ static Node int2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("2", null, XSDDatatype.XSDinteger) ;
+ static Node int3 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("3", null, XSDDatatype.XSDinteger) ;
+ static Node strLangEN = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
- static Node typeLit1 = NodeFactory.createLiteralNode("123", null, "http://example/type") ;
+ static Node typeLit1 = NodeFactoryExtra.createLiteralNode("123", null, "http://example/type") ;
static Item int1i = Item.createNode(int1) ;
static Item int2i = Item.createNode(int2) ;
@@ -91,11 +91,11 @@ public class TestSSE_Basic extends BaseT
@Test(expected=RiotException.class) public void testLit_09() { parse("'''") ; }
@Test(expected=RiotException.class) public void testLit_10() { parse("''@") ; }
- @Test public void testLit_11() { testNode("'''abc\\ndef'''", Node.createLiteral("abc\ndef")) ; }
+ @Test public void testLit_11() { testNode("'''abc\\ndef'''", com.hp.hpl.jena.graph.NodeFactory.createLiteral("abc\ndef")) ; }
@Test public void testLit_12()
{
- Node n = Node.createLiteral("A\tB") ;
+ Node n = com.hp.hpl.jena.graph.NodeFactory.createLiteral("A\tB") ;
testNode("'''A\\tB'''", n) ;
}
@@ -115,7 +115,7 @@ public class TestSSE_Basic extends BaseT
@Test public void testURI_3() { parseNode("<http://example/ space>") ; }
// Four \ is two \ in the lexical URI string (java escape) is one in the URI (SSE esscape).
- @Test public void testURI_4() { testNode("<http://example/base\\\\name>", Node.createURI("http://example/base\\name")) ; }
+ @Test public void testURI_4() { testNode("<http://example/base\\\\name>", com.hp.hpl.jena.graph.NodeFactory.createURI("http://example/base\\name")) ; }
@Test public void testVar_01() { testVar("?x") ; }
@Test public void testVar_02() { testVar("?") ; }
@@ -152,7 +152,7 @@ public class TestSSE_Basic extends BaseT
// ---- Nodes
@Test public void testNode_1() { testNode("3", int3) ; }
- @Test public void testNode_2() { testNode("<http://example/node1>", Node.createURI("http://example/node1")) ; }
+ @Test public void testNode_2() { testNode("<http://example/node1>", com.hp.hpl.jena.graph.NodeFactory.createURI("http://example/node1")) ; }
@Test public void testTypedLit_1() { testNode("\"123\"^^<http://example/type>", typeLit1) ; }
@Test public void testTypedLit_2() { testNode("'123'^^<http://example/type>", typeLit1) ; }
@Test public void testTypedLit_3() { testNode("'3'^^<"+XSDDatatype.XSDinteger.getURI()+">", int3) ; }
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/riot_sse/TestSSE_Forms.java Sun Mar 17 17:56:32 2013
@@ -23,6 +23,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.shared.impl.PrefixMappingImpl ;
import com.hp.hpl.jena.sparql.sse.Item ;
@@ -40,13 +41,13 @@ public class TestSSE_Forms extends BaseT
@Test public void testBase_01()
{
- Item r = Item.createNode(Node.createURI("http://example/x")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://example/x")) ;
testItem("(base <http://example/> <x>)", r) ;
}
@Test public void testBase_02()
{
- Item r = Item.createNode(Node.createURI("http://example/x")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://example/x")) ;
testItem("(base <http://HOST/> (base <http://example/xyz> <x>))", r) ;
}
@@ -84,13 +85,13 @@ public class TestSSE_Forms extends BaseT
@Test public void testPrefix_01()
{
- Item r = Item.createNode(Node.createURI("http://example/abc")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://example/abc")) ;
testItem("(prefix ((ex: <http://example/>)) ex:abc)", r);
}
@Test public void testPrefix_02()
{
- Item r = Item.createNode(Node.createURI("http://EXAMPLE/abc")) ;
+ Item r = Item.createNode(NodeFactory.createURI("http://EXAMPLE/abc")) ;
testItem("(prefix ((ex: <http://example/>)) (prefix ((ex: <http://EXAMPLE/>)) ex:abc))", r);
}
@@ -133,7 +134,7 @@ public class TestSSE_Forms extends BaseT
@Test public void testTypedLit_r1()
{
- Node node = Node.createLiteral("3", null, XSDDatatype.XSDinteger) ;
+ Node node = NodeFactory.createLiteral("3", null, XSDDatatype.XSDinteger) ;
testItem("'3'^^xsd:integer", Item.createNode(node)) ;
}
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/GraphViewDataset.java Sun Mar 17 17:56:32 2013
@@ -21,6 +21,7 @@ package projects.viewgraph;
import java.util.Iterator ;
import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.riot.other.GLib ;
import projects.prefixes.DatasetPrefixes ;
import projects.prefixes.PrefixMapI ;
import projects.prefixes.PrefixMapStorage ;
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROJECT_ViewGraphs.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROJECT_ViewGraphs.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROJECT_ViewGraphs.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/viewgraph/PROJECT_ViewGraphs.java Sun Mar 17 17:56:32 2013
@@ -26,52 +26,6 @@ public class PROJECT_ViewGraphs
// Dynamic datasets
//Algebra.asUnionQuery
- /* TDB:
- http://jena.apache.org/documentation/tdb/dynamic_datasets.html
- FROM NAMED <urn:x-arq:DefaultGraph>
- which default dataset?
- {
- GRAPH ?g { ?s ?p ?o }
- }
- =>
- nothing.
-
- Infinite recurse.
-
- SELECT *
- FROM NAMED <urn:x-arq:UnionGraph>
- {
- GRAPH ?g { ?s ?p ?o }
- }
- --------------------------------------
-
- SELECT *
- FROM :g1
- FROM :g2
- FROM NAMED <urn:x-arq:DefaultGraphNode>
- {
- { ?s ?p ?o }
- UNION
- { GRAPH ?g { ?s ?p ?o } }
- }
- ??
- */
-
- /*
- * Tests:
- * prefix tests
- *
- * Migrate to TDB first, use GraphOps.
- * Compare GraphOps.getNamedgraph as the dft1/dt2/union code.
- *
- * Find union graph tests - to AbstractTestGraphOverDataset
- * ARQ-tests-com.hp.hpl.jena.sparql.algebra.uniongraph :: Dev_TS_UnionGraph
- * DatasetGraph hierarchy: (add "getUnionGraph())"
- * c.f. [[DynDS]]
- *
- * See also: comment in GraphNamedTDB
- */
-
// Prefix mappings for the union graph.
// TODO Integrate with DatasetGraphTriplesQuads / DatasetGraphQuads
@@ -80,7 +34,7 @@ public class PROJECT_ViewGraphs
// DatasetGraphQuad
// Tidy up in Path Engine
- // TODO DatasetPrefixStorage projection for prfix mapping.
+ // TODO DatasetPrefixStorage projection for prefix mapping.
// TODO Use GraphPrefixesProjection (not PrefixMappingOverPrefixMap).
/* Migration cleanup
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/search/BaseSearchPF.java Sun Mar 17 17:56:32 2013
@@ -24,6 +24,7 @@ import org.apache.jena.atlas.iterator.It
import org.apache.jena.atlas.iterator.Transform ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.QueryExecException ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.engine.ExecutionContext ;
@@ -67,7 +68,7 @@ public abstract class BaseSearchPF exten
@Override
public Binding convert(String item)
{
- return BindingFactory.binding(binding, var, Node.createURI(item)) ;
+ return BindingFactory.binding(binding, var, NodeFactory.createURI(item)) ;
}} ;
QueryIterator qIter = new QueryIterPlainWrapper(iter.map(converter)) ;
return qIter ;
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunBase.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunBase.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunBase.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunBase.java Sun Mar 17 17:56:32 2013
@@ -167,7 +167,7 @@ public class RunBase
Expr expr = ExprUtils.parse(exprStr, pmap) ;
// Default action
- ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactory.nowAsDateTime()) ;
+ ARQ.getContext().set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
FunctionEnv env = new ExecutionContext(ARQ.getContext(), null, null, null) ;
NodeValue r = expr.eval(null, env) ;
//System.out.println(r.asQuotedString()) ;
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena149_Duration.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena149_Duration.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena149_Duration.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena149_Duration.java Sun Mar 17 17:56:32 2013
@@ -21,6 +21,7 @@ package reports.archive;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDuration ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
public class Jena149_Duration
{
@@ -31,8 +32,8 @@ public class Jena149_Duration
}
public static void testXSDDurationBug() {
- Node d1 = Node.createLiteral("PT110S", null, XSDDatatype.XSDduration);
- Node d2 = Node.createLiteral("PT1M50S", null, XSDDatatype.XSDduration);
+ Node d1 = NodeFactory.createLiteral("PT110S", null, XSDDatatype.XSDduration);
+ Node d2 = NodeFactory.createLiteral("PT1M50S", null, XSDDatatype.XSDduration);
System.out.println(d1.getLiteral().isWellFormed());
System.out.println(d2.getLiteral().isWellFormed());
XSDDuration dur1 = (XSDDuration) d1.getLiteralValue();
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena222_TDBTransUnicode.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena222_TDBTransUnicode.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena222_TDBTransUnicode.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena222_TDBTransUnicode.java Sun Mar 17 17:56:32 2013
@@ -26,6 +26,7 @@ import org.apache.jena.atlas.lib.Bytes ;
import org.apache.jena.atlas.lib.InternalErrorException ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
@@ -52,9 +53,9 @@ public class Jena222_TDBTransUnicode {
public static void badUnicode()
{
DatasetGraph dsg = StoreConnection.make("DB").getBaseDataset() ;
- Node s = Node.createURI("http://example/s") ;
- Node p = Node.createURI("http://example/p") ;
- Node o = Node.createLiteral("a\uDAE0XYZ") ;
+ Node s = NodeFactory.createURI("http://example/s") ;
+ Node p = NodeFactory.createURI("http://example/p") ;
+ Node o = NodeFactory.createLiteral("a\uDAE0XYZ") ;
dsg.add(Quad.defaultGraphIRI, s, p, o) ;
dsg.close() ;
StoreConnection.reset() ;
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena233_ReificationDelete.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena233_ReificationDelete.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena233_ReificationDelete.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/Jena233_ReificationDelete.java Sun Mar 17 17:56:32 2013
@@ -22,6 +22,7 @@ import org.apache.jena.atlas.iterator.It
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -41,7 +42,7 @@ public class Jena233_ReificationDelete
r.addProperty(RDF.object, "test1"); // or predicate or subject
r.addProperty(RDF.object, "test2"); // or predicate or subject
Graph g = m.getGraph() ;
- Node nr = Node.createURI("http://example.com/a") ;
+ Node nr = NodeFactory.createURI("http://example.com/a") ;
// m.removeAll(r, null, null);
Modified: jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAssignSubstitute.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAssignSubstitute.java?rev=1457503&r1=1457502&r2=1457503&view=diff
==============================================================================
--- jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAssignSubstitute.java (original)
+++ jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAssignSubstitute.java Sun Mar 17 17:56:32 2013
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.sparql.algebra.Op
import com.hp.hpl.jena.sparql.algebra.optimize.Optimize ;
import com.hp.hpl.jena.sparql.core.Substitute ;
import com.hp.hpl.jena.sparql.core.Var ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
public class ReportAssignSubstitute
{
@@ -58,7 +58,7 @@ public class ReportAssignSubstitute
Query query = QueryFactory.create(qs, Syntax.syntaxARQ) ;
Op op1 = Algebra.compile(query) ;
- Op op1a = Substitute.substitute(op1, Var.alloc("label"), NodeFactory.parseNode("'aa'")) ;
+ Op op1a = Substitute.substitute(op1, Var.alloc("label"), NodeFactoryExtra.parseNode("'aa'")) ;
System.out.println(op1a) ;
System.exit(0) ;
@@ -67,7 +67,7 @@ public class ReportAssignSubstitute
Op op2 = Algebra.optimize(op1) ;
System.out.println(op2) ;
- Op op2a = Substitute.substitute(op2, Var.alloc("label"), NodeFactory.parseNode("'aa'")) ;
+ Op op2a = Substitute.substitute(op2, Var.alloc("label"), NodeFactoryExtra.parseNode("'aa'")) ;
System.out.println(op2a) ;
Optimize.noOptimizer() ;