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 2016/03/03 10:54:41 UTC
[1/6] jena git commit: Delete unused.
Repository: jena
Updated Branches:
refs/heads/master 5cbb1f1de -> e2d5657e8
Delete unused.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/31ce5805
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/31ce5805
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/31ce5805
Branch: refs/heads/master
Commit: 31ce58053f5f04c5c26a14b0282a5feba56c3672
Parents: 171cfc3
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Mar 1 15:29:41 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 3 09:52:38 2016 +0000
----------------------------------------------------------------------
.../org/apache/jena/atlas/lib/CacheStats.java | 28 --------------------
1 file changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/31ce5805/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheStats.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheStats.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheStats.java
deleted file mode 100644
index d71c1a0..0000000
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheStats.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.atlas.lib;
-
-/** A cache with some readable statistics */
-public interface CacheStats<K,V> extends Cache<K,V>
-{
- public long getCacheEntries() ;
- public long getCacheHits() ;
- public long getCacheMisses() ;
- public long getCacheEjects() ;
-}
[5/6] jena git commit: Remove tabs
Posted by an...@apache.org.
Remove tabs
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e2d5657e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e2d5657e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e2d5657e
Branch: refs/heads/master
Commit: e2d5657e8470fe5a226d87bf276fbeeea3c34ef6
Parents: b2c5637
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 3 09:51:06 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 3 09:54:15 2016 +0000
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e2d5657e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dcc85fe..3c5f4df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,20 +66,20 @@
<!-- The maven artifacts of the basic modules -->
<modules>
<module>jena-parent</module>
- <!-- <module>jena-shared-guava</module> -->
- <!-- <module>jena-iri</module> -->
- <module>jena-base</module>
-
- <module>jena-core</module>
+ <!-- <module>jena-shared-guava</module> -->
+ <!-- <module>jena-iri</module> -->
+ <module>jena-base</module>
+
+ <module>jena-core</module>
<module>jena-arq</module>
<module>jena-tdb</module>
- <module>apache-jena-libs</module>
+ <module>apache-jena-libs</module>
<module>jena-cmds</module>
<!--<module>jena-fuseki1</module>-->
- <module>jena-fuseki2</module>
+ <module>jena-fuseki2</module>
- <module>jena-permissions</module>
+ <module>jena-permissions</module>
<!-- Slow to build - exclude from dev build -->
<!-- <module>jena-jdbc</module> -->
@@ -87,7 +87,7 @@
<!-- <module>apache-jena-libs</module> -->
<!-- <module>apache-jena</module> -->
<!-- <module>jena-elephas</module> -->
- <!-- <module>jena-extras</module> -->
+ <!-- <module>jena-extras</module> -->
</modules>
</profile>
@@ -114,17 +114,17 @@
<module>jena-arq</module>
<module>jena-tdb</module>
<module>apache-jena-libs</module>
- <module>jena-cmds</module>
+ <module>jena-cmds</module>
<module>jena-text</module>
<module>jena-spatial</module>
<module>jena-csv</module>
- <module>jena-sdb</module>
+ <module>jena-sdb</module>
<module>jena-fuseki1</module>
<module>jena-fuseki2</module>
- <module>jena-permissions</module>
+ <module>jena-permissions</module>
<module>jena-jdbc</module>
<module>jena-maven-tools</module>
[3/6] jena git commit: Don't put internal details in external error
message
Posted by an...@apache.org.
Don't put internal details in external error message
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3978493b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3978493b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3978493b
Branch: refs/heads/master
Commit: 3978493b9c89019b04ff389dd0e82e2a39dbf971
Parents: 17a96ba
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 3 08:38:36 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 3 09:54:15 2016 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3978493b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java
index 5975a0e..eec4863 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java
@@ -455,7 +455,7 @@ public class XMLHandler extends LexicalHandlerImpl implements ARPErrorNumbers,
} catch (MalformedURLException e) {
warning(null,
WARN_BAD_NAMESPACE_URI,
- "toAscii failed for namespace URI: <"
+ "Bad namespace URI: <"
+ u.toString()
+ ">. " + e.getMessage());
}
[4/6] jena git commit: Test for empty IDN part.
Posted by an...@apache.org.
Test for empty IDN part.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b2c56378
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b2c56378
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b2c56378
Branch: refs/heads/master
Commit: b2c5637853c8c48746bcad3fe2beaf517e884e08
Parents: 3978493
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 3 08:39:22 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 3 09:54:15 2016 +0000
----------------------------------------------------------------------
jena-iri/src/main/java/org/apache/jena/iri/impl/IDNP.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b2c56378/jena-iri/src/main/java/org/apache/jena/iri/impl/IDNP.java
----------------------------------------------------------------------
diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/IDNP.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/IDNP.java
index fdf1c46..63125da 100644
--- a/jena-iri/src/main/java/org/apache/jena/iri/impl/IDNP.java
+++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/IDNP.java
@@ -45,6 +45,8 @@ public class IDNP {
// We try to follow java.net.IDN behaviour in our exceptions, in anticipation
// of dumping this class.
private static void checkPart(String part) {
+ if ( part.isEmpty() )
+ throw new IllegalArgumentException("Empty IDN part");
if (part.charAt(0) == '-' ||
part.charAt(part.length() - 1) == '-') {
throw new IllegalArgumentException("Has leading or trailing hyphen");
[2/6] jena git commit: Expose internal stats.
Posted by an...@apache.org.
Expose internal stats.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/171cfc32
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/171cfc32
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/171cfc32
Branch: refs/heads/master
Commit: 171cfc323287f2c5e6415c20f022ede654cc9e79
Parents: 5cbb1f1
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Mar 1 15:29:31 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 3 09:52:38 2016 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/atlas/lib/cache/CacheGuava.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/171cfc32/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheGuava.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheGuava.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheGuava.java
index 8dd77e6..88a7777 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheGuava.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheGuava.java
@@ -24,13 +24,13 @@ import java.util.concurrent.ExecutionException ;
import java.util.function.BiConsumer ;
import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.ext.com.google.common.cache.CacheStats ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.ext.com.google.common.cache.CacheBuilder ;
import org.apache.jena.ext.com.google.common.cache.RemovalListener ;
/** Wrapper around a shaded com.google.common.cache */
-final public class CacheGuava<K,V> implements Cache<K, V>
-
+final public class CacheGuava<K,V> implements Cache<K, V>
{
private BiConsumer<K, V> dropHandler = null ;
@@ -110,5 +110,9 @@ final public class CacheGuava<K,V> implements Cache<K, V>
public void setDropHandler(BiConsumer<K, V> dropHandler) {
this.dropHandler = dropHandler ;
}
+
+ public CacheStats stats() {
+ return cache.stats() ;
+ }
}
[6/6] jena git commit: Remove surrounding <> from command line
argument.
Posted by an...@apache.org.
Remove surrounding <> from command line argument.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17a96ba7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17a96ba7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17a96ba7
Branch: refs/heads/master
Commit: 17a96ba7896a57a5715060c29be33895bfb1ffc9
Parents: 31ce580
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Mar 3 08:30:49 2016 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Mar 3 09:54:15 2016 +0000
----------------------------------------------------------------------
jena-cmds/src/main/java/arq/iri.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/17a96ba7/jena-cmds/src/main/java/arq/iri.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/arq/iri.java b/jena-cmds/src/main/java/arq/iri.java
index 2d5232c..4f3cc50 100644
--- a/jena-cmds/src/main/java/arq/iri.java
+++ b/jena-cmds/src/main/java/arq/iri.java
@@ -37,6 +37,9 @@ public class iri
boolean first = true ;
for ( String iriStr : args )
{
+ if ( iriStr.startsWith("<") && iriStr.endsWith(">") )
+ iriStr = iriStr.substring(1, iriStr.length()-1) ;
+
if ( ! first )
System.out.println() ;
first = false ;