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:20 UTC
[1/6] jena git commit: Add Log.warnOnce
Repository: jena
Updated Branches:
refs/heads/master 8d5f1cb27 -> 8d29aa137
Add Log.warnOnce
Prints a message once(ish) per key.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/78108a83
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/78108a83
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/78108a83
Branch: refs/heads/master
Commit: 78108a83592ff60aaa8bb5f1d5297b49a8117b5e
Parents: 8d5f1cb
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 14:54:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 14:54:19 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/atlas/logging/Log.java | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/78108a83/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java b/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java
index 47783fc..8b8398a 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/logging/Log.java
@@ -18,6 +18,8 @@
package org.apache.jena.atlas.logging ;
+import org.apache.jena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.CacheSet ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
@@ -113,4 +115,13 @@ public class Log {
static private Logger log(String loggerName) {
return LoggerFactory.getLogger(loggerName) ;
}
+
+ private static CacheSet<Object> warningsDone = CacheFactory.createCacheSet(100) ;
+ /** Generate a warning, once(ish) */
+ public static void warnOnce(Class<?> cls, String message, Object key) {
+ if ( ! warningsDone.contains(key) ) {
+ Log.warn(cls, message) ;
+ warningsDone.add(key);
+ }
+ }
}
[3/6] jena git commit: Convert list: into http://jena.apache.org/list#
Posted by an...@apache.org.
Convert list: into http://jena.apache.org/list#
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9f1f0190
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9f1f0190
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9f1f0190
Branch: refs/heads/master
Commit: 9f1f01907875203d98bd2cab107e6c2a02491653
Parents: d3ade30
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 15:05:01 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 15:05:01 2015 +0100
----------------------------------------------------------------------
jena-arq/testing/ARQ/PropertyFunctions/assign-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/assign-2.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/assign-3.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/assign-4.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/assign-5.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/assign-6.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/concat-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-2.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-3.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-4.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-5.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-6.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-7.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-8.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-9.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-2.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-3.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-4.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-5.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-6.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-7.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-8.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-index-9.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-length-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-length-2.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/list-length-3.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-1.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-2.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-3.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-4.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-5.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-6.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-7.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-8.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/splitIRI-9.rq | 2 +-
jena-arq/testing/ARQ/PropertyFunctions/str-1.rq | 2 +-
39 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/assign-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/assign-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/assign-1.rq
index c2651cb..2b807fa 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/assign-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/assign-1.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT *
{ ?s apf:assign "v" . }
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/assign-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/assign-2.rq b/jena-arq/testing/ARQ/PropertyFunctions/assign-2.rq
index d20edc9..05f0fc2 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/assign-2.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/assign-2.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT *
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/assign-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/assign-3.rq b/jena-arq/testing/ARQ/PropertyFunctions/assign-3.rq
index ae15812..0a20c75 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/assign-3.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/assign-3.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT ?x
{ "v" apf:assign "v" . }
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/assign-4.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/assign-4.rq b/jena-arq/testing/ARQ/PropertyFunctions/assign-4.rq
index bb4d03a..ca2462f 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/assign-4.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/assign-4.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT *
{ ?x apf:assign 1 .
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/assign-5.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/assign-5.rq b/jena-arq/testing/ARQ/PropertyFunctions/assign-5.rq
index 8350f28..6151946 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/assign-5.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/assign-5.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT *
{ :x :p ?x .
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/assign-6.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/assign-6.rq b/jena-arq/testing/ARQ/PropertyFunctions/assign-6.rq
index bdac632..f3a5181 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/assign-6.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/assign-6.rq
@@ -1,6 +1,6 @@
PREFIX : <http://example.org/>
# java: route
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT *
{ ?s apf:assign "v" . }
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/concat-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/concat-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/concat-1.rq
index 79a6583..75b07c9 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/concat-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/concat-1.rq
@@ -1,4 +1,4 @@
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
PREFIX : <http://example.org/>
SELECT ?z
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-1.rq
index 7e7a1e7..2549fc0 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-1.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?member
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-2.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-2.rq
index 7571888..5acff3d 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-2.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-2.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-3.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-3.rq
index bfb862e..d717be0 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-3.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-3.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-4.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-4.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-4.rq
index 525f3a8..f62eacd 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-4.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-4.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-5.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-5.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-5.rq
index 664ed94..d82264c 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-5.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-5.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-6.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-6.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-6.rq
index b314c84..5b7867b 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-6.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-6.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-7.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-7.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-7.rq
index a9b2859..bb5a600 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-7.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-7.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-8.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-8.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-8.rq
index 3a6e52d..60360c4 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-8.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-8.rq
@@ -1,6 +1,6 @@
# Check property function in size NOT EXISTS
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-9.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-9.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-9.rq
index f5ba5f1..45ab681 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-9.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-9.rq
@@ -1,6 +1,6 @@
# Check property function in NOT EXISTS
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-1.rq
index f73c190..0d75378 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-1.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?idx ?member
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-2.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-2.rq
index 193e20f..9b5877f 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-2.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-2.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?member
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-3.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-3.rq
index 597197e..61ffed7 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-3.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-3.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?member
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-4.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-4.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-4.rq
index 3a81688..d6bb3a3 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-4.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-4.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?idx
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-5.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-5.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-5.rq
index c084ff3..a002c79 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-5.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-5.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?idx
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-6.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-6.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-6.rq
index c15c3c0..836cf6e 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-6.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-6.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-7.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-7.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-7.rq
index 7af25a1..a1cdecc 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-7.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-7.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-8.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-8.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-8.rq
index 8a9ca3c..2376843 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-8.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-8.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-index-9.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-index-9.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-index-9.rq
index 19e191f..bc2a2d7 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-index-9.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-index-9.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?i ?j
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-length-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-length-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-length-1.rq
index bbcf23f..ea04ad1 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-length-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-length-1.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?length
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-length-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-length-2.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-length-2.rq
index 819c5cd..1cd0727 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-length-2.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-length-2.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?list
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/list-length-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/list-length-3.rq b/jena-arq/testing/ARQ/PropertyFunctions/list-length-3.rq
index 8d648dd..1dde0ee 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/list-length-3.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/list-length-3.rq
@@ -1,4 +1,4 @@
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
PREFIX : <http://example.org/>
SELECT ?x ?list
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq
index 8bba11c..f4bbf2b 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/seq-1.rq
@@ -4,7 +4,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX : <http://example/>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?p ?member WHERE
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-1.rq
index db4a072..db58e37 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-1.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT ?ns ?ln
{ :x ?p 1 .
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-2.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-2.rq
index ebf9f2a..b46c167 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-2.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-2.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
SELECT ?ns ?ln
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-3.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-3.rq
index 1f21f37..099232f 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-3.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-3.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
SELECT ?ln
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-4.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-4.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-4.rq
index 6ff1d14..f9e2431 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-4.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-4.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
SELECT ?ns
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-5.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-5.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-5.rq
index c3aa812..9a42a36 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-5.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-5.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
ASK
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-6.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-6.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-6.rq
index e985f6f..3007dc5 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-6.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-6.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
SELECT ?ns
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-7.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-7.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-7.rq
index b536027..cc0e070 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-7.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-7.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT ?ns ?ln
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-8.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-8.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-8.rq
index 927aea8..73be9cc 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-8.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-8.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT ?ns ?ln
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-9.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-9.rq b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-9.rq
index d0de86a..4a719e0 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-9.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/splitIRI-9.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT ?ns ?ln
{
http://git-wip-us.apache.org/repos/asf/jena/blob/9f1f0190/jena-arq/testing/ARQ/PropertyFunctions/str-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/PropertyFunctions/str-1.rq b/jena-arq/testing/ARQ/PropertyFunctions/str-1.rq
index e006682..f9226d8 100644
--- a/jena-arq/testing/ARQ/PropertyFunctions/str-1.rq
+++ b/jena-arq/testing/ARQ/PropertyFunctions/str-1.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example/>
-PREFIX apf: <http://jena.hpl.hp.com/ARQ/property#>
+PREFIX apf: <http://jena.apache.org/ARQ/property#>
SELECT ?x
{
[6/6] jena git commit: Convert http://jena.hpl.hp.com/ARQ to
http://jena.apache.org/ARQ
Posted by an...@apache.org.
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,
[5/6] jena git commit: Log warning when custom functions or property
functions use jena.hpl.hp.com
Posted by an...@apache.org.
Log warning when custom functions or property functions use jena.hpl.hp.com
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2de66e6e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2de66e6e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2de66e6e
Branch: refs/heads/master
Commit: 2de66e6e3f31c1edfdeb79ea5998df90d942b544
Parents: 05d43aa
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 15:14:09 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 15:14:09 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/sparql/ARQConstants.java | 11 +++-
.../pfunction/PropertyFunctionRegistry.java | 9 ++-
.../apache/jena/sparql/util/MappedLoader.java | 27 ++++----
.../jena/sparql/vocabulary/ListPFunction.java | 65 +++++++++++++++-----
.../org/apache/jena/sparql/path/TestPathPF.java | 10 +--
5 files changed, 88 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2de66e6e/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 488a802..a3c2eda 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
@@ -62,13 +62,20 @@ public class ARQConstants
/** The ARQ function library URI space */
public static final String ARQFunctionLibraryURI = "http://jena.apache.org/ARQ/function#" ;
- /** The ARQ function library URI space - old Jena2 name */
+
+ /** The ARQ function library URI space - old Jena2 name
+ * @deprecated Use #ARQFunctionLibraryURI
+ */
+ @Deprecated
public static final String ARQFunctionLibraryURI_Jena2 = "http://jena.hpl.hp.com/ARQ/function#" ;
/** The ARQ property function library URI space */
public static final String ARQPropertyFunctionLibraryURI = "http://jena.apache.org/ARQ/property#" ;
- /** The ARQ property function library URI space - old Jena2 name */
+ /** The ARQ property function library URI space - old Jena2 name
+ * @deprecated Use #ARQFunctionLibraryURI
+ */
+ @Deprecated
public static final String ARQPropertyFunctionLibraryURI_Jena2 = "http://jena.hpl.hp.com/ARQ/property#" ;
/** The ARQ procedure library URI space */
http://git-wip-us.apache.org/repos/asf/jena/blob/2de66e6e/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
index 040f45f..561b992 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/pfunction/PropertyFunctionRegistry.java
@@ -117,6 +117,10 @@ public class PropertyFunctionRegistry
/** Lookup by URI */
public PropertyFunctionFactory get(String uri)
{
+ String mappedUri = MappedLoader.mapDynamicURI(uri) ;
+ if ( mappedUri != null )
+ uri = mappedUri ;
+
PropertyFunctionFactory ext = registry.get(uri) ;
if ( ext != null )
return ext ;
@@ -128,7 +132,7 @@ public class PropertyFunctionRegistry
if ( extClass == null )
return null ;
// Register it
- put(uri, extClass) ;
+ put(mappedUri, extClass) ;
attemptedLoads.add(uri) ;
// Call again to get it.
return registry.get(uri) ;
@@ -148,6 +152,9 @@ public class PropertyFunctionRegistry
put(ListPFunction.member.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
put(ListPFunction.index.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
put(ListPFunction.length.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
+ put(ListPFunction.memberJ2.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
+ put(ListPFunction.indexJ2.getURI() , org.apache.jena.sparql.pfunction.library.listIndex.class) ;
+ put(ListPFunction.lengthJ2.getURI() , org.apache.jena.sparql.pfunction.library.listLength.class) ;
// (Very) old forms
put(ListPFunction.listMember.getURI() , org.apache.jena.sparql.pfunction.library.listMember.class) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2de66e6e/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 c254ab5..eaeb155 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
@@ -18,12 +18,14 @@
package org.apache.jena.sparql.util;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.HashMap ;
+import java.util.Map ;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.sparql.ARQConstants ;
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# =>
@@ -38,19 +40,17 @@ public class MappedLoader {
uriMap.put(ARQConstants.ARQPropertyFunctionLibraryURI, ARQConstants.ARQPropertyFunctionLibrary);
uriMap.put(ARQConstants.ARQPropertyFunctionLibraryURI_Jena2, ARQConstants.ARQPropertyFunctionLibrary);
uriMap.put(ARQConstants.ARQProcedureLibraryURI, ARQConstants.ARQProcedureLibrary);
-
// Old name, new name
- uriMap.put("java:com.hp.hpl.jena.query.function.library.", "java:com.hp.hpl.jena.sparql.function.library.");
-
- uriMap.put("java:com.hp.hpl.jena.query.pfunction.library.", "java:com.hp.hpl.jena.sparql.pfunction.library.");
+ uriMap.put("java:com.hp.hpl.jena.query.function.library.", "java:org.apache.jena.sparql.function.library.");
+ uriMap.put("java:com.hp.hpl.jena.query.pfunction.library.", "java:org.apache.jena.sparql.pfunction.library.");
// Leviathan library
uriMap.put(LeviathanConstants.LeviathanFunctionLibraryURI, LeviathanConstants.LeviathanFunctionLibrary);
}
public static boolean isPossibleDynamicURI(String uri, Class<?> expectedClass) {
- uri = mapDynamicURI(uri);
- if (uri == null)
+ String mappedUri = mapDynamicURI(uri);
+ if (mappedUri == null)
return false;
// Need to force the load to check everything.
// Callers (who are expectedClass sensitive) should have
@@ -59,6 +59,10 @@ public class MappedLoader {
}
public static String mapDynamicURI(String uri) {
+ // Jena2 -> Jena3 transition
+ if ( uri.startsWith("http://jena.hpl.hp.com/ARQ") )
+ Log.warnOnce(MappedLoader.class, "Loading function or property function with old style 'jena.hpl.hp.com' used - preferred style is to use 'jena.apache.org': "+uri, uri) ;
+
Map.Entry<String, String> e = find(uri);
if (e == null) {
if (uri.startsWith(ARQConstants.javaClassURIScheme))
@@ -86,11 +90,10 @@ public class MappedLoader {
}
public static Class<?> loadClass(String uri, Class<?> expectedClass) {
- uri = mapDynamicURI(uri);
- if (uri == null)
+ String mappedUri = mapDynamicURI(uri);
+ if (mappedUri == null)
return null;
-
- return Loader.loadClass(uri, expectedClass);
+ return Loader.loadClass(mappedUri, expectedClass);
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2de66e6e/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/ListPFunction.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/ListPFunction.java b/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/ListPFunction.java
index 7d6d49d..0dbb876 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/ListPFunction.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/vocabulary/ListPFunction.java
@@ -33,7 +33,10 @@ public class ListPFunction {
private static Model m_model = ModelFactory.createDefaultModel();
/** <p>The namespace of the vocabulary as a string</p> */
- public static final String NS = "http://jena.hpl.hp.com/ARQ/list#";
+ public static final String NS = "http://jena.apache.org/ARQ/list#";
+
+ /** <p>The namespace of the vocabulary as a string</p> (Jena2 name) */
+ public static final String NSJ2 = "http://jena.hpl.hp.com/ARQ/list#";
/** <p>The namespace of the vocabulary as a string</p>
* @see #NS */
@@ -42,34 +45,68 @@ public class ListPFunction {
/** <p>The namespace of the vocabulary as a resource</p> */
public static final Resource NAMESPACE = m_model.createResource( NS );
- /** @deprecated : list:length preferred */
- @Deprecated
- public static final Property listLength = m_model.createProperty( "http://jena.hpl.hp.com/ARQ/list#listLength" );
-
/** <p>Length relationship of a list [subject] to a length [object]</p> */
- public static final Property length = m_model.createProperty( "http://jena.hpl.hp.com/ARQ/list#length" );
-
- /** @deprecated : list:index preferred */
+ public static final Property length = m_model.createProperty( NS+"length" );
+
+ /** <p>Length relationship of a list [subject] to a length [object]</p> (jena2 name - deprecated)
+ * @deprecated
+ */
@Deprecated
- public static final Property listIndex = m_model.createProperty( "http://jena.hpl.hp.com/ARQ/list#listIndex" );
+ public static final Property lengthJ2 = m_model.createProperty( NSJ2+"length" );
/** <p>Index relationship of a list [subject] to a query list (index member)</p> */
- public static final Property index = m_model.createProperty( "http://jena.hpl.hp.com/ARQ/list#index" );
-
- /** @deprecated : list:member preferred */
+ public static final Property index = m_model.createProperty( NS+"index" );
+
+ /** <p>Index relationship of a list [subject] to a query list (index member)</p>
+ * (jena2 name - deprecated)
+ * @deprecated
+ */
@Deprecated
- public static final Property listMember = m_model.createProperty( "http://jena.hpl.hp.com/ARQ/list#listMember" );
+ public static final Property indexJ2 = m_model.createProperty( NSJ2+"index" );
/** <p>Membership relationship of a list [subject] to a member [object] c.f. rdfs:member</p> */
- public static final Property member = m_model.createProperty( "http://jena.hpl.hp.com/ARQ/list#member" );
+ public static final Property member = m_model.createProperty( NS+"member" );
+
+ /** <p>Membership relationship of a list [subject] to a member [object] c.f. rdfs:member</p>
+ * (jena2 name - deprecated)
+ * @deprecated
+ */
+ @Deprecated
+ public static final Property memberJ2 = m_model.createProperty( NSJ2+"member" );
+
+ // ---- Some very old names.
+ /** @deprecated : list:index preferred */
+ @Deprecated
+ public static final Property listIndex = m_model.createProperty( NSJ2+"listIndex" );
+
+ /** @deprecated : list:length preferred */
+ @Deprecated
+ public static final Property listLength = m_model.createProperty( NSJ2+"listLength" );
+
+ /** @deprecated : list:member preferred */
+ @Deprecated
+ public static final Property listMember = m_model.createProperty( NSJ2+"listMember" );
+ // ----
/** list:member as a node */
+ @Deprecated
+ public static final Node nListMemberJ2 = memberJ2.asNode() ;
+
+ /** list:member as a node */
public static final Node nListMember = member.asNode() ;
/** list:length as a node */
+ @Deprecated
+ public static final Node nListLengthJ2 = lengthJ2.asNode() ;
+
+ /** list:length as a node */
public static final Node nListLength = length.asNode() ;
/** list:index as a node */
+ @Deprecated
+ public static final Node nListIndexJ2 = memberJ2.asNode() ;
+
+ /** list:index as a node */
public static final Node nListIndex = member.asNode() ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2de66e6e/jena-arq/src/test/java/org/apache/jena/sparql/path/TestPathPF.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/path/TestPathPF.java b/jena-arq/src/test/java/org/apache/jena/sparql/path/TestPathPF.java
index fccf3e4..7b5e7f3 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/path/TestPathPF.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/path/TestPathPF.java
@@ -110,27 +110,27 @@ public class TestPathPF extends BaseTest
@Test public void path_pf_10() {
- Path path = SSE.parsePath("(prefix ((list: <http://jena.hpl.hp.com/ARQ/list#>)) (seq :p (link list:member)))") ;
+ Path path = SSE.parsePath("(prefix ((list: <http://jena.apache.org/ARQ/list#>)) (seq :p (link list:member)))") ;
eval(graph2, s1, path, "1", "2", "3", "4", "5") ;
}
@Test public void path_pf_11() {
- Path path = SSE.parsePath("(prefix ((list: <http://jena.hpl.hp.com/ARQ/list#>)) (seq :p (link list:member)))") ;
+ Path path = SSE.parsePath("(prefix ((list: <http://jena.apache.org/ARQ/list#>)) (seq :p (link list:member)))") ;
eval(graph2, s2, path, new Node[] {}) ;
}
@Test public void path_pf_12() {
- Path path = SSE.parsePath("(prefix ((list: <http://jena.hpl.hp.com/ARQ/list#>)) (seq :p (link list:member)))") ;
+ Path path = SSE.parsePath("(prefix ((list: <http://jena.apache.org/ARQ/list#>)) (seq :p (link list:member)))") ;
eval(graph2, s3, path, "8", "9") ;
}
@Test public void path_pf_13() {
- Path path = SSE.parsePath("(prefix ((list: <http://jena.hpl.hp.com/ARQ/list#>)) (seq :p (link list:member)))") ;
+ Path path = SSE.parsePath("(prefix ((list: <http://jena.apache.org/ARQ/list#>)) (seq :p (link list:member)))") ;
evalReverse(graph2, NodeConst.nodeOne, path, s1) ;
}
@Test public void path_pf_14() {
- Path path = SSE.parsePath("(prefix ((list: <http://jena.hpl.hp.com/ARQ/list#>)) (seq :p (link list:member)))") ;
+ Path path = SSE.parsePath("(prefix ((list: <http://jena.apache.org/ARQ/list#>)) (seq :p (link list:member)))") ;
evalReverse(graph2, NodeConst.nodeNil, path) ;
}
[4/6] jena git commit: Convert property functions to
http://jena.apache.org/...
Posted by an...@apache.org.
Convert property functions to http://jena.apache.org/...
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/05d43aa3
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/05d43aa3
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/05d43aa3
Branch: refs/heads/master
Commit: 05d43aa308d8edfe85b7bdcfd16c6cd3b3a0dcc5
Parents: 9f1f019
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 15:11:52 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 15:11:52 2015 +0100
----------------------------------------------------------------------
jena-arq/testing/ARQ/EngineMain/filter-1.rq | 2 +-
jena-arq/testing/ARQ/Function/concat-1.arq | 2 +-
jena-arq/testing/ARQ/Function/concat-2.arq | 2 +-
jena-arq/testing/ARQ/Function/func-03.rq | 2 +-
jena-arq/testing/ARQ/Function/func-04.rq | 2 +-
jena-arq/testing/ARQ/Function/func-sha1sum-1.rq | 2 +-
jena-arq/testing/ARQ/Function/func-sha1sum-2.rq | 2 +-
jena-arq/testing/ARQ/Function/localname-1.rq | 2 +-
jena-arq/testing/ARQ/Function/namespace-1.rq | 2 +-
jena-arq/testing/ARQ/Function/q-lang-1.rq | 2 +-
jena-arq/testing/ARQ/Function/q-lang-2.rq | 2 +-
jena-arq/testing/ARQ/Function/strjoin-1.arq | 2 +-
jena-arq/testing/ARQ/Function/strjoin-2.arq | 2 +-
jena-arq/testing/ARQ/Function/strlen-1.rq | 2 +-
jena-arq/testing/ARQ/Function/strlen-2.rq | 2 +-
jena-arq/testing/ARQ/Function/substring-1.rq | 2 +-
jena-arq/testing/ARQ/Function/substring-2.rq | 2 +-
jena-arq/testing/ARQ/Function/substring-3.rq | 2 +-
jena-arq/testing/ARQ/Sort/order-3.rq | 2 +-
jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq | 2 +-
20 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/EngineMain/filter-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/EngineMain/filter-1.rq b/jena-arq/testing/ARQ/EngineMain/filter-1.rq
index ca0d048..d5e5881 100644
--- a/jena-arq/testing/ARQ/EngineMain/filter-1.rq
+++ b/jena-arq/testing/ARQ/EngineMain/filter-1.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example/>
-PREFIX list: <http://jena.hpl.hp.com/ARQ/list#>
+PREFIX list: <http://jena.apache.org/ARQ/list#>
SELECT *
{
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/concat-1.arq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/concat-1.arq b/jena-arq/testing/ARQ/Function/concat-1.arq
index 5d592dc..f589e3d 100644
--- a/jena-arq/testing/ARQ/Function/concat-1.arq
+++ b/jena-arq/testing/ARQ/Function/concat-1.arq
@@ -1,4 +1,4 @@
PREFIX fn: <http://www.w3.org/2005/xpath-functions#>
-PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX afn: <http://jena.apache.org/ARQ/function#>
SELECT (fn:concat(1,2) as ?X) {}
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/concat-2.arq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/concat-2.arq b/jena-arq/testing/ARQ/Function/concat-2.arq
index 5eeaee3..9977400 100644
--- a/jena-arq/testing/ARQ/Function/concat-2.arq
+++ b/jena-arq/testing/ARQ/Function/concat-2.arq
@@ -1,4 +1,4 @@
PREFIX fn: <http://www.w3.org/2005/xpath-functions#>
-PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX afn: <http://jena.apache.org/ARQ/function#>
SELECT ?X { let ( ?X := fn:concat(1) ) }
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/func-03.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/func-03.rq b/jena-arq/testing/ARQ/Function/func-03.rq
index 7ebb5d8..3bda286 100644
--- a/jena-arq/testing/ARQ/Function/func-03.rq
+++ b/jena-arq/testing/ARQ/Function/func-03.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/ns#>
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?z
WHERE
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/func-04.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/func-04.rq b/jena-arq/testing/ARQ/Function/func-04.rq
index bbd19cb..ac37d19 100644
--- a/jena-arq/testing/ARQ/Function/func-04.rq
+++ b/jena-arq/testing/ARQ/Function/func-04.rq
@@ -1,5 +1,5 @@
PREFIX : <http://example.org/ns#>
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?z
WHERE
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/func-sha1sum-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/func-sha1sum-1.rq b/jena-arq/testing/ARQ/Function/func-sha1sum-1.rq
index 346cfcb..828d77d 100644
--- a/jena-arq/testing/ARQ/Function/func-sha1sum-1.rq
+++ b/jena-arq/testing/ARQ/Function/func-sha1sum-1.rq
@@ -1,6 +1,6 @@
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?name
{ ?x a foaf:Person ;
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/func-sha1sum-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/func-sha1sum-2.rq b/jena-arq/testing/ARQ/Function/func-sha1sum-2.rq
index 3841e30..abebf41 100644
--- a/jena-arq/testing/ARQ/Function/func-sha1sum-2.rq
+++ b/jena-arq/testing/ARQ/Function/func-sha1sum-2.rq
@@ -1,6 +1,6 @@
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?name
{ ?x a foaf:Person ;
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/localname-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/localname-1.rq b/jena-arq/testing/ARQ/Function/localname-1.rq
index 7ea7b06..70a874c 100644
--- a/jena-arq/testing/ARQ/Function/localname-1.rq
+++ b/jena-arq/testing/ARQ/Function/localname-1.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX : <http://example.org/>
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/namespace-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/namespace-1.rq b/jena-arq/testing/ARQ/Function/namespace-1.rq
index b6cf392..dbd3c45 100644
--- a/jena-arq/testing/ARQ/Function/namespace-1.rq
+++ b/jena-arq/testing/ARQ/Function/namespace-1.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX : <http://example.org/>
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/q-lang-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/q-lang-1.rq b/jena-arq/testing/ARQ/Function/q-lang-1.rq
index 48bc238..069fd7d 100644
--- a/jena-arq/testing/ARQ/Function/q-lang-1.rq
+++ b/jena-arq/testing/ARQ/Function/q-lang-1.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
SELECT ?v
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/q-lang-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/q-lang-2.rq b/jena-arq/testing/ARQ/Function/q-lang-2.rq
index 8e31de6..676f969 100644
--- a/jena-arq/testing/ARQ/Function/q-lang-2.rq
+++ b/jena-arq/testing/ARQ/Function/q-lang-2.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?v
{ ?x ?p ?v .
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/strjoin-1.arq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/strjoin-1.arq b/jena-arq/testing/ARQ/Function/strjoin-1.arq
index bb5f072..de32881 100644
--- a/jena-arq/testing/ARQ/Function/strjoin-1.arq
+++ b/jena-arq/testing/ARQ/Function/strjoin-1.arq
@@ -1,4 +1,4 @@
PREFIX fn: <http://www.w3.org/2005/xpath-functions#>
-PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX afn: <http://jena.apache.org/ARQ/function#>
SELECT ?X { let ( ?X := afn:strjoin("--", <http://example/> , 'a' , 1 ) ) }
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/strjoin-2.arq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/strjoin-2.arq b/jena-arq/testing/ARQ/Function/strjoin-2.arq
index 1729ea1..e0b7910 100644
--- a/jena-arq/testing/ARQ/Function/strjoin-2.arq
+++ b/jena-arq/testing/ARQ/Function/strjoin-2.arq
@@ -1,5 +1,5 @@
PREFIX fn: <http://www.w3.org/2005/xpath-functions#>
-PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX afn: <http://jena.apache.org/ARQ/function#>
SELECT * {
let ( ?X := afn:strjoin(",") )
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/strlen-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/strlen-1.rq b/jena-arq/testing/ARQ/Function/strlen-1.rq
index 9702a93..0afd4c0 100644
--- a/jena-arq/testing/ARQ/Function/strlen-1.rq
+++ b/jena-arq/testing/ARQ/Function/strlen-1.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX : <http://example/>
SELECT ?p ?v
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/strlen-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/strlen-2.rq b/jena-arq/testing/ARQ/Function/strlen-2.rq
index 953bf1d..4d9969e 100644
--- a/jena-arq/testing/ARQ/Function/strlen-2.rq
+++ b/jena-arq/testing/ARQ/Function/strlen-2.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX : <http://example/>
SELECT ?p ?v
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/substring-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/substring-1.rq b/jena-arq/testing/ARQ/Function/substring-1.rq
index 5464cb3..2cc6d94 100644
--- a/jena-arq/testing/ARQ/Function/substring-1.rq
+++ b/jena-arq/testing/ARQ/Function/substring-1.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX : <http://example/>
SELECT ?p ?v
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/substring-2.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/substring-2.rq b/jena-arq/testing/ARQ/Function/substring-2.rq
index 4365c1f..ae2b45d 100644
--- a/jena-arq/testing/ARQ/Function/substring-2.rq
+++ b/jena-arq/testing/ARQ/Function/substring-2.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX : <http://example/>
SELECT ?p ?v
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Function/substring-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Function/substring-3.rq b/jena-arq/testing/ARQ/Function/substring-3.rq
index 86bf4ee..68fa607 100644
--- a/jena-arq/testing/ARQ/Function/substring-3.rq
+++ b/jena-arq/testing/ARQ/Function/substring-3.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
PREFIX : <http://example/>
SELECT ?p ?v
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/Sort/order-3.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/Sort/order-3.rq b/jena-arq/testing/ARQ/Sort/order-3.rq
index ab776e7..43a270d 100644
--- a/jena-arq/testing/ARQ/Sort/order-3.rq
+++ b/jena-arq/testing/ARQ/Sort/order-3.rq
@@ -1,4 +1,4 @@
-PREFIX jfn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX jfn: <http://jena.apache.org/ARQ/function#>
SELECT ?o
WHERE { ?s ?p ?o }
http://git-wip-us.apache.org/repos/asf/jena/blob/05d43aa3/jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq
----------------------------------------------------------------------
diff --git a/jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq b/jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq
index 2a44190..76ac111 100644
--- a/jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq
+++ b/jena-arq/testing/ARQ/SubQuery/graph-subquery-1.rq
@@ -1,4 +1,4 @@
-PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#>
+PREFIX afn: <http://jena.apache.org/ARQ/function#>
# Take local name to make a more portable test
SELECT ?x (afn:localname(?g) AS ?gn)
[2/6] jena git commit: Use Log.warnOnce
Posted by an...@apache.org.
Use Log.warnOnce
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d3ade30e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d3ade30e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d3ade30e
Branch: refs/heads/master
Commit: d3ade30efaf0297d6feeb4c81d18f36f10964af9
Parents: 78108a8
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 20 14:54:49 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 20 14:54:49 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/assembler/AssemblerHelp.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/d3ade30e/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java b/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
index a3ca376..5ba468f 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
@@ -27,8 +27,6 @@ import java.util.Set ;
import org.apache.jena.assembler.assemblers.AssemblerGroup ;
import org.apache.jena.assembler.exceptions.AmbiguousSpecificTypeException ;
-import org.apache.jena.atlas.lib.CacheFactory ;
-import org.apache.jena.atlas.lib.CacheSet ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.rdf.model.* ;
@@ -148,18 +146,13 @@ public class AssemblerHelp
return loaded;
}
- /** Small cache to suppress some repeat warnings */
- static CacheSet<String> warningsMap = CacheFactory.createCacheSet(10) ;
-
private static Class<?> loadClassNamedBy( Statement s )
{
String x = getString( s ) ;
// Jena2 -> Jena3 transition
if ( x.startsWith("com.hp.hpl.jena") ) {
String x1 = x.replaceFirst("com.hp.hpl.jena", "org.apache.jena") ;
- if ( ! warningsMap.contains(x) )
- Log.warn(AssemblerHelp.class, "ja:loadClass: Migration to Jena3: Converting "+x+" to "+x1) ;
- warningsMap.add(x);
+ Log.warnOnce(AssemblerHelp.class, "ja:loadClass: Migration to Jena3: Converting "+x+" to "+x1, x) ;
x = x1 ;
}
try { return Class.forName(x); }