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 2011/05/19 12:12:24 UTC
svn commit: r1124658 - in /incubator/jena/Jena2/ARQ/trunk:
src-dev/dev/RunARQ.java src/com/hp/hpl/jena/query/QueryExecutionFactory.java
src/com/hp/hpl/jena/sparql/core/DataSourceGraph.java
src/com/hp/hpl/jena/sparql/core/DataSourceGraphImpl.java
Author: andy
Date: Thu May 19 10:12:23 2011
New Revision: 1124658
URL: http://svn.apache.org/viewvc?rev=1124658&view=rev
Log:
Final alignment of ARQ codebase and old SourceForge code base.
Removed:
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DataSourceGraph.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/core/DataSourceGraphImpl.java
Modified:
incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/QueryExecutionFactory.java
Modified: incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java?rev=1124658&r1=1124657&r2=1124658&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java Thu May 19 10:12:23 2011
@@ -35,6 +35,8 @@ import com.hp.hpl.jena.iri.IRI ;
import com.hp.hpl.jena.iri.IRIFactory ;
import com.hp.hpl.jena.iri.Violation ;
import com.hp.hpl.jena.query.ARQ ;
+import com.hp.hpl.jena.query.DataSource ;
+import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryCancelledException ;
import com.hp.hpl.jena.query.QueryExecution ;
@@ -44,6 +46,7 @@ import com.hp.hpl.jena.query.QuerySoluti
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.ARQConstants ;
import com.hp.hpl.jena.sparql.ARQException ;
@@ -106,6 +109,23 @@ public class RunARQ
public static void main(String[] argv) throws Exception
{
+ if ( true )
+ {
+ Query query = QueryFactory.create("PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> SELECT ?a0 ?a1 WHERE { ?a0 rdf:type ?a1 }") ;
+ DataSource source = DatasetFactory.create();
+ Model model = ModelFactory.createDefaultModel();
+ source.addNamedModel("?a1", model);
+ source.setDefaultModel(model);
+ QueryExecution queryExecution = QueryExecutionFactory.create(query, source);
+ ResultSetFormatter.out(queryExecution.execSelect()) ;
+ return ;
+ }
+
+
+
+
+
+ // -----
Query query = QueryFactory.read("Q.rq") ;
Model m = FileManager.get().loadModel("D.ttl") ;
//ARQ.setExecutionLogging(InfoLevel.ALL) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/QueryExecutionFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/QueryExecutionFactory.java?rev=1124658&r1=1124657&r2=1124658&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/QueryExecutionFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/QueryExecutionFactory.java Thu May 19 10:12:23 2011
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.util.FileManager
public class QueryExecutionFactory
{
- private QueryExecutionFactory() {}
+ protected QueryExecutionFactory() {}
// ---------------- Query
@@ -514,16 +514,16 @@ public class QueryExecutionFactory
// ---- Make executions
- static private QueryExecution make(Query query)
+ static protected QueryExecution make(Query query)
{
return make(query, null) ;
}
- static private QueryExecution make(Query query, Dataset dataset)
+ protected static QueryExecution make(Query query, Dataset dataset)
{ return make(query, dataset, null) ; }
- static private QueryExecution make(Query query, Dataset dataset, Context context)
+ protected static QueryExecution make(Query query, Dataset dataset, Context context)
{
query.setResultVars() ;
if ( context == null )