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/04/15 21:14:59 UTC

[1/2] jena git commit: Make context setting purely local

Repository: jena
Updated Branches:
  refs/heads/master d6609fad2 -> 4b9116ced


Make context setting purely local


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

Branch: refs/heads/master
Commit: 86670670b5cbf48e07f98eb8d8b63e357aef2fd7
Parents: d6609fa
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Apr 15 19:27:10 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Apr 15 19:27:10 2016 +0100

----------------------------------------------------------------------
 jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java               | 2 --
 .../src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/86670670/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
index 6816f28..00a527b 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/SDB.java
@@ -95,8 +95,6 @@ public class SDB
             initialized = true ;
             JenaSystem.logLifecycle("SDB.init - start") ;
 
-            // Better not to break up BGPs too much.
-            ARQ.getContext().set(ARQ.optFilterPlacement, false) ;
             MappingRegistry.addPrefixMapping(SDB.symbolPrefix, SDB.symbolSpace) ;
 
             // Default is 1000 4Kpages.

http://git-wip-us.apache.org/repos/asf/jena/blob/86670670/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java b/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
index 333e651..ed5fc12 100644
--- a/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
+++ b/jena-sdb/src/main/java/org/apache/jena/sdb/engine/QueryEngineSDB.java
@@ -80,6 +80,9 @@ public class QueryEngineSDB extends QueryEngineBase
     {
         if ( context == null )
             context = ARQ.getContext().copy() ;
+        // Better (?) not to break BGPs up
+        context.set(ARQ.optFilterPlacementBGP, false) ;
+
         // See "DynamicDatasets" -- this could be enabled.
         if ( query != null )
         {


[2/2] jena git commit: JENA-913 : OSGi tests break in preflight 'verify'

Posted by an...@apache.org.
JENA-913 : OSGi tests break in preflight 'verify'


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

Branch: refs/heads/master
Commit: 4b9116cedd204d9d6fda1ceb7013436dd3ab576b
Parents: 8667067
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Apr 15 20:14:52 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Apr 15 20:14:52 2016 +0100

----------------------------------------------------------------------
 apache-jena-osgi/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/4b9116ce/apache-jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/pom.xml b/apache-jena-osgi/pom.xml
index d2450bf..635320a 100644
--- a/apache-jena-osgi/pom.xml
+++ b/apache-jena-osgi/pom.xml
@@ -46,7 +46,11 @@
   <modules>
     <module>jena-osgi</module>
     <module>jena-osgi-features</module>
-    <module>jena-osgi-test</module>
+    <!--
+        See JENA-913 - tests do not work with "mvn clean verify"
+        only with an "install"
+        <module>jena-osgi-test</module>
+    -->
   </modules>
   
 </project>