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/09/05 22:43:42 UTC
svn commit: r1165413 - in /incubator/jena/Jena2/ARQ/trunk: Archive/
src-test/com/hp/hpl/jena/sparql/junit/ src/arq/ src/com/hp/hpl/jena/query/
src/com/hp/hpl/jena/sparql/syntax/
Author: andy
Date: Mon Sep 5 20:43:42 2011
New Revision: 1165413
URL: http://svn.apache.org/viewvc?rev=1165413&view=rev
Log:
Removal of RDQL.
Modified:
incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/QueryTest.java
incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
incubator/jena/Jena2/ARQ/trunk/src/arq/qparse.java
incubator/jena/Jena2/ARQ/trunk/src/arq/rdql.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/Syntax.java
incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/syntax/ElementGroup.java
Modified: incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Archive/rdql.zip?rev=1165413&r1=1165412&r2=1165413&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1165413&r1=1165412&r2=1165413&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/QueryTest.java Mon Sep 5 20:43:42 2011
@@ -27,7 +27,6 @@ import com.hp.hpl.jena.query.QueryExecut
import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.query.ResultSetFactory ;
import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.Property ;
@@ -56,7 +55,6 @@ public class QueryTest extends EarlTestC
private int testNumber = testCounter++ ;
private TestItem testItem ;
private FileManager queryFileManager ;
- private boolean isRDQLtest = false ;
private boolean resetNeeded = false ;
private SPARQLResult results = null ; // Maybe null if no testing of results
@@ -69,7 +67,6 @@ public class QueryTest extends EarlTestC
super(TestUtils.safeName(testName), t.getURI(), earl) ;
queryFileManager = fm ;
testItem = t ;
- isRDQLtest = (testItem.getFileSyntax().equals(Syntax.syntaxRDQL)) ;
}
private boolean oldWarningFlag ;
@@ -78,11 +75,8 @@ public class QueryTest extends EarlTestC
{
super.setUp() ;
// SPARQL and ARQ tests are done with no value matching (for query execution and results testing)
- if ( ! isRDQLtest )
- {
- resetNeeded = true ;
- ARQ.setTrue(ARQ.strictGraph) ;
- }
+ resetNeeded = true ;
+ ARQ.setTrue(ARQ.strictGraph) ;
// Turn parser warnings off for the test data.
oldWarningFlag = CheckerLiterals.WarnOnBadLiterals ;
CheckerLiterals.WarnOnBadLiterals = false ;
Modified: incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java?rev=1165413&r1=1165412&r2=1165413&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-test/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java Mon Sep 5 20:43:42 2011
@@ -61,8 +61,7 @@ public class ScriptTestSuiteFactory exte
if ( querySyntax != null )
{
- if ( ! querySyntax.equals(Syntax.syntaxRDQL) &&
- ! querySyntax.equals(Syntax.syntaxARQ) &&
+ if ( ! querySyntax.equals(Syntax.syntaxARQ) &&
! querySyntax.equals(Syntax.syntaxSPARQL_10) &&
! querySyntax.equals(Syntax.syntaxSPARQL_11) )
throw new QueryTestException("Unknown syntax: "+querySyntax) ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/arq/qparse.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/arq/qparse.java?rev=1165413&r1=1165412&r2=1165413&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/arq/qparse.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/arq/qparse.java Mon Sep 5 20:43:42 2011
@@ -192,7 +192,7 @@ public class qparse extends CmdARQ
// static String usage = qparse.class.getName()+
// " [--in syntax] [--out syntax] [\"query\" | --query <file>\n"+
-// " where syntax is one of ARQ, SPARQL, RDQL\n" +
+// " where syntax is one of ARQ, SPARQL\n" +
// "Other options: \n"+
// " --num on|off Line number ('on' by default)\n"+
// " -n Same as --num=off\n"+
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/Syntax.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/Syntax.java?rev=1165413&r1=1165412&r2=1165413&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/Syntax.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/query/Syntax.java Mon Sep 5 20:43:42 2011
@@ -35,9 +35,6 @@ public class Syntax extends Symbol
// = syntaxARQ ;
// //= new Syntax("http://jena.hpl.hp.com/2003/07/update/ARQ") ;
- public static final Syntax syntaxRDQL
- = new Syntax("http://jena.hpl.hp.com/2003/07/query/RDQL") ;
-
public static final Syntax syntaxAlgebra
= new Syntax("http://jena.hpl.hp.com/2003/07/query/SPARQL_Algebra") ;
@@ -68,7 +65,6 @@ public class Syntax extends Symbol
querySyntaxNames.put("sparql_10", syntaxSPARQL_10) ;
querySyntaxNames.put("sparql_11", syntaxSPARQL_11) ;
querySyntaxNames.put("arq", syntaxARQ) ;
- querySyntaxNames.put("rdql", syntaxRDQL) ;
querySyntaxNames.put("alg", syntaxAlgebra) ;
querySyntaxNames.put("op", syntaxAlgebra) ;
}
@@ -92,7 +88,6 @@ public class Syntax extends Symbol
if ( sym.equals(syntaxARQ) ) return syntaxARQ ;
- if ( sym.equals(syntaxRDQL) ) return syntaxRDQL ;
if ( sym.equals(syntaxSPARQL) ) return syntaxSPARQL ;
if ( sym.equals(syntaxSPARQL_10) ) return syntaxSPARQL_10 ;
if ( sym.equals(syntaxSPARQL_11) ) return syntaxSPARQL_11 ;
@@ -115,7 +110,6 @@ public class Syntax extends Symbol
if ( url.endsWith(".aru") ) return syntaxARQ ;
if ( url.endsWith(".ru") ) return syntaxSPARQL_11 ;
- if ( url.endsWith(".rdql") ) return syntaxRDQL ;
if ( url.endsWith(".sse") ) return syntaxAlgebra ;
// Default
@@ -134,8 +128,6 @@ public class Syntax extends Symbol
{
if ( url.endsWith(".arq") ) return syntaxARQ ;
if ( url.endsWith(".rq") ) return syntaxSPARQL ;
-
- if ( url.endsWith(".rdql") ) return syntaxRDQL ;
if ( url.endsWith(".sse") ) return syntaxAlgebra ;
return defaultSyntax ;
}
Modified: incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/syntax/ElementGroup.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/syntax/ElementGroup.java?rev=1165413&r1=1165412&r2=1165413&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/syntax/ElementGroup.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/com/hp/hpl/jena/sparql/syntax/ElementGroup.java Mon Sep 5 20:43:42 2011
@@ -27,8 +27,8 @@ public class ElementGroup extends Elemen
elements.add(el) ;
}
- // In SPARQL, triple patterns are in basic graph patterns.
- // This is only used by RDQL.
+ // In SPARQL, triple patterns are in basic graph patterns.
+ // This is a helper method.
public void addTriplePattern(Triple t)
{