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/06/01 19:40:06 UTC
[1/3] jena git commit: Made all namespace variables public. This
fixes JENA-952
Repository: jena
Updated Branches:
refs/heads/master 7a8130df8 -> 86e0dd85e
Made all namespace variables public.
This fixes JENA-952
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fc1bbf3e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fc1bbf3e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fc1bbf3e
Branch: refs/heads/master
Commit: fc1bbf3e5f104ca0244ca337849544c1f49b9e46
Parents: 66c2566
Author: Claude Warren <cl...@apache.org>
Authored: Mon Jun 1 17:12:56 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Mon Jun 1 17:12:56 2015 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/vocabulary/DC_10.java | 5 ++++-
jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java | 5 ++++-
jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/RDFSyntax.java | 6 ++++--
jena-core/src/main/java/org/apache/jena/vocabulary/RSS.java | 5 ++++-
jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/SKOSXL.java | 2 +-
.../src/main/java/org/apache/jena/vocabulary/VCARD.java | 5 ++++-
jena-core/src/main/java/org/apache/jena/vocabulary/XSD.java | 8 ++++++--
9 files changed, 29 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/DC_10.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/DC_10.java b/jena-core/src/main/java/org/apache/jena/vocabulary/DC_10.java
index 014b96d..1ac0a73 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/DC_10.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/DC_10.java
@@ -25,7 +25,10 @@ import org.apache.jena.rdf.model.* ;
public class DC_10 {
- protected static final String uri =
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String uri =
"http://purl.org/dc/elements/1.0/";
/** returns the URI for this schema
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
index d62fe49..55e3740 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDF.java
@@ -32,7 +32,10 @@ import org.apache.jena.rdf.model.ResourceFactory ;
public class RDF{
- protected static final String uri ="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String uri ="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
/** returns the URI for this schema
@return the URI for this schema
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
index ff4dd42..2600b57 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
@@ -26,7 +26,7 @@ import org.apache.jena.rdf.model.* ;
*/
public class RDFS {
- protected static final String uri="http://www.w3.org/2000/01/rdf-schema#";
+ public static final String uri="http://www.w3.org/2000/01/rdf-schema#";
protected static final Resource resource( String local )
{ return ResourceFactory.createResource( uri + local ); }
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/RDFSyntax.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFSyntax.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFSyntax.java
index e716bb2..4160c4f 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFSyntax.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFSyntax.java
@@ -30,8 +30,10 @@ import org.apache.jena.rdf.model.impl.ResourceImpl ;
* behaviour concerning these rules.
*/
public class RDFSyntax {
-protected static final String uri =
- "http://www.w3.org/TR/rdf-syntax-grammar#";
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String uri ="http://www.w3.org/TR/rdf-syntax-grammar#";
static public String getURI() {
return uri;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/RSS.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RSS.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RSS.java
index 1463236..ed8bbe0 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RSS.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RSS.java
@@ -25,7 +25,10 @@ import org.apache.jena.rdf.model.* ;
*/
public class RSS extends Object {
- protected static final String uri = "http://purl.org/rss/1.0/";
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String uri = "http://purl.org/rss/1.0/";
/** returns the URI for this schema
@return the URI for this schema
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
index 0df1e25..4f3a40f 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOS.java
@@ -36,7 +36,7 @@ public class SKOS {
/**
* The namespace of the SKOS vocabulary as a string
*/
- protected static final String uri = "http://www.w3.org/2004/02/skos/core#";
+ public static final String uri = "http://www.w3.org/2004/02/skos/core#";
/**
* Returns the namespace of the SKOS schema as a string
* @return the namespace of the SKOS schema
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
index 915fd6c..c09047b 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/SKOSXL.java
@@ -35,7 +35,7 @@ public class SKOSXL {
/**
* The namespace of the SKOS-XL vocabulary as a string
*/
- protected static final String uri = "http://www.w3.org/2008/05/skos-xl#";
+ public static final String uri = "http://www.w3.org/2008/05/skos-xl#";
/**
* Returns the namespace of the SKOS-XL schema as a string
* @return the namespace of the SKOS-XL schema
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java b/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
index 29f5fa1..506e1f0 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/VCARD.java
@@ -29,7 +29,10 @@ import org.apache.jena.rdf.model.* ;
*/
public class VCARD {
- protected static final String uri ="http://www.w3.org/2001/vcard-rdf/3.0#";
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String uri ="http://www.w3.org/2001/vcard-rdf/3.0#";
/** returns the URI for this schema
* @return the URI for this schema
http://git-wip-us.apache.org/repos/asf/jena/blob/fc1bbf3e/jena-core/src/main/java/org/apache/jena/vocabulary/XSD.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/XSD.java b/jena-core/src/main/java/org/apache/jena/vocabulary/XSD.java
index 82ecdba..4cce604 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/XSD.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/XSD.java
@@ -26,12 +26,16 @@ import org.apache.jena.rdf.model.ResourceFactory ;
* Defines Jena resources corresponding to the URIs for
* the XSD primitive datatypes which are known to Jena.
*/
-public class XSD {
+public class XSD {
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String NS = XSDDatatype.XSD + "#";
/**
* The RDF-friendly version of the XSD namespace
* with trailing # character.
*/
- public static String getURI() { return XSDDatatype.XSD + "#"; }
+ public static String getURI() { return NS; }
/** Resource URI for xsd:float */
public static Resource xfloat;
[3/3] jena git commit: make namespace public in RDFS.java for JENA-952
Posted by cl...@apache.org.
make namespace public in RDFS.java for JENA-952
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/86e0dd85
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/86e0dd85
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/86e0dd85
Branch: refs/heads/master
Commit: 86e0dd85e2391b6d663f793f24348fd4a68f9191
Parents: e5bc217
Author: Claude Warren <cl...@apache.org>
Authored: Mon Jun 1 17:22:28 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Mon Jun 1 17:22:28 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/86e0dd85/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
index 2600b57..1d29111 100644
--- a/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
+++ b/jena-core/src/main/java/org/apache/jena/vocabulary/RDFS.java
@@ -26,7 +26,10 @@ import org.apache.jena.rdf.model.* ;
*/
public class RDFS {
- public static final String uri="http://www.w3.org/2000/01/rdf-schema#";
+ /**
+ * The namespace of the vocabulary as a string
+ */
+ public static final String uri="http://www.w3.org/2000/01/rdf-schema#";
protected static final Resource resource( String local )
{ return ResourceFactory.createResource( uri + local ); }
[2/3] jena git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/jena
Posted by cl...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e5bc2171
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e5bc2171
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e5bc2171
Branch: refs/heads/master
Commit: e5bc217154d4957a49b6e4fd8f6798a0aa68b2d4
Parents: fc1bbf3 7a8130d
Author: Claude Warren <cl...@apache.org>
Authored: Mon Jun 1 17:20:09 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Mon Jun 1 17:20:09 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/async/AsyncPool.java | 4 +-
.../org/apache/jena/fuseki/async/AsyncTask.java | 9 +-
.../apache/jena/fuseki/mgt/ActionAsyncTask.java | 8 -
.../apache/jena/fuseki/mgt/ActionDatasets.java | 10 +-
.../java/org/apache/jena/fuseki/mgt/Async.java | 17 +-
.../org/apache/jena/fuseki/mgt/JsonConst.java | 49 ++--
.../js/app/templates/dataset-management.tpl | 3 +-
.../webapp/js/app/views/dataset-management.js | 16 +-
.../java/org/apache/jena/jdbc/JenaDriver.java | 4 +-
.../jdbc/connections/DatasetConnection.java | 6 +-
.../jena/jdbc/connections/JenaConnection.java | 23 +-
.../jena/jdbc/metadata/DatasetMetadata.java | 4 +-
.../apache/jena/jdbc/metadata/JenaMetadata.java | 294 +++++++++----------
.../jdbc/metadata/results/MetaResultSet.java | 40 +--
.../apache/jena/jdbc/results/AskResults.java | 16 +-
.../apache/jena/jdbc/results/JenaResultSet.java | 20 +-
.../jena/jdbc/results/MaterializedResults.java | 8 +-
.../jdbc/results/MaterializedSelectResults.java | 12 +-
.../jdbc/results/QueryExecutionResults.java | 2 +-
.../apache/jena/jdbc/results/SelectResults.java | 4 +-
.../jena/jdbc/results/StreamedResults.java | 8 +-
.../jdbc/results/TripleIteratorResults.java | 4 +-
.../jena/jdbc/results/TripleListResults.java | 12 +-
.../metadata/AbstractResultsMetadata.java | 9 +-
.../statements/DatasetPreparedStatement.java | 2 +-
.../jena/jdbc/statements/DatasetStatement.java | 2 +-
.../jdbc/statements/JenaPreparedStatement.java | 16 +-
.../jena/jdbc/statements/JenaStatement.java | 46 +--
.../metadata/JenaParameterMetadata.java | 2 +-
.../AbstractJenaConnectionTests.java | 6 +-
.../jena/jdbc/postprocessing/ResultsEcho.java | 3 +-
.../apache/jena/jdbc/preprocessing/Echo.java | 7 +-
.../statements/AbstractJenaStatementTests.java | 15 +-
.../jdbc/mem/connections/MemConnection.java | 2 +-
.../jdbc/mem/metadata/MemDatasetMetadata.java | 18 +-
.../jena/jdbc/mem/results/TestResultSets.java | 4 +-
.../connections/RemoteEndpointConnection.java | 14 +-
.../remote/metadata/RemoteEndpointMetadata.java | 22 +-
.../RemoteEndpointPreparedStatement.java | 2 +-
.../statements/RemoteEndpointStatement.java | 2 +-
...stRemoteEndpointConnectionWithGraphUris.java | 2 +-
.../results/TestRemoteEndpointResults.java | 6 +-
.../TestRemoteEndpointResultsWithAuth.java | 6 +-
.../TestRemoteEndpointResultsWithGraphUris.java | 6 +-
...RemoteEndpointResultsWithResultSetTypes.java | 6 +-
.../jdbc/tdb/connections/TDBConnection.java | 2 +-
.../jdbc/tdb/metadata/TDBDatasetMetadata.java | 24 +-
.../jdbc/tdb/results/TestTdbDiskResultSets.java | 4 +-
.../jdbc/tdb/results/TestTdbMemResultSets.java | 4 +-
49 files changed, 392 insertions(+), 413 deletions(-)
----------------------------------------------------------------------