You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/16 10:58:58 UTC

[16/50] [abbrv] jena git commit: Migration for loadable library code URLs based on jena.hpl.hp.com.

Migration for loadable library code URLs based on jena.hpl.hp.com.

Retain old (Jena2) mapping http://jena.hpl.hp.com/ARQ/function#
Add preferred mapping for http://jena.apache.org/ARQ/function#

Ditto property functions /property#


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a719f679
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a719f679
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a719f679

Branch: refs/heads/add-contract-tests
Commit: a719f679f835fc183a588f8ccc0e6b77a3c95956
Parents: e5035f4
Author: Andy Seaborne <an...@apache.org>
Authored: Mon May 11 11:58:05 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon May 11 11:58:05 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/jena/sparql/ARQConstants.java   | 11 ++++++++---
 .../java/org/apache/jena/sparql/util/MappedLoader.java   |  2 ++
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/a719f679/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 9eda07f..488a802 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
@@ -61,13 +61,18 @@ public class ARQConstants
     public static final String javaClassURIScheme = "java:" ;
     
     /** The ARQ function library URI space */
-    public static final String ARQFunctionLibraryURI = "http://jena.hpl.hp.com/ARQ/function#" ;
+    public static final String ARQFunctionLibraryURI = "http://jena.apache.org/ARQ/function#" ;
+    /** The ARQ function library URI space - old Jena2 name */
+    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.hpl.hp.com/ARQ/property#" ;
+    public static final String ARQPropertyFunctionLibraryURI = "http://jena.apache.org/ARQ/property#" ;
+    
+    /** The ARQ property function library URI space - old Jena2 name */
+    public static final String ARQPropertyFunctionLibraryURI_Jena2 = "http://jena.hpl.hp.com/ARQ/property#" ;
     
     /** The ARQ procedure library URI space */
-    public static final String ARQProcedureLibraryURI = "http://jena.hpl.hp.com/ARQ/procedure#" ;
+    public static final String ARQProcedureLibraryURI = "http://jena.apache.org/ARQ/procedure#" ;
     
     /** The ARQ function library */
     public static final String ARQFunctionLibrary = javaClassURIScheme+"org.apache.jena.sparql.function.library." ;

http://git-wip-us.apache.org/repos/asf/jena/blob/a719f679/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 5e14bea..c254ab5 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
@@ -34,7 +34,9 @@ public class MappedLoader {
     static {
         // ARQ library
         uriMap.put(ARQConstants.ARQFunctionLibraryURI, ARQConstants.ARQFunctionLibrary);
+        uriMap.put(ARQConstants.ARQFunctionLibraryURI_Jena2, ARQConstants.ARQFunctionLibrary);
         uriMap.put(ARQConstants.ARQPropertyFunctionLibraryURI, ARQConstants.ARQPropertyFunctionLibrary);
+        uriMap.put(ARQConstants.ARQPropertyFunctionLibraryURI_Jena2, ARQConstants.ARQPropertyFunctionLibrary);
         uriMap.put(ARQConstants.ARQProcedureLibraryURI, ARQConstants.ARQProcedureLibrary);
 
         // Old name, new name