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/30 15:32:03 UTC

svn commit: r1177649 [1/4] - in /incubator/jena/Scratch/AFS/Jena-Dev/trunk: ./ .settings/ Archive/ Archive/Lists/ Archive/ResultSet/ Archive/SSE/ Grammar/ src/ src/dev/ src/fm2/ src/fm2/atlas/ src/fm2/jenautil/ src/opexec/ src/reports/ src/reports/arch...

Author: andy
Date: Fri Sep 30 13:32:00 2011
New Revision: 1177649

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

Added:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/.project   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-first.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-last.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-first.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-last.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-1.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-2.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/dwim   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/README.txt
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/data.n3
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.rq
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.srx
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example2.rq
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xq
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xsl
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-xslt.html
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rnc
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rng
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.xsd
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/D.ttl
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/all.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/expr.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/graph.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/op.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/proc.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/resultset.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/table.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/test.sse
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-ant.zip   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-standalone.xml
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivy.xml
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivysettings.xml
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-src.zip   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-testing.zip   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/publishToJena
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/rdql-arq.jjt
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/rdql-arq.jjt
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/rdql.zip   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/sparql-update-submission-src.zip   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/sparql-update-submission.jj
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql-update-submission.jj
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/sparql_10-REC.jj
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/sparql_10-REC.jj
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/update-submission.jj
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/Archive/update-submission.jj
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.nq
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/D.nq
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.nt
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/D.nt
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.trig
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/D.trig
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/D.ttl
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/D.ttl
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/D1.ttl
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/D1.ttl
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Grammar/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Grammar/AFS_json_notes.txt
      - copied, changed from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/AFS_json_notes.txt
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Grammar/json-extra-bak.jj
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra-bak.jj
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Grammar/json-extra.jj
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Grammar/json-extra.jj
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Q.arq
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Q.arq
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/Q.rq
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/Q.rq
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/U.ru
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/U.ru
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/XSDdatatypes.txt
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/XSDdatatypes.txt
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/infer
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/infer
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/perf
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/perf
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/AllTestsARQ.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/DSG_Notify.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/DT_DayTimeDuration.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/DevARQ.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/IsomorphoricResultSets.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/ModelReadCloseTest.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunARQ.java   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/RunHTTP.java   (with props)
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/TransformPropertyPathFlatten.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/TestFileManager.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/LocationMapper.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/Locator.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/LocatorClassLoader.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/LocatorFile.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/LocatorURL.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/LocatorZip.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/StreamManager.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/TS_IO2.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/TestLocationMapper.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/TestLocators.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/atlas/TestStreamManager.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/jenautil/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/jenautil/FileManager2.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/fm2/jenautil/JenaIOEnvironment.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/opexec/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/opexec/OpExecutorExample.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportDBPedia2.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportDatasetGraphAddNPE.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportFilterEquality.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportOracle1.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportPathCycles.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportReifierRemove.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/ReportRemoteVirtuoso.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAddingFilter.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportAssignSubstitute.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportCopySubstituteNoContext.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportDuplicateBNodes.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportEventUpdate.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportGraphBind.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportRemoteService.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportServiceVarRename.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportSlowDatatype.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportUnclosedIterator.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportUpdate1.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/update.ru
      - copied unchanged from r1177235, incubator/jena/Jena2/ARQ/trunk/update.ru

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath Fri Sep 30 13:32:00 2011
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+  <classpathentry kind="src" path="src"/>
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+  <classpathentry combineaccessrules="false" kind="src" path="/ARQ"/>
+  <classpathentry kind="output" path="classes"/>
+
+  <classpathentry kind="var" 
+		  path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" 
+		  sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
+  <classpathentry kind="var" 
+		  path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"
+		  sourcepath="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar"/>
+  <classpathentry kind="var" 
+		  path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar"
+		  sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar"
+		  sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar"
+		  sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/com/hp/hpl/jena/iri/0.8/iri-0.8.jar"
+		  sourcepath="M2_REPO/com/hp/hpl/jena/iri/0.8/iri-0.8-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-tests.jar"
+		  sourcepath="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-test-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4.jar"
+		  sourcepath="M2_REPO/com/hp/hpl/jena/jena/2.6.4/jena-2.6.4-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar"
+		  sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar"
+		  sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1.jar"
+		  sourcepath="M2_REPO/org/apache/lucene/lucene-core/2.3.1/lucene-core-2.3.1-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar"
+		  sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar"
+		  sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar"
+		  sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9.jar"
+		  sourcepath="M2_REPO/org/codehaus/woodstox/wstx-asl/3.2.9/wstx-asl-3.2.9-sources.jar"/>
+  <classpathentry kind="var"
+		  path="M2_REPO/xerces/xercesImpl/2.7.1/xercesImpl-2.7.1.jar"/>
+</classpath>

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.classpath
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/.project?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/.project (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/.project Fri Sep 30 13:32:00 2011
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Jena-Dev</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.project
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs Fri Sep 30 13:32:00 2011
@@ -0,0 +1,12 @@
+#Fri Sep 30 11:47:36 BST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/.settings/org.eclipse.jdt.core.prefs
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-first.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-first.ru?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-first.ru (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-first.ru Fri Sep 30 13:32:00 2011
@@ -0,0 +1,28 @@
+# Copyright (c) Epimorphics Ltd
+# License: CC3.0: http://creativecommons.org/licenses/by/3.0
+
+PREFIX : <http://example/> 
+PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+INSERT DATA {
+  :x0 :p () .
+  # :x0 :p "other" .
+
+  :x1 :p (1) .
+  # :x1 :p "other" .
+
+  :x2 :p (1 2) .
+  # :x2 :p "other" .
+
+  :x3 :p (1 2 3) .
+  # :x3 :p "other" .
+} ;
+
+DELETE { ?x :p ?list }
+INSERT { ?x :p [ rdf:first 0 ; 
+                 rdf:rest ?list ]
+       }
+WHERE
+{
+  ?x :p ?list .
+}

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-last.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-last.ru?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-last.ru (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/add-last.ru Fri Sep 30 13:32:00 2011
@@ -0,0 +1,42 @@
+# Copyright (c) Epimorphics Ltd
+# License: CC3.0: http://creativecommons.org/licenses/by/3.0
+
+PREFIX : <http://example/> 
+PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+INSERT DATA {
+  :x0 :p () .
+  :x0 :p "other" .
+
+  :x1 :p (1) .
+  :x1 :p "other" .
+
+  :x2 :p (1 2) .
+  :x2 :p "other" .
+
+  :x3 :p (1 2 3) .
+  :x3 :p "other" .
+} ;
+
+# The order here is important.
+# Must do list >= 1 first.
+
+# List of length >= 1
+DELETE { ?elt rdf:rest rdf:nil }
+INSERT { ?elt rdf:rest [ rdf:first 98 ; rdf:rest rdf:nil ] }
+WHERE
+{
+  ?x :p ?list .
+  # List of length >= 1
+  ?list rdf:rest+ ?elt .
+  ?elt rdf:rest rdf:nil .
+  # ?elt is end of list.
+} ;
+
+# List of length = 0
+DELETE { ?x :p rdf:nil . }
+INSERT { ?x :p [ rdf:first 99 ; rdf:rest rdf:nil ] }
+WHERE
+{
+   ?x :p rdf:nil .
+}

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-first.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-first.ru?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-first.ru (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-first.ru Fri Sep 30 13:32:00 2011
@@ -0,0 +1,31 @@
+# Copyright 2011 Epimorphics Ltd
+# License: CC3.0: http://creativecommons.org/licenses/by/3.0
+
+PREFIX : <http://example/> 
+PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+INSERT DATA {
+  :x3 :p (1 2 3) .
+  :x3 :p "other" .
+
+  :x2 :p (1 2) .
+  :x2 :p "other" .
+
+  :x1 :p (1) .
+  :x1 :p "other" .
+
+  :x0 :p () .
+  :x0 :p "other" .
+} ;
+
+DELETE { 
+   ?x :p ?list .
+   ?list rdf:first ?first ;
+         rdf:rest  ?rest }
+INSERT { ?x :p ?rest }
+WHERE
+{
+  ?x :p ?list .
+  ?list rdf:first ?first ;
+        rdf:rest ?rest .
+}

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-last.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-last.ru?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-last.ru (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/del-last.ru Fri Sep 30 13:32:00 2011
@@ -0,0 +1,53 @@
+# Copyright 2011 Epimorphics Ltd
+# License: CC3.0: http://creativecommons.org/licenses/by/3.0
+
+PREFIX : <http://example/> 
+PREFIX rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+
+INSERT DATA {
+  :x3 :p (1 2 3) .
+  :x3 :p "other" .
+
+  :x2 :p (1 2) .
+  :x2 :p "other" .
+
+  :x1 :p (1) .
+  :x1 :p "other" .
+
+  :x0 :p () .
+  :x0 :p "other" .
+} ;
+
+# List of length 1
+# Do before other lists.
+
+DELETE { ?x :p ?elt .
+         ?elt  rdf:first ?v .
+         ?elt  rdf:rest  rdf:nil .
+       }
+INSERT { ?x :p rdf:nil . }
+WHERE
+{
+  ?x :p ?elt .
+  ?elt rdf:first ?v ;
+       rdf:rest rdf:nil .
+} ;
+
+# List of length >= 2
+DELETE { ?elt1 rdf:rest ?elt .
+         ?elt  rdf:first ?v .
+         ?elt  rdf:rest  rdf:nil .
+       }
+INSERT { ?elt1 rdf:rest rdf:nil }
+WHERE
+{
+  ?x :p ?list .
+  ?list rdf:rest* ?elt1 .
+
+  # Second to end.
+  ?elt1 rdf:rest ?elt .
+  # End.
+  ?elt rdf:first ?v ;
+       rdf:rest rdf:nil .
+}
+

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-1.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-1.ru?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-1.ru (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-1.ru Fri Sep 30 13:32:00 2011
@@ -0,0 +1,29 @@
+# Copyright 2011 Epimorphics Ltd
+# License: CC3.0: http://creativecommons.org/licenses/by/3.0
+
+PREFIX rdf:   <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+PREFIX :      <http://example.com/> 
+
+INSERT DATA {
+:x0 :p () .
+:x0 :q "abc" .
+
+:x1 :p (1) .
+:x1 :q "def" .
+
+:x2 :p (1 2) .
+:x2 :q "ghi" .
+} ;
+
+# Delete the cons cells.
+DELETE
+    { ?z rdf:first ?head ; rdf:rest ?tail . }
+WHERE { 
+      [] :p ?list .
+      ?list rdf:rest* ?z .
+      ?z rdf:first ?head ;
+         rdf:rest ?tail .
+      } ;
+
+# Delete the triples that connect the lists.
+DELETE WHERE { ?x :p ?z . }

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-2.ru
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-2.ru?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-2.ru (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/delete-list-2.ru Fri Sep 30 13:32:00 2011
@@ -0,0 +1,70 @@
+# Copyright 2011 Epimorphics Ltd
+# License: CC3.0: http://creativecommons.org/licenses/by/3.0
+
+PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
+PREFIX :     <http://example/> 
+
+INSERT DATA {
+:x0 :p () .
+:x0 :p "String 0" .
+:x0 :p [] .
+
+:x1 :p (1) .
+:x1 :p "String 1" .
+:x1 :p [] .
+
+:x2 :p (1 2) .
+:x2 :p "String 2" .
+:x2 :p [] .
+
+# A list not connected.
+(1 2) .
+
+# Not legal RDF.
+# () .
+
+} ;
+
+# Mark the objects we need to delete at the end
+# A list is either () AKA rdf:nil, or has a rdf:rest.
+
+# We do this so we can find the cons cells to delete
+# in stage two but leave evidence for the removal of
+# the link to the list even if the property is used 
+# for a non-list.
+
+
+INSERT { ?list :deleteMe true . }
+WHERE {
+   ?x :p ?list . 
+   FILTER (?list = rdf:nil || EXISTS{?list rdf:rest ?z} )
+} ;
+
+# Delete the cons cells.
+DELETE
+    { ?z rdf:first ?head ; rdf:rest ?tail . }
+WHERE { 
+      [] :p ?list .
+      ?list rdf:rest* ?z .
+      ?z rdf:first ?head ;
+         rdf:rest ?tail .
+      } ;
+
+# Delete the marked nodes
+DELETE 
+WHERE { ?x :p ?z . 
+        ?z :deleteMe true . 
+} ;
+
+## ------
+## Unconnected lists.
+
+DELETE
+    { ?z rdf:first ?head ; rdf:rest ?tail . }
+WHERE { 
+      ?list rdf:rest ?z2 .
+      FILTER NOT EXISTS { ?s ?p ?list }
+      ?list rdf:rest* ?z .
+      ?z rdf:first ?head ;
+         rdf:rest ?tail .
+      } ;

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/dwim
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/dwim?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/dwim (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/dwim Fri Sep 30 13:32:00 2011
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+function parse
+{
+    local FN=$1
+    echo "==== $FN"
+    uparse --strict --file "$FN"  > /dev/null
+}
+
+function action
+{
+    local FN=$1
+    echo "==== $FN"
+    cat "$FN"
+    echo "- - - - - - - - - - - - - - - - - - - - -"
+    update --strict --dump --file "$FN" | rdfcat --out TTL -t -
+}
+
+
+U="add-first.ru add-last.ru del-first.ru del-last.ru delete-list-1.ru delete-list-2.ru"
+
+for u in $U
+do
+    parse $u
+    done
+
+for u in $U
+do
+    action $u
+    done

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/Lists/dwim
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/README.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/README.txt?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/README.txt (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/README.txt Fri Sep 30 13:32:00 2011
@@ -0,0 +1,31 @@
+The XSLT and XQuery files come from the Data Access Working Group examples.
+
+See http://www.w3.org/TR/rdf-sparql-XMLres/
+
+-----------------------
+
+Run with:
+
+XSLT saxon:
+[[java -cp "$CP" net.sf.saxon.Transform   "$@"
+[[# Either in.xml xsl.xsl
+[[# Or     -a in.xml (use PI) 
+
+xslt output.xml result2-to-html.xsl  > r2.html
+
+
+XQuery saxon:
+[[java -cp "$JAR" net.sf.saxon.Query  "$@"result-to-html.xq
+result-to-html.xsl
+
+
+[[ -s does not seem to work on all versions
+xquery -s output.xml  result2-to-html.xq > r2-xq.html
+
+
+-----------------------
+
+Version1 are the files from the 
+http://www.w3.org/TR/2004/WD-rdf-sparql-XMLres-20041221/
+working draft
+ 
\ No newline at end of file

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/data.n3
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/data.n3?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/data.n3 (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/data.n3 Fri Sep 30 13:32:00 2011
@@ -0,0 +1,16 @@
+@prefix foaf:       <http://xmlns.com/foaf/0.1/> .
+@prefix rdf:        <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:	    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ex:         <http://ns.example.org/#> .
+
+_:a  foaf:name       "Alice" .
+_:a  foaf:homepage   <http://work.example.org/alice/> .
+_:a  foaf:mbox       "" .
+_:a  ex:blurb       "<p xmlns=\"http://www.w3.org/1999/xhtml\">My name is <em>Alice</em></p>"^^rdf:XMLLiteral .
+_:a  foaf:knows      _:b .
+
+_:b  foaf:name       "Bob"@en .
+_:b  foaf:mbox       <ma...@work.example.org> .
+_:b  foaf:homepage   <http://work.example.org/bob/> .
+_:b  ex:ageInYears   30 .
+_:b  foaf:knows      _:a .

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.rq?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.rq (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.rq Fri Sep 30 13:32:00 2011
@@ -0,0 +1,13 @@
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+PREFIX ex: <http://ns.example.org/#>
+
+SELECT ?x ?hpage ?name ?mbox ?age ?blurb ?friend
+FROM <data.n3>
+WHERE { ?x foaf:name ?name .
+        ?x foaf:mbox ?mbox .
+        ?x foaf:homepage ?hpage .
+        ?x foaf:knows ?friend .
+        OPTIONAL { ?x ex:ageInYears ?age } .
+        OPTIONAL { ?x ex:blurb ?blurb }
+      }
+ORDER BY ?name

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.srx
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.srx?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.srx (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example.srx Fri Sep 30 13:32:00 2011
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<sparql
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
+    xmlns="http://www.w3.org/2005/sparql-results#" >
+  <head>
+    <variable name="x"/>
+    <variable name="hpage"/>
+    <variable name="name"/>
+    <variable name="mbox"/>
+    <variable name="age"/>
+    <variable name="blurb"/>
+    <variable name="friend"/>
+  </head>
+  <results ordered="true" distinct="false">
+    <result>
+      <binding name="x">
+        <bnode>b0</bnode>
+      </binding>
+      <binding name="hpage">
+        <uri>http://work.example.org/alice/</uri>
+      </binding>
+      <binding name="name">
+        <literal>Alice</literal>
+      </binding>
+      <binding name="mbox">
+        <literal></literal>
+      </binding>
+      <binding name="blurb">
+        <literal datatype="http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral">&lt;p xmlns="http://www.w3.org/1999/xhtml"&gt;My name is &lt;em&gt;Alice&lt;/em&gt;&lt;/p&gt;</literal>
+      </binding>
+      <binding name="friend">
+        <bnode>b1</bnode>
+      </binding>
+    </result>
+    <result>
+      <binding name="x">
+        <bnode>b1</bnode>
+      </binding>
+      <binding name="hpage">
+        <uri>http://work.example.org/bob/</uri>
+      </binding>
+      <binding name="name">
+        <literal xml:lang="en">Bob</literal>
+      </binding>
+      <binding name="mbox">
+        <uri>mailto:bob@work.example.org</uri>
+      </binding>
+      <binding name="age">
+        <literal datatype="http://www.w3.org/2001/XMLSchema#integer">30</literal>
+      </binding>
+      <binding name="friend">
+        <bnode>b0</bnode>
+      </binding>
+    </result>
+  </results>
+</sparql>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example2.rq
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example2.rq?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example2.rq (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/example2.rq Fri Sep 30 13:32:00 2011
@@ -0,0 +1,5 @@
+PREFIX foaf: <http://xmlns.com/foaf/0.1/>
+
+ASK
+  FROM <data.n3>
+  WHERE { ?x foaf:name ?name }

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xq
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xq?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xq (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xq Fri Sep 30 13:32:00 2011
@@ -0,0 +1,135 @@
+xquery version "1.0";
+(:
+
+  XQuery script to format SPARQL Query Results XML Format into xhtml
+
+  Copyright © 2004, 2005 World Wide Web Consortium, (Massachusetts
+  Institute of Technology, European Research Consortium for
+  Informatics and Mathematics, Keio University). All Rights
+  Reserved. This work is distributed under the W3C® Software
+  License [1] in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.
+
+  [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+  $Id$
+
+:)
+
+
+declare namespace res="http://www.w3.org/2005/sparql-results#";
+declare default element namespace "http://www.w3.org/1999/xhtml";
+
+
+(: URI of input SPARQL Query Results document :)
+declare variable $results-doc := doc( "output.xml" );
+
+
+(: How to set serialization parameters? :)
+
+(: doctype-system = "-//W3C//DTD XHTML 1.0 Transitional//EN" :)
+(: doctype-public = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> :)
+
+
+declare variable $variableNames :=
+   for $element in $results-doc/res:sparql/res:head/res:variable
+     return string( $element/@name )
+;
+
+
+declare function local:head($head as node()) {
+  <div> 
+    <h2>Header</h2> 
+  {
+    for $link in $head/res:link
+      return <p>Link to { string( $link/@href ) }</p>
+  } </div>
+};
+
+
+declare function local:boolean-result($bool as node()) {
+  <div>
+    <h2>Boolean Result</h2>
+    <p>Value: { string ($bool) } </p>
+  </div>
+};
+
+
+declare function local:vb-result($vbr as node()) {
+  <div>
+    <h2>Variable Bindings Results</h2>
+
+    <p>Ordered: { string( $vbr/@ordered ) } </p>
+    <p>Distinct: { string( $vbr/@distinct ) } </p>
+
+    <table border="1">
+<tr> {
+  for $name in $variableNames
+    return <th>{$name}</th>
+} </tr>
+
+
+{ for $result in $vbr/res:result
+    return
+<tr> {
+  for $name in $variableNames 
+    let $item := $result/res:binding[@name = $name]
+    return  
+	<td> {
+	  if ($item/res:bnode) then
+	     (: blank node value :)
+	     ( "nodeID ", $item/res:bnode/text() )
+	  else if ($item/res:uri) then 
+	     (: URI value :)
+	     ( "URI ", $item/res:uri/text() )
+	  else if ($item/res:literal/@datatype) then 
+	     (: datatyped literal value :)
+	     fn:concat ( $item/res:literal, " (datatype ", $item/res:literal/@datatype, ")" )
+	  else if ($item/res:literal/@xml:lang) then 
+	     (: lang-string :)
+	     fn:concat ( $item/res:literal, "@", $item/res:literal/@xml:lang )
+	  else if ($item/res:literal/res:unbound) then 
+	     (: unbound variable - empty cell :)
+	     "[unbound]"
+	  else if ( exists($item/res:literal/text()) ) then
+	     (: present and not empty :)
+	     $item/res:literal/text()
+	  else if ( exists($item/res:literal) ) then
+	     (: present and empty :)
+	     "[empty literal]"
+	  else
+	     (: unbound variable - empty cell :)
+	     "[unbound]"
+	 } </td>
+  } </tr>
+
+} </table>
+
+</div>
+};
+
+
+document {
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>SPARQL Query Results to XHTML (XQuery)</title>
+  </head>
+  <body>
+    <h1>SPARQL Query Results to XHTML (XQuery)</h1>
+
+{
+  local:head($results-doc/res:sparql/res:head)
+}
+
+{
+if ($results-doc/res:sparql/res:boolean) then 
+  local:boolean-result($results-doc/res:sparql/res:boolean)
+else
+  local:vb-result($results-doc/res:sparql/res:results)
+}
+
+  </body>
+</html>
+
+}    

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xsl
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xsl?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xsl (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-to-html.xsl Fri Sep 30 13:32:00 2011
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!--
+
+  XSLT script to format SPARQL Query Results XML Format into xhtml
+
+  Copyright © 2004, 2005 World Wide Web Consortium, (Massachusetts
+  Institute of Technology, European Research Consortium for
+  Informatics and Mathematics, Keio University). All Rights
+  Reserved. This work is distributed under the W3C® Software
+  License [1] in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.
+
+  [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+  $Id$
+
+-->
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:res="http://www.w3.org/2005/sparql-results#"
+  exclude-result-prefixes="res xsl">
+
+  <!--
+  <xsl:output
+    method="html"
+    media-type="text/html"
+    doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
+    indent="yes"
+    encoding="UTF-8"/>
+  -->
+
+  <!-- or this? -->
+
+  <xsl:output
+    method="xml" 
+    indent="yes"
+    encoding="UTF-8" 
+    doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+    doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
+    omit-xml-declaration="no" />
+
+
+  <xsl:template name="header">
+    <div>
+      <h2>Header</h2>
+    <xsl:for-each select="res:head/res:link"> 
+       <p>Link to <xsl:value-of select="@href"/></p>
+    </xsl:for-each>
+    </div>
+  </xsl:template>
+
+  <xsl:template name="boolean-result">
+    <div>
+      <h2>Boolean Result</h2>
+       <p>Value <xsl:value-of select="res:boolean"/></p>
+    </div>
+  </xsl:template>
+
+
+  <xsl:template name="vb-result">
+    <div>
+      <h2>Variable Bindings Result</h2>
+
+    <p>Ordered: <xsl:value-of select="res:results/@ordered"/></p>
+    <p>Distinct: <xsl:value-of select="res:results/@distinct"/></p>
+
+    <table border="1">
+<xsl:text>
+    </xsl:text>
+<tr>
+  <xsl:for-each select="res:head/res:variable">
+    <th><xsl:value-of select="@name"/></th>
+  </xsl:for-each>
+</tr>
+<xsl:text>
+</xsl:text>
+
+  <xsl:for-each select="res:results/res:result"> 
+<xsl:text>
+    </xsl:text>
+<tr>
+<xsl:text>
+    </xsl:text>
+    <xsl:for-each select="res:binding"> 
+     <xsl:variable name="name" select="@name" />
+     <xsl:text>
+      </xsl:text>
+     <td>
+        <xsl:comment>
+          <xsl:text> </xsl:text>
+          <xsl:value-of select="$name" />
+          <xsl:text> </xsl:text>
+	</xsl:comment>
+          <xsl:text> </xsl:text>
+
+	<xsl:choose>
+	  <xsl:when test="res:bnode/text()">
+	    <!-- blank node value -->
+	    <xsl:text>nodeID </xsl:text>
+	    <xsl:value-of select="res:bnode/text()"/>
+	  </xsl:when>
+	  <xsl:when test="res:uri">
+	    <!-- URI value -->
+	    <xsl:variable name="uri" select="res:uri/text()"/>
+	    <xsl:text>URI </xsl:text>
+	    <xsl:value-of select="$uri"/>
+	  </xsl:when>
+	  <xsl:when test="res:literal/@datatype">
+	    <!-- datatyped literal value -->
+	    <xsl:value-of select="res:literal/text()"/> (datatype <xsl:value-of select="res:literal/@datatype"/> )
+	  </xsl:when>
+	  <xsl:when test="res:literal/@xml:lang">
+	    <!-- lang-string -->
+	    <xsl:value-of select="res:literal/text()"/> @ <xsl:value-of select="res:literal/@xml:lang"/>
+	  </xsl:when>
+	  <xsl:when test="res:unbound">
+	    <!-- unbound -->
+	    [unbound]
+	  </xsl:when>
+	  <xsl:when test="string-length(res:literal/text()) != 0">
+	    <!-- present and not empty -->
+	    <xsl:value-of select="res:literal/text()"/>
+	  </xsl:when>
+	  <xsl:when test="string-length(res:literal/text()) = 0">
+	    <!-- present and empty -->
+            [empty literal]
+	  </xsl:when>
+	  <xsl:otherwise>
+	    [unbound]
+	  </xsl:otherwise>
+	</xsl:choose>
+     </td>
+    <xsl:text>
+</xsl:text>
+    </xsl:for-each>
+
+</tr>
+<xsl:text>
+    </xsl:text>
+  </xsl:for-each>
+
+    </table>
+
+    </div>
+  </xsl:template>
+
+
+  <xsl:template match="res:sparql">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title>SPARQL Query Results to XHTML (XSLT)</title>
+  </head>
+  <body>
+
+
+    <h1>SPARQL Query Results to XHTML (XSLT)</h1>
+
+<xsl:if test="res:head/res:link">
+      <xsl:call-template name="header"/>
+</xsl:if>
+
+<xsl:choose>
+  <xsl:when test="res:boolean">
+    <xsl:call-template name="boolean-result" />
+  </xsl:when>
+
+  <xsl:when test="res:results">
+    <xsl:call-template name="vb-result" />
+  </xsl:when>
+
+</xsl:choose>
+
+
+  </body>
+</html>
+  </xsl:template>
+
+</xsl:stylesheet>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-xslt.html
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-xslt.html?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-xslt.html (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2-xslt.html Fri Sep 30 13:32:00 2011
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" "-//W3C//DTD XHTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <title>SPARQL Variable Binding Results to XHTML table (XSLT)</title>
+  </head>
+  <body>
+    <h1>SPARQL Variable Binding Results to XHTML table (XSLT)</h1>
+    <p>Variables: x hpage name mbox blurb </p>
+    <table border="1">
+<tr><th>x</th><th>hpage</th><th>name</th><th>mbox</th><th>blurb</th></tr>
+<tr>
+<td>nodeID r1</td>
+<td><a href="http://work.example.org/alice/">http://work.example.org/alice/</a></td>
+<td>Alice</td>
+<td>
+            [empty]
+	  </td>
+<td>&lt;p xmlns="http://www.w3.org/1999/xhtml"&gt;My name is &lt;b&gt;alice&lt;/b&gt;&lt;/p&gt;
+	    (datatype http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral )
+	  </td>
+<td>nodeID r2</td>
+<td><a href="http://work.example.org/bob/">http://work.example.org/bob/</a></td>
+<td>Bob
+	    @ en</td>
+<td><a href="mailto:bob@work">mailto:bob@work</a></td>
+<td>30
+	    (datatype http://www.w3.org/2001/XMLSchema#integer )
+	  </td>
+</tr>
+</table>
+  </body>
+</html>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rnc
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rnc?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rnc (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rnc Fri Sep 30 13:32:00 2011
@@ -0,0 +1,108 @@
+#
+# RELAX NG Schema for SPARQL Query Results XML Format
+#
+# This XML schema is normative.
+# $Id$
+#
+#
+
+namespace local = ""
+namespace res = "http://www.w3.org/2005/sparql-results#"
+namespace xsi = "http://www.w3.org/2001/XMLSchema-instance"
+datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
+
+
+start = sparql
+
+xmlLang = attribute xml:lang { text }
+
+# Using xsi namespaced terms such as xsi:schemaLocation
+# is tricky. as Relax requires them to be given when used.  However,
+# WXS has this knowledge built in and validators complain when they
+# are explicitly listed without a schemaLocation (which is forbidden by
+# the WXS spec)..
+
+xsiSchemaLoc = attribute xsi:schemaLocation { string }
+
+
+sparql = element res:sparql { 
+    xsiSchemaLoc?, head,
+    (results | boolean)
+}
+
+head = element res:head {
+    varName*, link*
+}
+
+varName = element res:variable {
+    nameAttr
+}
+
+nameAttr = attribute name {
+    xsd:NMTOKEN
+}
+
+hrefAttr = attribute local:href {
+    URI-reference
+}
+
+link = element res:link {
+    hrefAttr
+}
+
+ordered = attribute local:ordered {
+    xsd:boolean
+}
+
+distinct = attribute local:distinct {
+    xsd:boolean
+}
+
+results = element res:results { 
+    ordered, distinct, result*
+}
+
+
+# ASK
+boolean = element res:boolean {
+    xsd:boolean
+}
+
+# SELECT solution, single match or row
+result = element res:result {
+    indexAttr?, binding*
+}
+
+# SELECT binding in a solution
+binding = element res:binding {
+    nameAttr,
+    ( uri | bnode | literal | unbound )
+}
+
+uri = element res:uri { 
+    text
+}
+
+bnode = element res:bnode {
+    text
+}
+
+literal = element res:literal { 
+    datatypeAttr?, xmlLang?,
+    text
+}
+
+unbound = element res:unbound {
+    empty
+}
+
+indexAttr = attribute local:index {
+    xsd:positiveInteger
+}
+
+datatypeAttr = attribute local:datatype {
+    URI-reference
+}
+
+URI-reference = xsd:anyURI
+

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rng
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rng?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rng (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.rng Fri Sep 30 13:32:00 2011
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+  RELAX NG Schema for SPARQL Query Results XML Format
+  
+  This XML schema is normative.
+  $Id$
+  
+  
+-->
+<grammar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:res="http://www.w3.org/2005/sparql-results#" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <start>
+    <ref name="sparql"/>
+  </start>
+  <define name="xmlLang">
+    <attribute name="xml:lang"/>
+  </define>
+  <!--
+    Using xsi namespaced terms such as xsi:schemaLocation
+    is tricky. as Relax requires them to be given when used.  However,
+    WXS has this knowledge built in and validators complain when they
+    are explicitly listed without a schemaLocation (which is forbidden by
+    the WXS spec)..
+  -->
+  <define name="xsiSchemaLoc">
+    <attribute name="xsi:schemaLocation">
+      <data type="string" datatypeLibrary=""/>
+    </attribute>
+  </define>
+  <define name="sparql">
+    <element name="res:sparql">
+      <optional>
+        <ref name="xsiSchemaLoc"/>
+      </optional>
+      <ref name="head"/>
+      <choice>
+        <ref name="results"/>
+        <ref name="boolean"/>
+      </choice>
+    </element>
+  </define>
+  <define name="head">
+    <element name="res:head">
+      <zeroOrMore>
+        <ref name="varName"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="link"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="varName">
+    <element name="res:variable">
+      <ref name="nameAttr"/>
+    </element>
+  </define>
+  <define name="nameAttr">
+    <attribute name="name">
+      <data type="NMTOKEN"/>
+    </attribute>
+  </define>
+  <define name="hrefAttr">
+    <attribute name="href">
+      <ref name="URI-reference"/>
+    </attribute>
+  </define>
+  <define name="link">
+    <element name="res:link">
+      <ref name="hrefAttr"/>
+    </element>
+  </define>
+  <define name="ordered">
+    <attribute name="ordered">
+      <data type="boolean"/>
+    </attribute>
+  </define>
+  <define name="distinct">
+    <attribute name="distinct">
+      <data type="boolean"/>
+    </attribute>
+  </define>
+  <define name="results">
+    <element name="res:results">
+      <ref name="ordered"/>
+      <ref name="distinct"/>
+      <zeroOrMore>
+        <ref name="result"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <!-- ASK -->
+  <define name="boolean">
+    <element name="res:boolean">
+      <data type="boolean"/>
+    </element>
+  </define>
+  <!-- SELECT solution, single match or row -->
+  <define name="result">
+    <element name="res:result">
+      <optional>
+        <ref name="indexAttr"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="binding"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <!-- SELECT binding in a solution -->
+  <define name="binding">
+    <element name="res:binding">
+      <ref name="nameAttr"/>
+      <choice>
+        <ref name="uri"/>
+        <ref name="bnode"/>
+        <ref name="literal"/>
+        <ref name="unbound"/>
+      </choice>
+    </element>
+  </define>
+  <define name="uri">
+    <element name="res:uri">
+      <text/>
+    </element>
+  </define>
+  <define name="bnode">
+    <element name="res:bnode">
+      <text/>
+    </element>
+  </define>
+  <define name="literal">
+    <element name="res:literal">
+      <optional>
+        <ref name="datatypeAttr"/>
+      </optional>
+      <optional>
+        <ref name="xmlLang"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="unbound">
+    <element name="res:unbound">
+      <empty/>
+    </element>
+  </define>
+  <define name="indexAttr">
+    <attribute name="index">
+      <data type="positiveInteger"/>
+    </attribute>
+  </define>
+  <define name="datatypeAttr">
+    <attribute name="datatype">
+      <ref name="URI-reference"/>
+    </attribute>
+  </define>
+  <define name="URI-reference">
+    <data type="anyURI"/>
+  </define>
+</grammar>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.xsd
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.xsd?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.xsd (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ResultSet/result2.xsd Fri Sep 30 13:32:00 2011
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  
+  RELAX NG Schema for SPARQL Query Results XML Format
+  
+  This XML schema is normative.
+  $Id$
+  
+  
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.w3.org/2005/sparql-results#" xmlns:res="http://www.w3.org/2005/sparql-results#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xs:attributeGroup name="xmlLang">
+    <xs:attribute ref="xml:lang" use="required"/>
+  </xs:attributeGroup>
+  <!--
+    Using xsi namespaced terms such as xsi:schemaLocation
+    is tricky. as Relax requires them to be given when used.  However,
+    WXS has this knowledge built in and validators complain when they
+    are explicitly listed without a schemaLocation (which is forbidden by
+    the WXS spec)..
+  -->
+  <xs:element name="sparql">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="res:head"/>
+        <xs:choice>
+          <xs:element ref="res:results"/>
+          <xs:element ref="res:boolean"/>
+        </xs:choice>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="head">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="res:variable"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="res:link"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="variable">
+    <xs:complexType>
+      <xs:attributeGroup ref="res:nameAttr"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="nameAttr">
+    <xs:attribute name="name" use="required" type="xs:NMTOKEN"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="hrefAttr">
+    <xs:attribute name="href" use="required" type="res:URI-reference"/>
+  </xs:attributeGroup>
+  <xs:element name="link">
+    <xs:complexType>
+      <xs:attributeGroup ref="res:hrefAttr"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:attributeGroup name="ordered">
+    <xs:attribute name="ordered" use="required" type="xs:boolean"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="distinct">
+    <xs:attribute name="distinct" use="required" type="xs:boolean"/>
+  </xs:attributeGroup>
+  <xs:element name="results">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="res:result"/>
+      </xs:sequence>
+      <xs:attributeGroup ref="res:ordered"/>
+      <xs:attributeGroup ref="res:distinct"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- ASK -->
+  <xs:element name="boolean" type="xs:boolean"/>
+  <!-- SELECT solution, single match or row -->
+  <xs:element name="result">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="res:binding"/>
+      </xs:sequence>
+      <xs:attribute name="index" type="xs:positiveInteger"/>
+    </xs:complexType>
+  </xs:element>
+  <!-- SELECT binding in a solution -->
+  <xs:element name="binding">
+    <xs:complexType>
+      <xs:choice>
+        <xs:element ref="res:uri"/>
+        <xs:element ref="res:bnode"/>
+        <xs:element ref="res:literal"/>
+        <xs:element ref="res:unbound"/>
+      </xs:choice>
+      <xs:attributeGroup ref="res:nameAttr"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="uri" type="xs:string"/>
+  <xs:element name="bnode" type="xs:string"/>
+  <xs:element name="literal">
+    <xs:complexType mixed="true">
+      <xs:attribute name="datatype" type="res:URI-reference"/>
+      <xs:attribute ref="xml:lang"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="unbound">
+    <xs:complexType/>
+  </xs:element>
+  <xs:attributeGroup name="indexAttr">
+    <xs:attribute name="index" use="required" type="xs:positiveInteger"/>
+  </xs:attributeGroup>
+  <xs:attributeGroup name="datatypeAttr">
+    <xs:attribute name="datatype" use="required" type="res:URI-reference"/>
+  </xs:attributeGroup>
+  <xs:simpleType name="URI-reference">
+    <xs:restriction base="xs:anyURI"/>
+  </xs:simpleType>
+</xs:schema>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/D.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/D.ttl?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/D.ttl (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/D.ttl Fri Sep 30 13:32:00 2011
@@ -0,0 +1 @@
+# Empty
\ No newline at end of file

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/all.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/all.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/all.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/all.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,20 @@
+(prefix ((: <http://example/>))
+  (exec
+    (dataset
+      (default (graph
+		 (:x :p 1)
+		 (:x :p 2)))
+      (namedgraph :g1
+	(graph
+	   (:x :gp 1)
+	   (:x :gp 2)))
+      (namedgraph :g2
+	(graph
+	  (:y :gp 1)
+	  (:y :gp 2)))
+      )
+
+    (graph :g1
+      (bgp (?x ?p ?v)))
+    ))
+

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/expr.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/expr.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/expr.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/expr.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,6 @@
+(expr 
+ (<foobar> 
+  (+ 
+   (regex ?x "word")
+   (- 1)
+   )))
\ No newline at end of file

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/graph.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/graph.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/graph.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/graph.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,9 @@
+##(graph@ "D.ttl")
+
+(prefix ((: <http://example/>)
+	 (z: <http://example/#>)
+	 (x: <http://example/#>))
+  (graph
+    (:x :p 1)
+    (triple :x x:p 2)
+    ))

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/op.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/op.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/op.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/op.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,5 @@
+(prefix ((: <http://example/>))
+  (service <http://sparql.org/sparql>
+    (bgp [triple ?s ?p ?o])
+    ))
+

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/proc.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/proc.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/proc.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/proc.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,8 @@
+(prefix ((proc: <http://jena.hpl.hp.com/ARQ/procedure#>))
+  (project (?s ?p ?o)
+    (proc 
+      proc:debug 
+      (exprlist ?z ?x)
+      #(exprlist ?z ?p (+ ?o 10))
+      (BGP (triple ?s ?p ?o))
+      )))
\ No newline at end of file

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/resultset.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/resultset.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/resultset.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/resultset.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,8 @@
+(prefix ((x: <http://example/>))
+  (resultset
+    (?x ?y)
+    (row [?x 1] [?y x:g])
+    (row [?x 1] [?y undef])
+    (row [?x 1] )
+    (row [?z 1] )
+    ))
\ No newline at end of file

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/table.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/table.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/table.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/table.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,6 @@
+
+(prefix ((x: <http://example/>))
+  (table
+   (row [?x 1] [?y x:g])
+   (row [?x 1] [?y undef])
+   ))

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/test.sse
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/test.sse?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/test.sse (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/SSE/test.sse Fri Sep 30 13:32:00 2011
@@ -0,0 +1,15 @@
+
+(prefix ((x: <http://example/>))
+  (test
+    (join
+      (table
+        (row [?x 1] [?y x:g])
+        (row [?x 2] ))
+      (table 
+        (row [?y x:g])
+        (row [?x 2] )))
+    (table
+      (row [?y x:g] [?x 1])
+      (row [?y x:g] [?x 2])
+      (row [?x 2])
+      )))

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-ant.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-ant.zip?rev=1177649&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-ant.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-standalone.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-standalone.xml?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-standalone.xml (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/build-standalone.xml Fri Sep 30 13:32:00 2011
@@ -0,0 +1,559 @@
+<project name="ARQ" xmlns:ivy="antlib:org.apache.ivy.ant" default="main" basedir=".">
+
+  <property name="Name"            value="ARQ"/>
+  <property name="name"            value="arq"/>
+  <property environment="env"/>
+  <!-- The major and minor version numbers  -->
+  <property name="version-major"      value="2"/>
+  <property name="version-minor"      value="7"/>
+  <property name="version-revision"   value="0"/>
+  <property name="version-status"     value="-SNAPSHOT"/>
+  <property name="version"
+            value="${version-major}.${version-minor}.${version-revision}${version-status}"/>
+
+  <property name="dist.name"       value="${Name}-${version}"/>
+
+  <property name="src.dir"         value="src"/>
+  <property name="src-test.dir"    value="src-test"/>
+  <property name="src-ex.dir"      value="src-examples"/>
+  <property name="src.build.dir"         value="bldsrc"/>
+  <property name="classes.build.dir"     value="bldbin"/>
+  <property name="dist.root"       value="dist"/>
+  <property name="dist.dir"        value="${dist.root}/${dist.name}"/>
+  <property name="lib.dir"         value="lib"/>
+  <property name="grammar.dir"     value="Grammar"/>
+  <property name="doc.dir"         value="doc"/>
+  <property name="javadoc.dir"     value="doc/javadoc"/>
+  <property name="javadoc.all.dir" value="doc/javadoc-all"/>
+
+  <property name="test.dir"        value="testing"/>
+  <property name="vocab.dir"       value="Vocabularies"/>
+
+  <property name="jarfile"         value="${name}.jar"/>
+  <property name="jarfile.extra"   value="${name}-extra.jar"/>
+
+  <property name="arq.root"        value="src/com/hp/hpl/jena/query"/>
+
+  <property name="reports.dir"       value="reports"/>
+  <property name="reports.dir.xml"   value="reports/xml"/>
+  <property name="reports.outdir"    value="reports"/>
+
+  <!-- Define contents of each JAR file -->
+  <property name="arq.path.impl"      value="com/hp/hpl/jena/sparql"/>
+  <property name="extra.classes" 
+	    value="${arq.path.impl}/**/test/** ${arq.path.impl}/**/junit/** arq/** ${arq.path.impl}/**/suites/**"/>
+
+  <!-- =========================================================== -->
+  <!-- ==== Environment -->
+  
+  <path id="classpath">
+    <fileset dir="${lib.dir}" includes="*.jar" excludes="${jarfile}"/>
+  </path>
+
+  <filterset id="filters.general">
+    <filter token="name"           value="${Name}"/>
+    <filter token="website"        value="http://jena.sourceforge.net/ARQ/"/>
+    <filter token="version"        value="${version}"/>
+    <filter token="version-major"  value="${version-major}"/>
+    <filter token="version-minor"  value="${version-minor}"/>
+    <filter token="version-status" value="${version-status}"/>   
+  </filterset>   
+
+  <target name="optimise-javac-flags"
+          description="Set the javac flags that will produce an optmised jar with no debug symbols" >
+    <property name="java.debug"       value="false"/>
+    <property name="java.debuglevel"  value=""/>
+    <property name="java.deprecation" value="false"/>
+    <property name="java.optimize"    value="true"/>
+    <property name="java.source"      value="1.5"/>
+    <property name="java.target"      value="1.5"/>
+  </target>
+
+  <target name="default-javac-flags"
+          description="Set the javac flags that will produce an debug jar with no compiler optimisation and all debug symbols" >
+    <!-- Note that in ant, if these flags are already set setting them again has no effect -->
+    <property name="java.debug"       value="true"/>
+    <property name="java.debuglevel"  value="source,lines,vars"/>
+    <property name="java.deprecation" value="false"/>
+    <property name="java.optimize"    value="false"/>
+    <property name="java.source"      value="1.5"/>
+    <property name="java.target"      value="1.5"/>
+  </target>
+
+  <target name="javac-flags" depends="default-javac-flags"/>
+
+  <!-- =========================================================== -->
+  <!-- ==== Main external targets -->
+
+  <target name="init">
+    <tstamp/>
+  </target>
+
+  <target name="main" depends="jar,junit" description="Build arq.jar"/>
+  
+  <target name="jar"  depends="make-jars" description="Build arq.jar">
+    <antcall target="clean-build-dirs"/>
+  </target>
+
+  <target name="release" depends="init,package,junit"
+          description="Create ARQ release">
+    <antcall target="clean-build-dirs"/>
+  </target>
+
+  <!-- =========================================================== -->
+  <!-- ==== Grammars, Compilation and JAR -->
+
+  <target name="pre-compile" depends="clean-build-dirs,javac-flags">
+    <mkdir dir="${classes.build.dir}"/>
+  </target>
+
+  <target name="build-src" depends="clean-build-dirs">
+    <tstamp>
+      <format property="BUILD_TIME"      pattern="yyyy-MM-dd HH:mm Z"/>
+      <format property="BUILD_TIME_XSD"  pattern="yyyy-MM-dd'T'HH:mm:ssZ"/>
+    </tstamp>
+    
+    <copy todir="${src.build.dir}">
+      <fileset dir="${src.dir}" includes="**"/>
+      <fileset dir="${src-test.dir}" includes="**"/>
+      <fileset dir="${src-ex.dir}"  includes="**"/>
+      <filterset>
+        <filterset refid="filters.general"/>
+        <filter token="build-time" value="${BUILD_TIME}" />
+        <filter token="build-time-xsd" value="${BUILD_TIME_XSD}" />
+      </filterset> 
+    </copy>
+  </target>
+
+  <target name="compile" depends="pre-compile,build-src">
+    <javac srcdir="${src.build.dir}"
+           destdir="${classes.build.dir}"
+           debug="${java.debug}"
+           debuglevel="${java.debuglevel}"
+           deprecation="${java.deprecation}"
+           optimize="${java.optimize}"
+           source="${java.source}"
+           target="${java.target}">
+      <src path="${src.build.dir}"/>
+      <classpath refid="classpath" />
+    </javac>
+  </target>
+
+
+<!-- Jena has a log4j in it so merely use that as the default.
+  <target name="classes-misc">
+    <copy todir="${classes.build.dir}" file="${src.dir}/log4j.properties"/>
+  </target>
+-->
+
+
+  <target name="make-jars" depends="make-jar-core,make-jar-extra"/>
+
+  <target name="make-jar-core" depends="compile">
+    <!-- Core jar -->
+    <jar destfile="${lib.dir}/${jarfile}" index="yes">
+      <fileset dir="${classes.build.dir}" excludes="${extra.classes}"/>
+    </jar>
+  </target>
+  
+  <!-- Tests and examples jar -->
+  <target name="make-jar-extra" depends="compile">
+    <jar destfile="${lib.dir}/${jarfile.extra}" index="yes">
+      <fileset dir="${classes.build.dir}" includes="${extra.classes}"/>
+    </jar>
+  </target>
+
+  <!-- SSE subsystem - ->
+  <target name="make-jar-sse" depends="compile">
+    <jar destfile="${lib.dir}/${jarfile.sse}" index="yes">
+        <fileset dir="${classes.build.dir}" includes="${sse.classes}"/>
+      </jar>
+  </target>
+  -->
+
+  <!-- =========================================================== -->
+  <!-- ==== Testing -->
+  <!-- <target name="test" depends="jar"> -->
+
+  <target name="test" depends="junit"/>
+
+  <target name="junit" depends="run-junit" description="Run the test suite using the ARQ jar files.">
+    <fail message="Junit tests failed" if="junit.failed"/>
+  </target>
+
+  <target name="reports" depends="report"/>
+
+  <target name="report" depends="run-report" description="Run tests and generate reports">
+    <fail message="Junit tests failed" if="junit.failed"/>
+  </target>
+
+  <!-- run-junit and flag -->
+  <target name="run-junit" depends="clean-reports">
+    <mkdir dir="${reports.dir}"/>
+    <mkdir dir="${reports.dir.xml}"/>
+    <junit printsummary="yes" 
+	   errorProperty="junit.failed"
+	   failureProperty="junit.failed">
+      <formatter type="xml"/>
+      <classpath>
+        <fileset dir="${lib.dir}" includes="*.jar"/>
+      </classpath>
+      <test todir="${reports.dir.xml}" name="com.hp.hpl.jena.sparql.test.ARQTestSuite"/>
+    </junit>
+  </target>
+
+  <target name="run-report" depends="run-junit">
+    <mkdir dir="${reports.outdir}"/>
+    <junitreport todir="./${reports.dir}">
+      <fileset dir="./${reports.dir.xml}">
+        <include name="**.xml"/>
+      </fileset>
+      <report format="frames" todir="./${reports.outdir}"/>
+    </junitreport>
+  </target>
+
+  <!-- =========================================================== -->
+  <!-- ==== Javadoc -->
+
+  <target name="javadoc" depends="clean-javadoc,build-src,javac-flags"
+          description="Make the javadoc">
+    <javadoc
+     sourcepath="${src.build.dir}"
+     source="${java.source}"
+     destdir="${javadoc.dir}"
+     author="true"
+     version="true"
+     classpathref="classpath"
+     windowtitle="${Name} Query Processor"
+     doctitle="${Name} Query Processor"
+     Public="true"
+     Use="true"
+     bottom="Copyright &#169; 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP"
+     additionalparam="-breakiterator">
+        <classpath refid="classpath"/>
+        <package name="com.hp.hpl.jena.query"/>
+        <package name="com.hp.hpl.jena.update"/>
+        <package name="com.hp.hpl.jena.query.larq"/>
+    </javadoc>
+  </target>
+
+  <target name="javadoc-all" depends="clean-javadoc,build-src,javac-flags"
+          description="Make the javadoc (all of it)">
+    <javadoc
+     packagenames="com.hp.hpl.jena.query.*,com.hp.hpl.jena.sparql.*,com.hp.hpl.jena.update.*"
+     sourcepath="${src.build.dir}"
+     source="${java.source}"
+     destdir="${javadoc.all.dir}"
+     author="true"
+     version="true"
+     classpathref="classpath"
+     windowtitle="${Name} Query Processor"
+     doctitle="${Name} Query Processor"
+     Public="true"
+     Use="true"
+     bottom="Copyright &#169; 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP"
+     additionalparam="-breakiterator">
+    </javadoc>
+  </target>
+
+
+  <!-- =========================================================== -->
+  <!-- ==== Create distribution area -->
+
+  <!-- Does not include javadoc-all which is large even when zipped -->
+  <target name="package"
+          depends="make-jars,javadoc,distribution-init,copy,zip"/>
+
+  <target name="distribution-init">
+    <mkdir dir="${dist.dir}"/>
+  </target>
+
+  <target name="copy" depends="distribution-init">
+    <delete dir="${dist.dir}"/>
+    <mkdir dir="${dist.dir}"/>
+    <copy todir="${dist.dir}/${lib.dir}">
+      <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </copy>
+
+    <!-- Source : We could zip this up -->
+    <copy todir="${dist.dir}/${src.dir}">
+      <fileset dir="${src.build.dir}" includes="**"/>
+    </copy>
+    
+    <!-- Examples source -->   
+    <copy todir="${dist.dir}/${src-ex.dir}">
+      <fileset dir="${src-ex.dir}" includes="**"/>
+    </copy>
+
+    <!-- Misc files -->
+    <copy todir="${dist.dir}/" file="build.xml"/>
+    <copy todir="${dist.dir}/" file="copyright.txt"/>
+    <copy todir="${dist.dir}/" file="README.txt"/>
+    <copy todir="${dist.dir}/" file="ChangeLog.txt"/>
+    <copy todir="${dist.dir}/" file="test.sh"/>
+    
+    <!-- Vocabularies  -->
+    <copy todir="${dist.dir}/${vocab.dir}">
+      <fileset dir="${vocab.dir}" includes="**"/>
+    </copy>
+    
+    <!-- Grammars -->
+    <copy todir="${dist.dir}/${grammar.dir}">
+      <fileset dir="${grammar.dir}">
+        <!-- Just the minimum to produce a buildable grammar -->
+        <include name="master.jj"/>
+        <include name="sparql.jj"/>
+        <include name="sparql-update.jj"/>
+        <include name="arq.jj"/>
+        <include name="grammar"/>
+      </fileset>
+    </copy>
+
+    <!-- XML result set example
+         Don't include.
+         <copy todir="${dist.dir}/ResultSet">
+         <fileset dir="ResultSet" includes="**"/>
+         </copy>
+    -->
+
+    <!-- bin/ and bat/ -->
+    <copy todir="${dist.dir}/bin">
+      <fileset dir="bin" includes="**"/>
+    </copy>
+    <copy todir="${dist.dir}/bat">
+      <fileset dir="bat" includes="**"/>
+    </copy>
+    <copy todir="${dist.dir}/etc">
+      <fileset dir="etc" includes="**"/>
+    </copy>
+    
+    
+    <!-- Dependences
+ -->
+
+    <!-- lib directory includes jena.jar -->
+    <copy todir="${lib.dir}">
+      <fileset dir="lib" includes="*.jar"/>
+    </copy>
+
+    <!-- Documentation -->
+    <!-- Javadoc is part of the documentation directory -->
+    <copy todir="${dist.dir}/${doc.dir}">
+      <fileset dir="${doc.dir}">
+        <include name="**"/>
+        <!-- Drafting area -->
+        <exclude name="**/Drafts/**"/>
+        <exclude name="**/index-css.html"/>
+        <!-- FrontPage internal directories -->
+        <exclude name="**/_vti*/**"/>
+        <exclude name="**/_private/**"/>
+        <exclude name="**/javadoc-all/**"/>
+        <exclude name="**/desktop.ini"/>
+      </fileset>
+    </copy>
+
+    <!-- Code examples -->
+    <copy todir="${dist.dir}/${doc.dir}/${src-ex.dir}">
+      <fileset dir="${src-ex.dir}"/>
+      <mapper type="glob" from="*.java" to="*.java.txt"/>
+    </copy>
+
+    <!-- Ruby library -->
+    <copy todir="${dist.dir}/Ruby">
+      <fileset dir="Ruby"/>
+    </copy>
+    
+    <!-- Lisp library -->
+     <copy todir="${dist.dir}/Lisp">
+       <fileset dir="Lisp"/>
+     </copy>
+  	
+    <!-- Exclude any zips of the ARQ test scripts -->
+    <copy todir="${dist.dir}/${test.dir}">
+      <fileset dir="${test.dir}"
+               includes="**"
+               excludes="${test.dir}/*/*-tests-jena*.zip"/>
+    </copy>
+  </target>
+
+  <target name="zip" >
+    <!-- Build the zip of everything -->
+    <delete file="${dist.root}/${dist.name}.zip"/>
+    <zip zipfile="${dist.root}/${dist.name}.zip">
+      <fileset dir="dist" includes="${dist.name}/**"/>
+    </zip>
+  </target>
+
+  <!-- =========================================================== -->
+  <!-- Cleaning -->
+  <target name="clean" depends="clean-build-dirs"
+          description="Clean up">
+    <delete dir="${dist.dir}"/>
+  </target>
+
+  <target name="clean-all" depends="clean-javadoc,clean,clean-reports"
+          description="Clean up a lot">
+    <delete dir="${dist.dir}"/>
+  </target>
+
+  <target name="clean-build-dirs"
+          depends="clean-build-classes-dir,clean-build-src-dir"/>
+  <target name="clean-build-classes-dir">
+
+    <delete dir="${classes.build.dir}"/>
+    <mkdir dir="${classes.build.dir}"/>
+  </target>
+
+  <target name="clean-build-src-dir">
+    <delete dir="${src.build.dir}"/>
+    <mkdir  dir="${src.build.dir}"/>
+  </target>
+
+  <target name="clean-javadoc" description="Clean the javadoc directories">
+    <delete dir="${javadoc.dir}"/>
+    <mkdir  dir="${javadoc.all.dir}"/>
+  </target>
+
+  <target name="clean-reports">
+    <delete dir="${reports.dir}"/>
+    <delete dir="${reports.dir.xml}"/>
+    <delete dir="${reports.outdir}"/>
+  </target>
+
+  <!-- SSE : Remove sometime because it's in the core compile now. -->
+  
+  <!--
+  <property name="sse.src.dir" value="src-dev"/>
+
+  <path id="sse.classpath">
+    <fileset dir="${lib.dir}" includes="*.jar" excludes="${sse.jarfile}"/>
+  </path>
+
+  <target name="all-jars" depends="make-jars"/>
+
+  <target name="sse-compile" depends="default-javac-flags">
+    <antcall target="clean-build-dirs"/>
+    <javac srcdir="${sse.src.dir}/"
+           destdir="${classes.build.dir}"
+           debug="${java.debug}"
+           debuglevel="${java.debuglevel}"
+           deprecation="${java.deprecation}"
+           optimize="${java.optimize}"
+           source="${java.source}"
+           target="${java.target}">
+      <include name="com/hp/hpl/jena/sparql/sse/**"/>
+      <classpath refid="sse.classpath" />
+    </javac>
+  </target>
+  -->
+
+  <!-- Publishing with Ivy // Retrofit -->
+
+  <!-- ========================================== -->
+  <!-- ==== Ivy : Publication  -->
+
+  <property name="ivy.keyfile" 		location="${env.IVYKEY}"/>
+  <property name="ivy.user"    		value="${env.IVYUSER}"/>
+  <property name="pub.dir.local" 	location="tmp/pub"/>
+  <property name="artifacts.dir" 	location="tmp/artifacts"/>
+    
+  <target name="artifacts">
+    <!-- Crudely pick out of the distribution area -->
+    <copy file="${dist.dir}/lib/${jarfile}" tofile="${artifacts.dir}/${name}-${version}.jar"/> 
+    
+    <!--
+    <copy file="${dist.dir}/lib/${jarfile.extra}" tofile="${artifacts.dir}/${name}-extra-${version}.jar"/>
+    -->
+    
+    <!-- Sources -->
+    <!-- This is all the sources : needs tidying up
+    <jar destfile="${artifacts.dir}/${name}-${version}-sources.jar">
+      <fileset dir="${dist.dir}/src">
+      	<include name="**/*.java"/>
+      </fileset>
+    </jar>
+    -->
+    
+    <!-- Javadoc -->
+    <jar destfile="${artifacts.dir}/${name}-${version}-javadoc.jar">
+      <fileset dir="${dist.dir}/doc/javadoc">
+      </fileset>
+    </jar>
+    
+    <!-- pom.xml -->
+    <copy file="pom-arq.xml" tofile="${artifacts.dir}/${name}-${version}.pom">
+    	<filterset>
+          <filter token="VERSION" value="${version}"/>
+        </filterset>
+    </copy>
+  </target>
+   
+  <!-- Add release -->
+  <target name="publish" depends="artifacts,ivy-publish-dev">
+  </target>
+    
+  <target name="ivy-init">
+    <ivy:settings />
+  </target>
+
+  <macrodef name="arq-publish-one"> 
+    <attribute name="ivyfile"/>
+    <!-- <element name="some-tasks" optional="yes"/> -->
+    <sequential>
+      <ivy:resolve file="@{ivyfile}"/>
+      <ivy:publish conf="main" 
+		 resolver="dev-resolver" 
+		 overwrite="true">
+	<artifacts pattern="${artifacts.dir}/[artifact]-[revision](-[classifier]).[ext]" />
+    </ivy:publish>
+    </sequential>
+  </macrodef>
+
+  <target name="arq-publish" depends="artifacts" description="Publish!">
+    <arq-publish-one ivyfile="ivy-extra.xml"/>
+  </target>
+	    
+  <target name="ivy-resolve" depends="ivy-resolve-report"/>
+
+  <target name="ivy-resolve-report" depends="ivy-init">
+    <ivy:resolve conf="main"
+		 haltonfailure="false" failureproperty="ivy.resolve.failed"/>
+    <ivy:report todir="${reports.dir}"/>
+    <fail message="Ivy dependency failed" if="ivy.resolve.failed"/>
+  </target>
+
+  <target name="ivy-publish" depends="publish-check,ivy-init,ivy-resolve">
+    <!-- <ivy:resolve conf="main"/> -->
+    <ivy:deliver con="main"/>
+    <ivy:publish conf="main" 
+		 resolver="dev-publish" 
+		 overwrite="true">
+      <artifacts pattern="${artifacts.dir}/[artifact]-[revision](-[classifier]).[ext]" />
+    </ivy:publish>
+  </target>
+
+  <target name="publish-check">
+    <fail message="Publication environment variables (IVYUSER, IVYKEY) not set">
+      <condition>
+	<and> 
+	  <not><isset property="env.IVYUSER"/></not>
+	  <not><isset property="env.IVYKEY"/></not>
+	</and>
+      </condition>
+    </fail>
+    <fail message="Publication environment variable (IVYUSER) not set"  unless="env.IVYUSER"/>
+    <fail message="Publication environment variable (IVYKEY) not set"  unless="env.IVYKEY"/>
+  </target>
+
+  <!-- DEVELOPMENT -->
+  <target name="ivy-publish-dev" depends="ivy-init,publish-check,ivy-resolve">
+    <!-- <ivy:resolve conf="main"/> -->
+    <ivy:publish conf="main" 
+		 resolver="dev-resolver" 
+		 overwrite="true"
+		 forcedeliver="true">
+      <artifacts pattern="${artifacts.dir}/[artifact]-[revision](-[classifier]).[ext]" />
+    </ivy:publish>
+  </target>
+  
+</project>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivy.xml?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivy.xml (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivy.xml Fri Sep 30 13:32:00 2011
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ivy-module version="2.0"
+	    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	    xmlns:mvn="http://ant.apache.org/ivy/maven"
+	    xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+
+  <info module="AFS"
+	organisation="com.talis" 
+	revision="0.0.0">
+    <license name="BSD"/>
+    <ivyauthor name="Talis Systems Ltd" url="http://talis.com/"/>
+    <description>AFS - toys and </description>
+  </info>
+
+  <configurations defaultconfmapping="main->*">
+    <conf name="main" description="AFS" />
+    <conf name="dev"  description="AFS development"  extends="main" />
+  </configurations>
+
+  <publications>
+    <artifact name="AFS" type="jar"/>
+    <!--
+    <artifact name="tdbplus" type="zip"/>
+    <artifact name="tdbplus" type="xml" ext="pom"/>
+    <artifact name="tdbplus" mvn:classifier="sources" type="sources" ext="jar"/>
+    <artifact name="tdbplus" mvn:classifier="javadoc" type="javadoc" ext="jar"/>
+    -->
+  </publications>
+
+<!--
+  <dependencies>
+    <dependency org="com.hp.hpl.jena" name="arq" conf="main" rev="2.8.4-RC-2">
+      <artifact name="arq"/>
+      <artifact name="arq" mvn:classifier="tests"/>
+      <artifact name="arq" mvn:classifier="javadoc"/>
+      <artifact name="arq" mvn:classifier="sources"/>
+      <artifact name="arq" mvn:classifier="test-sources"/>
+      <exclude org="log4j" name="log4j" />
+   </dependency>
+
+   <dependency conf="main" org="log4j" name="log4j" rev="1.2.15"> 
+      <exclude org="com.sun.jmx" module="jmxri"/>
+      <exclude org="com.sun.jdmk" module="jmxtools"/>
+      <exclude org="javax.jms" module="jms"/>
+      <exclude org="javax.mail" module="mail"/>
+    </dependency>
+
+  </dependencies>
+-->
+</ivy-module>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivysettings.xml?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivysettings.xml (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/ivysettings.xml Fri Sep 30 13:32:00 2011
@@ -0,0 +1,20 @@
+<ivysettings>
+
+  <properties environment="env"/>
+  <resolvers>
+    <chain name="resolver-chain">
+      <!-- Jena development repository : not sync'ed with maven central -->
+      <ibiblio name="jena-dev" root="http://openjena.org/repo-dev" 
+	       m2compatible="true" useMavenMetadata="true"/>
+
+      <!-- Jena publish repository, sync'ed to maven central -->
+      <ibiblio name="jena" root="http://openjena.org/repo" 
+	       m2compatible="true"/>
+
+      <ibiblio name="maven2" m2compatible="true" />
+
+    </chain>
+  </resolvers>
+  <settings defaultResolver="resolver-chain"/>
+
+</ivysettings>

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-src.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-src.zip?rev=1177649&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-src.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-testing.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-testing.zip?rev=1177649&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/optimizer-testing.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/publishToJena
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/publishToJena?rev=1177649&view=auto
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/publishToJena (added)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/publishToJena Fri Sep 30 13:32:00 2011
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+# Copy over the parts of ARQ that are in the Jena distribtion.
+# Use (carefully!) to upgrade the copy of ARQ shipped with Jena in place.
+
+# !!!! Warning: need to check whether to upgrade jena.jar !!!!
+
+export JENAROOT=${JENAROOT:-../Jena2}
+
+## ant jar
+## ant javadoc
+
+# To copy:
+# 1/ Jar files
+# 2/ javadoc, javadoc-all
+# 3/ Documentation
+# 4/ Test suite
+# 5/ Examples
+
+# -- Functions
+
+function copyDir
+{
+    local SRC="$1"
+    local DST="$2"
+    echo "copyDir $1 => $2"
+    mkdir -p "$DST"
+    # No CVS or other junk
+    (   cd $SRC ;
+	# Add 	    -name ".svn" -prune  -or   for CVS
+	find . \
+	    -name .\?\?\*   -prune  -or  \
+	    -print  | cpio -p "$DST"     )
+}
+
+## # 1 -- jars files
+## 
+## cp -f lib/arq.jar $JENAROOT/lib
+## 
+
+# No longer in the Jena distribution - Jena doc points to the web.
+## # 2 -- Javadoc
+## 
+## rm -rf $JENAROOT/doc/ARQ/javadoc
+## cp -R doc/javadoc $JENAROOT/doc/ARQ/javadoc
+## 
+## ant javadoc-all
+## rm -rf $JENAROOT/doc/ARQ/javadoc-all/*
+## cp -R doc/javadoc-all
+
+
+## # No longer in the Jena distribution - Jena doc points to the web.
+## # 3 -- Documentation (avoid CVS/SVN directories and files)
+## 
+## # Remove destination files first
+## rm    $JENAROOT/doc/ARQ/*.*
+## cp doc/*.*           $JENAROOT/doc/ARQ
+## 
+## rm $JENAROOT/doc/ARQ/styles/*.*
+## cp doc/styles/*.*    $JENAROOT/doc/ARQ/styles
+## 
+## rm $JENAROOT/doc/ARQ/Tutorial/*.*
+## cp doc/Tutorial/*.*  $JENAROOT/doc/ARQ/Tutorial
+
+
+## # 4 -- Test suite
+
+echo "Also run testing/exportToJena"
+
+## 
+## copyDir testing/ARQ            $JENAROOT/testing/ARQ
+## copyDir testing/RDQL-ARQ       $JENAROOT/testing/RDQL-ARQ
+## copyDir testing/DAWG           $JENAROOT/testing/DAWG
+## copyDir testing/DAWG-Approved  $JENAROOT/testing/DAWG-Approved 
+
+# 5 -- Examples
+
+copyDir src-examples/arq $JENAROOT/src-examples/arq
+
+## # Clean a directory - removes files - leaves CVS info intact
+## function cleanDir
+## {
+##     local DIR="$1"
+##     F="$(find $DIR -type f -and ! -path \*CVS/\* -and ! -name .cvsignore )"
+##     rm -f $F
+##     Not CVS 
+## }
+
+# 6 -- bin and bat
+
+cp bin/{arq,arq_path,make_classpath,arq_version,qexpr,qparse,qtest,query,sparql,rset,update} $JENAROOT/bin
+cp bat/*.bat $JENAROOT/bat
+
+##
+
+echo "Check to see if jena.jar is newer than the Jena distribution"
+

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/rdql.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/rdql.zip?rev=1177649&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/rdql.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/sparql-update-submission-src.zip
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/sparql-update-submission-src.zip?rev=1177649&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/jena/Scratch/AFS/Jena-Dev/trunk/Archive/sparql-update-submission-src.zip
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream