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/05/20 18:01:25 UTC
[6/6] jena git commit: Convert http://jena.hpl.hp.com/ARQ to
http://jena.apache.org/ARQ
Convert http://jena.hpl.hp.com/ARQ to http://jena.apache.org/ARQ
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8d29aa13
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8d29aa13
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8d29aa13
Branch: refs/heads/master
Commit: 8d29aa137f234e593cca44077fe34fbd4c77ba6a
Parents: 2de66e6
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 15:55:03 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 15:55:03 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/query/ARQ.java | 4 ++--
.../src/main/java/org/apache/jena/sparql/ARQConstants.java | 2 +-
.../main/java/org/apache/jena/sparql/util/MappedLoader.java | 2 +-
.../apache/jena/sparql/api/TestQueryExecutionTimeout1.java | 2 +-
.../apache/jena/sparql/api/TestQueryExecutionTimeout2.java | 2 +-
.../jena/arq/querybuilder/handlers/WhereHandlerTest.java | 2 +-
.../java/org/apache/jena/fuseki/server/FusekiConfig.java | 8 ++++----
.../main/java/org/apache/jena/fuseki/server/SystemState.java | 6 +++---
.../jena/jdbc/connections/AbstractJenaConnectionTests.java | 4 ++--
.../java/org/apache/jena/sdb/script/CmdDescAssembler.java | 2 +-
.../test/java/org/apache/jena/sdb/test/junit/StoreList.java | 2 +-
jena-sdb/testing/slist.rq | 2 +-
.../query/spatial/assembler/EntityDefinitionAssembler.java | 2 +-
.../test/java/org/apache/jena/tdb/extra/T_TransSystem.java | 2 +-
.../jena/query/text/assembler/EntityDefinitionAssembler.java | 2 +-
15 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
index 299addc..420e3b9 100644
--- a/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/org/apache/jena/query/ARQ.java
@@ -92,7 +92,7 @@ public class ARQ
public static final String arqIRI = "http://jena.hpl.hp.com/#arq" ;
/** Root of ARQ-defined parameter names */
- public static final String arqParamNS = "http://jena.hpl.hp.com/ARQ#" ;
+ public static final String arqParamNS = "http://jena.apache.org/ARQ#" ;
/** Prefix for ARQ-defined parameter names */
public static final String arqSymbolPrefix = "arq" ;
@@ -113,7 +113,7 @@ public class ARQ
/** Enable built-in property functions - also called "magic properties".
* These are properties in triple patterns that need
* calculation, not matching. See ARQ documentation for more details.
- * rdfs:member and http://jena.hpl.hp.com/ARQ/list#member are provided.
+ * rdfs:member and http://jena.apache.org/ARQ/list#member are provided.
*/
public static final Symbol enablePropertyFunctions =
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/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 a3c2eda..cf66c4d 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
@@ -191,7 +191,7 @@ public class ARQConstants
public static final String allocSSENamedVars = allocVarMarker ; // ParseHandlerPlain - SSE token "?."
/** Marker for system symbols */
- public static final String systemVarNS = "http://jena.hpl.hp.com/ARQ/system#" ;
+ public static final String systemVarNS = "http://jena.apache.org/ARQ/system#" ;
/** Context key for the query for the current query execution
* (may be null if was not created from a query string )
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
index eaeb155..a65a855 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/MappedLoader.java
@@ -28,7 +28,7 @@ import org.apache.jena.sparql.function.library.leviathan.LeviathanConstants ;
@SuppressWarnings("deprecation")
public class MappedLoader {
// Map string => string of prefixes
- // e.g. http://jena.hpl.hp.com/ARQ/property# =>
+ // e.g. http://jena.apache.org/ARQ/property# =>
// java:com.hp.hpl.jena.sparql.pfunction.
static Map<String, String> uriMap = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
index d3771a4..43d784d 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout1.java
@@ -56,7 +56,7 @@ public class TestQueryExecutionTimeout1 extends BaseTest
static private String prefix =
"PREFIX f: <http://example/ns#>\n"+
- "PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>\n" ;
+ "PREFIX afn: <http://jena.apache.org/ARQ/function#>\n" ;
// Numbers all a bit iffy and can result in test failures
// on a heavily loaded CI system.
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
index 14f967c..3c4a4d2 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/api/TestQueryExecutionTimeout2.java
@@ -34,7 +34,7 @@ public class TestQueryExecutionTimeout2
static private String prefix =
"PREFIX f: <http://example/ns#>\n"+
- "PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>\n" ;
+ "PREFIX afn: <http://jena.apache.org/ARQ/function#>\n" ;
static Graph g = SSE.parseGraph("(graph " +
"(<s> <p> 1)" +
" (<s> <p> 2)" +
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
----------------------------------------------------------------------
diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
index 678630a..2101374 100644
--- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
+++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java
@@ -138,7 +138,7 @@ public class WhereHandlerTest extends AbstractHandlerTest {
@Test
public void testAddFilterWithNamespace() throws ParseException {
- query.setPrefix("afn", "http://jena.hpl.hp.com/ARQ/function#");
+ query.setPrefix("afn", "http://jena.apache.org/ARQ/function#");
handler.addFilter("afn:namespace(?one) = 'foo'");
assertContainsRegex(WHERE + OPEN_CURLY + "FILTER" + OPT_SPACE
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
index daa7800..18efa5d 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
@@ -63,11 +63,11 @@ public class FusekiConfig
"PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>",
"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
"PREFIX tdb: <http://jena.hpl.hp.com/2008/tdb#>",
- "PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>",
- "PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>",
+ "PREFIX list: <http://jena.apache.org/ARQ/list#>",
+ "PREFIX list: <http://jena.apache.org/ARQ/list#>",
"PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>",
- "PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>",
- "PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>" ,
+ "PREFIX apf: <http://jena.apache.org/ARQ/property#>",
+ "PREFIX afn: <http://jena.apache.org/ARQ/function#>" ,
"") ;
public static ServerConfig defaultConfiguration(String datasetPath, DatasetGraph dsg, boolean allowUpdate, boolean listenLocal)
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/SystemState.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/SystemState.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/SystemState.java
index e756043..4d3a2f0 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/SystemState.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/SystemState.java
@@ -98,10 +98,10 @@ public class SystemState {
"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>",
"PREFIX tdb: <http://jena.hpl.hp.com/2008/tdb#>",
"PREFIX sdb: <http://jena.hpl.hp.com/20087/sdb#>",
- "PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>",
+ "PREFIX list: <http://jena.apache.org/ARQ/list#>",
"PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>",
- "PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>",
- "PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>",
+ "PREFIX apf: <http://jena.apache.org/ARQ/property#>",
+ "PREFIX afn: <http://jena.apache.org/ARQ/function#>",
"") ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java
----------------------------------------------------------------------
diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java
index 6d33aed..d37ab97 100644
--- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java
+++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java
@@ -739,7 +739,7 @@ public abstract class AbstractJenaConnectionTests {
try {
ResultSet rset = stmt.executeQuery("CONSTRUCT { ?s ?p ?o } WHERE { "
+ (this.usesNamedGraphAsDefault() ? "GRAPH <" + this.getDefaultGraphName() + "> {" : "")
- + " FILTER(<http://jena.hpl.hp.com/ARQ/function#wait>(1500)) " + (this.usesNamedGraphAsDefault() ? "}" : "") + "}");
+ + " FILTER(<http://jena.apache.org/ARQ/function#wait>(1500)) " + (this.usesNamedGraphAsDefault() ? "}" : "") + "}");
// Note that we have to start iterating otherwise the query doesn't
// get executed and the timeout will never apply
@@ -778,7 +778,7 @@ public abstract class AbstractJenaConnectionTests {
try {
ResultSet rset = stmt.executeQuery("CONSTRUCT { ?s ?p ?o } WHERE { "
+ (this.usesNamedGraphAsDefault() ? "GRAPH <" + this.getDefaultGraphName() + "> {" : "")
- + " FILTER(<http://jena.hpl.hp.com/ARQ/function#wait>(1500)) " + (this.usesNamedGraphAsDefault() ? "}" : "") + "}");
+ + " FILTER(<http://jena.apache.org/ARQ/function#wait>(1500)) " + (this.usesNamedGraphAsDefault() ? "}" : "") + "}");
// Note that we have to start iterating otherwise the query doesn't
// get executed and the timeout will never apply
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDescAssembler.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDescAssembler.java b/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDescAssembler.java
index eac049c..2f409c2 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDescAssembler.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/script/CmdDescAssembler.java
@@ -36,7 +36,7 @@ public class CmdDescAssembler extends AssemblerBase implements Assembler
/* This SPARQL query will process arguments
PREFIX acmd: <http://jena.hpl.hp.com/2007/sdb#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
SELECT ?name ?value
{ ?x rdf:type acmd:Cmd ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java b/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
index af5f6c8..84373d7 100644
--- a/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
+++ b/jena-sdb/src/test/java/org/apache/jena/sdb/test/junit/StoreList.java
@@ -49,7 +49,7 @@ public class StoreList
"PREFIX sdb: <http://jena.hpl.hp.com/2007/sdb#>" ,
"PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>" ,
"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>" ,
- "PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>" ,
+ "PREFIX list: <http://jena.apache.org/ARQ/list#>" ,
"SELECT ?desc ?label" ,
"{ [] rdf:type sdb:StoreList ;" ,
" sdb:list ?l ." ,
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-sdb/testing/slist.rq
----------------------------------------------------------------------
diff --git a/jena-sdb/testing/slist.rq b/jena-sdb/testing/slist.rq
index 7fa4e01..93e6518 100644
--- a/jena-sdb/testing/slist.rq
+++ b/jena-sdb/testing/slist.rq
@@ -2,7 +2,7 @@ PREFIX sdb: <http://jena.hpl.hp.com/2007/sdb#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX desc: <./StoreDesc/>
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
SELECT ?desc ?label
{ [] rdf:type sdb:StoreList ;
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/EntityDefinitionAssembler.java
----------------------------------------------------------------------
diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/EntityDefinitionAssembler.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/EntityDefinitionAssembler.java
index 53c3823..dc19ee5 100644
--- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/EntityDefinitionAssembler.java
+++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/EntityDefinitionAssembler.java
@@ -54,7 +54,7 @@ public class EntityDefinitionAssembler extends AssemblerBase implements Assemble
@Override
public EntityDefinition open(Assembler a, Resource root, Mode mode)
{
- String prologue = "PREFIX : <"+NS+"> PREFIX list: <http://jena.hpl.hp.com/ARQ/list#> " ;
+ String prologue = "PREFIX : <"+NS+"> PREFIX list: <http://jena.apache.org/ARQ/list#> " ;
Model model = root.getModel() ;
String qs1 = StrUtils.strjoinNL(prologue,
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java b/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
index 11db7d6..9fd8dfe 100644
--- a/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
+++ b/jena-tdb/src/test/java/org/apache/jena/tdb/extra/T_TransSystem.java
@@ -223,7 +223,7 @@ public class T_TransSystem
int x1 = count("SELECT * { ?s ?p ?o }", dsg) ;
pause(maxpause) ;
- String qs1 = StrUtils.strjoinNL("PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>",
+ String qs1 = StrUtils.strjoinNL("PREFIX afn: <http://jena.apache.org/ARQ/function#>",
"SELECT * { {FILTER(afn:wait(10))} UNION {?s ?p ?o }}") ;
String qs2 = StrUtils.strjoinNL("DESCRIBE ?s { ?s ?p ?o }") ;
try {
http://git-wip-us.apache.org/repos/asf/jena/blob/8d29aa13/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
index ca66f27..f9aa7e8 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
@@ -55,7 +55,7 @@ public class EntityDefinitionAssembler extends AssemblerBase implements Assemble
@Override
public EntityDefinition open(Assembler a, Resource root, Mode mode)
{
- String prologue = "PREFIX : <"+NS+"> PREFIX list: <http://jena.hpl.hp.com/ARQ/list#> " ;
+ String prologue = "PREFIX : <"+NS+"> PREFIX list: <http://jena.apache.org/ARQ/list#> " ;
Model model = root.getModel() ;
String qs1 = StrUtils.strjoinNL(prologue,