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:55:49 UTC
[1/5] jena git commit: Remove leakage of command tools.
Repository: jena
Updated Branches:
refs/heads/add-contract-tests d492e5406 -> 6908e1c4b
Remove leakage of command tools.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1cad38a5
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1cad38a5
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1cad38a5
Branch: refs/heads/add-contract-tests
Commit: 1cad38a5c59959d84bb3ad6ccb1ebe97b884d0ee
Parents: d2da6f7
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 9 10:34:37 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 9 10:34:37 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/jena/tdb/assembler/SettingAssembler.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1cad38a5/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/SettingAssembler.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/SettingAssembler.java b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/SettingAssembler.java
index 7d3016e..bb444c2 100644
--- a/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/SettingAssembler.java
+++ b/jena-tdb/src/main/java/org/apache/jena/tdb/assembler/SettingAssembler.java
@@ -28,12 +28,10 @@ import org.apache.jena.assembler.Mode ;
import org.apache.jena.query.ARQ ;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.sparql.util.Symbol ;
-import tdb.cmdline.CmdTDB ;
public class SettingAssembler //extends DatasetAssembler
{
- static { CmdTDB.init() ; }
-
+ public SettingAssembler() {}
/*
* :setting [ :name tdbsym:name ; :value "SPO.idx" ]
*/
[4/5] jena git commit: added contract-test module to pom
Posted by cl...@apache.org.
added contract-test module to pom
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2e62ed0f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2e62ed0f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2e62ed0f
Branch: refs/heads/add-contract-tests
Commit: 2e62ed0f8635601c8adbddbf2e043128e018f1a8
Parents: d492e54
Author: Claude Warren <cl...@apache.org>
Authored: Sat May 16 09:52:11 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sat May 16 09:52:11 2015 +0100
----------------------------------------------------------------------
jena-core/pom.xml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2e62ed0f/jena-core/pom.xml
----------------------------------------------------------------------
diff --git a/jena-core/pom.xml b/jena-core/pom.xml
index ab2be30..70e0dba 100644
--- a/jena-core/pom.xml
+++ b/jena-core/pom.xml
@@ -60,7 +60,14 @@
<dependency>
<groupId>org.xenei</groupId>
<artifactId>junit-contracts</artifactId>
- <version>0.0.5</version>
+ <version>0.1.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <version>0.1.1</version>
<scope>test</scope>
</dependency>
@@ -189,6 +196,47 @@
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.xenei</groupId>
+ <artifactId>contract-test-maven-plugin</artifactId>
+ <configuration>
+ <packages>
+ <package>org.apache.jena.assembler</package>
+ <package>org.apache.jena.datatypes</package>
+ <package>org.apache.jena.enhanced</package>
+ <package>org.apache.jena.graph</package>
+ <package>org.apache.jena.mem</package>
+ <package>org.apache.jena.n3</package>
+ <package>org.apache.jena.ontology</package>
+ <package>org.apache.jena.rdf</package>
+ <package>org.apache.jena.rdfxml</package>
+ <package>org.apache.jena.reasoner</package>
+ <package>org.apache.jena.shared</package>
+ <package>org.apache.jena.util</package>
+ <package>org.apache.jena.vocabulary</package>
+ </packages>
+ <unimplemented>
+ <report>true</report>
+ <failOnError>false</failOnError>
+ </unimplemented>
+ <untested>
+ <report>true</report>
+ <failOnError>false</failOnError>
+ </untested>
+ <errors>
+ <report>true</report>
+ <failOnError>false</failOnError>
+ </errors>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>contract-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId>
</plugin> <!- - see: http://maven.apache.org/guides/mini/guide-attached-tests.html
[5/5] jena git commit: Merge branch 'master' into add-contract-tests
Posted by cl...@apache.org.
Merge branch 'master' into add-contract-tests
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6908e1c4
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6908e1c4
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6908e1c4
Branch: refs/heads/add-contract-tests
Commit: 6908e1c4b921fc8a5c8e5f5c65da0e7cd407aa16
Parents: 2e62ed0 e5035f4
Author: Claude Warren <cl...@apache.org>
Authored: Sat May 16 09:53:34 2015 +0100
Committer: Claude Warren <cl...@apache.org>
Committed: Sat May 16 09:53:34 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/lib/cache/CacheSimple.java | 15 +++++++++++----
.../apache/jena/tdb/assembler/SettingAssembler.java | 4 +---
2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/5] jena git commit: Fix counting of current size.
Posted by cl...@apache.org.
Fix counting of current size.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/e5035f4b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/e5035f4b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/e5035f4b
Branch: refs/heads/add-contract-tests
Commit: e5035f4bfca48e84b12d49b03680a82f63aca591
Parents: f64c702
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 9 21:12:50 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 9 21:12:50 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/atlas/lib/cache/CacheSimple.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/e5035f4b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java
index 9f889dd..ddd81f6 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSimple.java
@@ -115,16 +115,18 @@ public class CacheSimple<K,V> implements Cache<K,V>
old = values[x] ;
if ( dropHandler != null )
dropHandler.accept(keys[x], old) ;
- currentSize-- ;
+ if ( old != null )
+ currentSize-- ;
}
+ // Already decremented if we are overwriting a full slot.
values[x] = thing ;
- if ( thing == null )
+ if ( thing == null ) {
//put(,null) is a remove.
keys[x] = null ;
- else {
- keys[x] = key ;
+ } else {
currentSize++ ;
+ keys[x] = key ;
}
}
@@ -138,6 +140,11 @@ public class CacheSimple<K,V> implements Cache<K,V>
public long size()
{
return currentSize ;
+// long x = 0 ;
+// for ( K key : keys )
+// if ( key != null )
+// x++ ;
+// return x ;
}
@Override
[2/5] 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/f64c7023
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f64c7023
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f64c7023
Branch: refs/heads/add-contract-tests
Commit: f64c70233d0b6b8b246d5350f13752d38e706016
Parents: 1cad38a eb7760d
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 9 11:54:36 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 9 11:54:36 2015 +0100
----------------------------------------------------------------------
jena-permissions/NOTICE | 6 +++++-
jena-permissions/pom.xml | 15 ---------------
2 files changed, 5 insertions(+), 16 deletions(-)
----------------------------------------------------------------------