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 2012/10/14 17:41:14 UTC

svn commit: r1398098 - in /jena/trunk/jena-sdb: ./ src-test/com/hp/hpl/jena/sdb/test/modify/ src/com/hp/hpl/jena/sdb/engine/ src/com/hp/hpl/jena/sdb/store/

Author: andy
Date: Sun Oct 14 15:41:14 2012
New Revision: 1398098

URL: http://svn.apache.org/viewvc?rev=1398098&view=rev
Log:
Update SDB to use Jena 2.7.4-SNAPSHOT
Don't include "-tests.jar" in distribution.

Modified:
    jena/trunk/jena-sdb/assembly.xml
    jena/trunk/jena-sdb/pom.xml
    jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java
    jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
    jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java
    jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java

Modified: jena/trunk/jena-sdb/assembly.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/assembly.xml?rev=1398098&r1=1398097&r2=1398098&view=diff
==============================================================================
--- jena/trunk/jena-sdb/assembly.xml (original)
+++ jena/trunk/jena-sdb/assembly.xml Sun Oct 14 15:41:14 2012
@@ -29,7 +29,6 @@
   <dependencySets>
     <dependencySet>
       <unpack>false</unpack>
-      <scope>test</scope>
       <outputDirectory>lib</outputDirectory>
       <excludes>
 	<exclude>org.apache.derby:derby:</exclude>

Modified: jena/trunk/jena-sdb/pom.xml
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/pom.xml?rev=1398098&r1=1398097&r2=1398098&view=diff
==============================================================================
--- jena/trunk/jena-sdb/pom.xml (original)
+++ jena/trunk/jena-sdb/pom.xml Sun Oct 14 15:41:14 2012
@@ -41,8 +41,8 @@
 
   <properties>
     <this.root>${project.artifactId}-${project.version}</this.root>
-    <ver.jena>2.7.3</ver.jena>
-    <ver.arq>2.9.3</ver.arq>
+    <ver.jena>2.7.4-SNAPSHOT</ver.jena>
+    <ver.arq>2.9.4-SNAPSHOT</ver.arq>
     <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
     <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
   </properties>

Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java?rev=1398098&r1=1398097&r2=1398098&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdate.java Sun Oct 14 15:41:14 2012
@@ -19,15 +19,15 @@
 package com.hp.hpl.jena.sdb.test.modify;
 
 import junit.framework.JUnit4TestAdapter ;
-import junit.framework.TestSuite;
+import junit.framework.TestSuite ;
 
-import com.hp.hpl.jena.sdb.SDBFactory;
-import com.hp.hpl.jena.sdb.Store;
-import com.hp.hpl.jena.sdb.test.junit.SDBTestUtils;
-import com.hp.hpl.jena.sparql.modify.TestUpdateGraph ;
-import com.hp.hpl.jena.update.GraphStore;
+import com.hp.hpl.jena.sdb.SDBFactory ;
+import com.hp.hpl.jena.sdb.Store ;
+import com.hp.hpl.jena.sdb.test.junit.SDBTestUtils ;
+import com.hp.hpl.jena.sparql.modify.AbstractTestUpdateGraph ;
+import com.hp.hpl.jena.update.GraphStore ;
 
-public class TestSPARQLUpdate extends TestUpdateGraph
+public class TestSPARQLUpdate extends AbstractTestUpdateGraph
 {
     public static junit.framework.TestSuite suite() {
         TestSuite ts = new TestSuite();

Modified: jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java?rev=1398098&r1=1398097&r2=1398098&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java (original)
+++ jena/trunk/jena-sdb/src-test/com/hp/hpl/jena/sdb/test/modify/TestSPARQLUpdateMgt.java Sun Oct 14 15:41:14 2012
@@ -24,10 +24,10 @@ import junit.framework.TestSuite ;
 import com.hp.hpl.jena.sdb.SDBFactory ;
 import com.hp.hpl.jena.sdb.Store ;
 import com.hp.hpl.jena.sdb.test.junit.SDBTestUtils ;
-import com.hp.hpl.jena.sparql.modify.TestUpdateGraphMgt ;
+import com.hp.hpl.jena.sparql.modify.AbstractTestUpdateGraphMgt ;
 import com.hp.hpl.jena.update.GraphStore ;
 
-public class TestSPARQLUpdateMgt extends TestUpdateGraphMgt
+public class TestSPARQLUpdateMgt extends AbstractTestUpdateGraphMgt
 {
 
     public static TestSuite suite() {

Modified: jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java?rev=1398098&r1=1398097&r2=1398098&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java (original)
+++ jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/engine/QueryEngineSDB.java Sun Oct 14 15:41:14 2012
@@ -104,7 +104,7 @@ public class QueryEngineSDB extends Quer
         
         // Do property functions.
         op = Transformer.transform(new TransformPropertyFunction(context), op) ;
-        op = Transformer.transform(new TransformFilterEquality(false), op) ;
+        op = Transformer.transform(new TransformFilterEquality(), op) ;
         
         // Quad it now so it can be passed to Compile.compile
         op = Algebra.toQuadForm(op) ;

Modified: jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java?rev=1398098&r1=1398097&r2=1398098&view=diff
==============================================================================
--- jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java (original)
+++ jena/trunk/jena-sdb/src/com/hp/hpl/jena/sdb/store/DatasetStoreGraph.java Sun Oct 14 15:41:14 2012
@@ -67,13 +67,6 @@ public class DatasetStoreGraph extends D
     }
 
     //---- Update
-    @Override @Deprecated
-    public void startRequest()
-    {}
-
-    @Override  @Deprecated
-    public void finishRequest()
-    {}
 
     @Override
     public void startRequest(UpdateRequest request)