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/05/03 20:25:31 UTC
svn commit: r1478901 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/mgt/
main/java/com/hp/hpl/jena/sparql/sse/lang/
main/java/com/hp/hpl/jena/sparql/util/ test/java/arq/ test/java/riotcmd/
Author: andy
Date: Fri May 3 18:25:31 2013
New Revision: 1478901
URL: http://svn.apache.org/r1478901
Log:
Change internal uses of old n3.IRIResolver to new RIOT IRIResolver.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
jena/trunk/jena-arq/src/test/java/arq/qtest.java
jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java?rev=1478901&r1=1478900&r2=1478901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/mgt/SystemInfo.java Fri May 3 18:25:31 2013
@@ -18,10 +18,10 @@
package com.hp.hpl.jena.sparql.mgt;
+import org.apache.jena.riot.system.IRIResolver ;
+
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.n3.IRIResolver ;
-
public class SystemInfo implements SystemInfoMBean
{
@@ -41,7 +41,7 @@ public class SystemInfo implements Syste
private static Node createIRI(String iriStr)
{
try {
- return NodeFactory.createURI(IRIResolver.resolveGlobal(iriStr)) ;
+ return NodeFactory.createURI(IRIResolver.resolveString(iriStr)) ;
} catch (RuntimeException ex) { return null ; }
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java?rev=1478901&r1=1478900&r2=1478901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerResolver.java Fri May 3 18:25:31 2013
@@ -30,7 +30,6 @@ import com.hp.hpl.jena.sparql.sse.Item ;
import com.hp.hpl.jena.sparql.sse.ItemList ;
import com.hp.hpl.jena.sparql.sse.builders.BuilderPrefixMapping ;
-
/** Resolve syntacic forms like (base ...) and (prefix...)
* where the syntax modifies the enclosed sub term.
*
@@ -58,7 +57,6 @@ public class ParseHandlerResolver extend
{
prologue = p ;
}
-
@Override
protected void declItem(ItemList list, Item item)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java?rev=1478901&r1=1478900&r2=1478901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java Fri May 3 18:25:31 2013
@@ -22,9 +22,10 @@ import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
+import org.apache.jena.riot.system.IRIResolver ;
+
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -102,9 +103,9 @@ public class DatasetUtils
String sourceURI = iter.next() ;
String absURI = null ;
if ( baseURI != null )
- absURI = IRIResolver.resolve(sourceURI, baseURI) ;
+ absURI = IRIResolver.resolveString(sourceURI, baseURI) ;
else
- absURI = IRIResolver.resolveGlobal(sourceURI) ;
+ absURI = IRIResolver.resolveString(sourceURI) ;
fileManager.readModel(ds.getDefaultModel(), sourceURI, absURI, null) ;
}
}
@@ -116,9 +117,9 @@ public class DatasetUtils
String sourceURI = iter.next() ;
String absURI = null ;
if ( baseURI != null )
- absURI = IRIResolver.resolve(sourceURI, baseURI) ;
+ absURI = IRIResolver.resolveString(sourceURI, baseURI) ;
else
- absURI = IRIResolver.resolveGlobal(sourceURI) ;
+ absURI = IRIResolver.resolveString(sourceURI) ;
Model m = GraphFactory.makeDefaultModel() ;
fileManager.readModel(m, sourceURI, absURI, null) ;
ds.addNamedModel(absURI, m) ;
@@ -167,9 +168,9 @@ public class DatasetUtils
String sourceURI = iter.next() ;
String absURI = null ;
if ( baseURI != null )
- absURI = IRIResolver.resolve(sourceURI, baseURI) ;
+ absURI = IRIResolver.resolveString(sourceURI, baseURI) ;
else
- absURI = IRIResolver.resolveGlobal(sourceURI) ;
+ absURI = IRIResolver.resolveString(sourceURI) ;
// FileManager.readGraph?
fileManager.readModel(m, sourceURI, absURI, null) ;
}
@@ -187,9 +188,9 @@ public class DatasetUtils
String sourceURI = iter.next();
String absURI = null ;
if ( baseURI != null )
- absURI = IRIResolver.resolve(baseURI, sourceURI) ;
+ absURI = IRIResolver.resolveString(baseURI, sourceURI) ;
else
- absURI = IRIResolver.resolveGlobal(sourceURI) ;
+ absURI = IRIResolver.resolveString(sourceURI) ;
Model m = fileManager.loadModel(sourceURI, absURI, null) ;
Node gn = NodeFactory.createURI(sourceURI) ;
ds.addGraph(gn, m.getGraph()) ;
Modified: jena/trunk/jena-arq/src/test/java/arq/qtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/arq/qtest.java?rev=1478901&r1=1478900&r2=1478901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/arq/qtest.java (original)
+++ jena/trunk/jena-arq/src/test/java/arq/qtest.java Fri May 3 18:25:31 2013
@@ -28,7 +28,6 @@ import arq.cmdline.CmdARQ ;
import arq.cmdline.ModEngine ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.rdf.model.Literal ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -75,7 +74,7 @@ public class qtest extends CmdARQ
protected TestSuite suite = null;
protected boolean execAllTests = false;
protected boolean execDAWGTests = false;
- protected String testfileAbs = null;
+ protected String testfile = null;
protected boolean createEarlReport = false;
public static void main (String... argv)
@@ -150,9 +149,7 @@ public class qtest extends CmdARQ
if ( ! hasPositional() )
throw new CmdException("No manifest file") ;
- String testfile = getPositionalArg(0) ;
- testfileAbs = IRIResolver.resolveGlobal(testfile) ;
-
+ testfile = getPositionalArg(0) ;
createEarlReport = contains(earlDecl) ;
}
}
@@ -177,9 +174,9 @@ public class qtest extends CmdARQ
E_Function.WarnOnUnknownFunction = false ;
if ( createEarlReport )
- oneManifestEarl(testfileAbs) ;
+ oneManifestEarl(testfile) ;
else
- oneManifest(testfileAbs) ;
+ oneManifest(testfile) ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java?rev=1478901&r1=1478900&r2=1478901&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java (original)
+++ jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java Fri May 3 18:25:31 2013
@@ -31,7 +31,6 @@ import arq.cmdline.ModEngine ;
import arq.cmdline.ModSymbol ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.rdf.model.Literal ;
import com.hp.hpl.jena.rdf.model.Model ;
@@ -49,7 +48,6 @@ import com.hp.hpl.jena.vocabulary.DCTerm
import com.hp.hpl.jena.vocabulary.RDF ;
import com.hp.hpl.jena.vocabulary.XSD ;
-
/** A program to execute RDF language test suites
*
* <pre>
@@ -127,10 +125,7 @@ public class rdflangtest extends CmdGene
E_Function.WarnOnUnknownFunction = false ;
for ( String fn : getPositional() )
- {
- String testfile = IRIResolver.resolveGlobal(fn) ;
- exec1(testfile) ;
- }
+ exec1(fn) ;
}
protected void exec1(String manifest)