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 2011/09/28 19:42:59 UTC

svn commit: r1176980 - in /incubator/jena: Jena2/ARQ/trunk/D.ttl Jena2/ARQ/trunk/Q.rq Jena2/ARQ/trunk/pom2.xml Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java Scratch/AFS/trunk/src-dev/dev/BindingN.java

Author: andy
Date: Wed Sep 28 17:42:59 2011
New Revision: 1176980

URL: http://svn.apache.org/viewvc?rev=1176980&view=rev
Log: (empty)

Added:
    incubator/jena/Scratch/AFS/trunk/src-dev/dev/BindingN.java   (with props)
Modified:
    incubator/jena/Jena2/ARQ/trunk/D.ttl
    incubator/jena/Jena2/ARQ/trunk/Q.rq
    incubator/jena/Jena2/ARQ/trunk/pom2.xml
    incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java

Modified: incubator/jena/Jena2/ARQ/trunk/D.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/D.ttl?rev=1176980&r1=1176979&r2=1176980&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/jena/Jena2/ARQ/trunk/Q.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/Q.rq?rev=1176980&r1=1176979&r2=1176980&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/Q.rq (original)
+++ incubator/jena/Jena2/ARQ/trunk/Q.rq Wed Sep 28 17:42:59 2011
@@ -1,5 +1,4 @@
 PREFIX :	<http://www.example.org/>
 
-SELECT (count(*) AS ?c)
-{ ?s ?p ?o
-} GROUP BY ?s
+SELECT *
+{  ?x   ^(:a/:b)   ?y  }

Modified: incubator/jena/Jena2/ARQ/trunk/pom2.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/pom2.xml?rev=1176980&r1=1176979&r2=1176980&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/pom2.xml (original)
+++ incubator/jena/Jena2/ARQ/trunk/pom2.xml Wed Sep 28 17:42:59 2011
@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.apache.jena</groupId>
-  <artifactId>arq</artifactId>
+  <artifactId>jena-arq</artifactId>
   <packaging>jar</packaging>
   <name>ARQ</name>
   <version>${ver.arq}</version>
@@ -32,7 +32,7 @@
     <ver.lucene>2.3.1</ver.lucene>
     <ver.http-client>4.1.2</ver.http-client>
     <ver.commons-codec>1.5</ver.commons-codec>
-    <assembly.root.name>apache-jena-${project.artifactId}-${project.version}</assembly.root.name>
+    <assembly.root.name>apache-${project.artifactId}-${project.version}</assembly.root.name>
 
   </properties>
 
@@ -212,14 +212,11 @@ build.time.txt=${build.time.txt}
         hence two executions configured -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <!--  But we want one with appendAssemblyId=false and one with it defaulting to true.
         <configuration>
           <descriptors>
             <descriptor>assembly.xml</descriptor>
-            <descriptor>assembly-testing.xml</descriptor>
           </descriptors>
         </configuration>
-        -->
 	<executions>
 	  <execution>
 	    <id>create-assembly</id>
@@ -235,20 +232,6 @@ build.time.txt=${build.time.txt}
 	      </descriptors>
 	    </configuration>
 	  </execution>
-	  <execution>
-	    <id>create-assembly-test</id>
-	    <phase>package</phase>
-	    <goals>
-	      <goal>single</goal>
-	    </goals>
-	    <configuration>
-	      <finalName>${assembly.root.name}-tests</finalName>
-	      <appendAssemblyId>false</appendAssemblyId>
-	      <descriptors>
-		<descriptor>assembly-testing.xml</descriptor>
-          	  </descriptors>
-	    </configuration>
-	  </execution>
 	</executions>
       </plugin>
 

Modified: incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java?rev=1176980&r1=1176979&r2=1176980&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/DevFuseki.java Wed Sep 28 17:42:59 2011
@@ -20,6 +20,8 @@ package dev;
 
 public class DevFuseki
 {
+    // SPARQL_QueryDataset.vialidate query -- but FROM etc is important for TDB. 
+    
     // Config:
     //   fuseki:name ==> fuseki:serviceName of fuseki:endpointBase 
     //   rdfs:label for log files.

Added: incubator/jena/Scratch/AFS/trunk/src-dev/dev/BindingN.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/trunk/src-dev/dev/BindingN.java?rev=1176980&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/trunk/src-dev/dev/BindingN.java (added)
+++ incubator/jena/Scratch/AFS/trunk/src-dev/dev/BindingN.java Wed Sep 28 17:42:59 2011
@@ -0,0 +1,122 @@
+/**
+ * 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 dev;
+
+import java.util.Iterator ;
+
+import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
+import com.hp.hpl.jena.sparql.core.Var ;
+import com.hp.hpl.jena.sparql.engine.binding.Binding ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingBase ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingMap ;
+import com.hp.hpl.jena.sparql.engine.binding.BindingUtils ;
+
+public class BindingN extends BindingBase implements BindingMap
+{
+    protected BindingN() { this(null) ; }
+    
+    protected BindingN(Binding _parent)
+    {
+        super(_parent) ;
+    }
+
+    // Or dynamically switch to using a pair of [].
+    
+    private Var var1 = null ;
+    private Node node1 = null ;
+    
+    private Var var2 = null ;
+    private Node node2 = null ;
+
+    private Var var3 = null ;
+    private Node node3 = null ;
+    
+    
+    @Override
+    protected Iterator<Var> vars1()
+    {
+        return null ;
+    }
+    
+    @Override
+    protected int size1()
+    {
+        if ( var1 == null ) return 0 ;
+        if ( var2 == null ) return 1 ;
+        if ( var3 == null ) return 2 ;
+        return 3 ;
+    }
+    
+    @Override
+    protected boolean isEmpty1()
+    {
+        return var1 == null ;
+    }
+    
+    @Override
+    protected boolean contains1(Var var)
+    {
+        if ( var == null ) return false ;
+
+        if ( var1 == null ) return false ;
+        if ( var.equals(var1) ) return true ;
+
+        if ( var2 == null ) return false ;
+        if ( var.equals(var2) ) return true ;
+
+        if ( var3 == null ) return false ;
+        if ( var.equals(var3) ) return true ;
+        
+        return false ;
+    }
+    
+    @Override
+    protected Node get1(Var var)
+    {
+        if ( var == null ) return null ;
+        
+        if ( var1 == null ) return null ;
+        if ( var.equals(var1) ) return node1 ;
+        
+        if ( var2 == null ) return null ;
+        if ( var.equals(var2) ) return node2 ;
+        
+        if ( var3 == null ) return null ;
+        if ( var.equals(var3) ) return node3 ;
+        
+        return null ;
+    }
+
+    @Override
+    public void add(Var var, Node node)
+    {
+        if ( var1 != null ) { var1 = var ; node1 = node ; return ; }
+        if ( var2 != null ) { var2 = var ; node2 = node ; return ; }
+        if ( var3 != null ) { var3 = var ; node3 = node ; return ; }
+        throw new ARQInternalErrorException("BindingN; already full") ;
+    }
+
+    @Override
+    final public void addAll(Binding other)
+    {
+        BindingUtils.addAll(this, other) ;
+    }
+}
+

Propchange: incubator/jena/Scratch/AFS/trunk/src-dev/dev/BindingN.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain