Make consistent

afs · Dec 31, 2009 · 99042ab · 99042ab
1 parent 10e45fc
commit 99042ab
Show file tree

Hide file tree

Showing 176 changed files with 162 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 dwim
-classes
 DB
+classes
 Runs/
 Data/*
 TDB-DB/*

diff --git a/Notes.txt b/Notes.txt
diff --git a/README.txt b/README.txt
diff --git a/assembler-template.ttl b/assembler-template.ttl
diff --git a/build.xml b/build.xml
diff --git a/givennames.txt b/givennames.txt
diff --git a/ignoreQueries.txt b/ignoreQueries.txt
diff --git a/lib/jdom.jar b/lib/jdom.jar
diff --git a/lib/ssj.jar b/lib/ssj.jar
diff --git a/log4j.xml b/log4j.xml
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>com.hp.hpl.jena</groupId>
+  <artifactId>bsbm-local</artifactId>
+  <packaging>jar</packaging>
+  <name>BSBM-Local</name>
+  <version>0.0.0-SNAPSHOT</version>
+
+  <description>BSBM running over a local store</description>
+
+  <licenses>
+    <license>
+      <name>BSD-style license</name>
+      <url>http://openjena.org/license.html</url>
+    </license>
+  </licenses>
+
+  <scm>
+    <connection>git://github.com/afs/BSBM-Local</connection>
+    <url>http://github.com/afs/BSBM-Local</url>
+  </scm>
+
+
+  <dependencies>
+
+    <!-- Brings in all of Jena and ARQ needed at runtime + some utilities -->
+    <dependency>
+      <groupId>com.hp.hpl.jena</groupId>
+      <artifactId>tdb</artifactId>
+      <version>0.8.4</version>
+    </dependency>
+
+    <!-- Jena and ARQ - no testing support -->
+
+    <dependency>
+      <groupId>com.hp.hpl.jena</groupId>
+      <artifactId>jena</artifactId>
+      <version>2.6.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.hp.hpl.jena</groupId>
+      <artifactId>arq</artifactId>
+      <version>2.8.2</version>
+    </dependency>
+
+    <!-- OpenRDF Sesame -->
+
+    <dependency>
+      <groupId>org.openrdf.sesame</groupId>
+      <artifactId>sesame-runtime</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+
+    <!-- Maven does not pull this in from sesame-runtime (but ivy does) -->
+    <dependency>
+      <groupId>org.openrdf.sesame</groupId>
+      <artifactId>sesame-sail-nativerdf</artifactId>
+      <version>2.3.0</version>
+    </dependency>
+
+    <!-- Logging -->
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <version>1.5.8</version>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>[1.2.12,)</version>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>src-test</testSourceDirectory>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+	<configuration>
+	  <!--<compilerArgument>-verbose</compilerArgument>-->
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+ <repositories>
+
+    <!-- jena-repo is mirrored to Maven central repository -->
+    <!-- In case mirroring has not happened yet ... -->
+    <repository>
+      <id>repo-jena</id>
+      <name>Jena Maven - Repository</name>
+      <layout>default</layout>
+      <url>http://openjena.org/repo</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+
+    <!-- jena-repo-dev is where SNAPSHOTs and RCs are published -->  
+    <!--
+    <repository>
+      <id>repo-jena-dev</id>
+      <name>Jena Maven - Development Repository</name>
+      <layout>default</layout>
+      <url>http://openjena.org/repo-dev</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+    -->
+
+    <repository>
+      <id>repo-openrdf</id>
+      <name>OpenRDF releases</name>
+      <layout>default</layout>
+      <url>http://repo.aduna-software.org/maven2/releases</url>
+    </repository>
+
+  </repositories>
+
+  <distributionManagement>
+    <downloadUrl>http://openjena.org/repo-dev</downloadUrl>
+
+    <repository>
+      <id>jena-repo</id>
+      <name>Jena repo</name>
+
+      <!--<url>sftp://openjena.org/var/repo</url>-->
+
+      <!-- Because RC's aren't snapshots IMHO -->
+      <url>sftp://openjena.org/var/repo-dev</url>
+
+      <!--<url>file:tmp</url>-->
+      <layout>default</layout>
+    </repository> 
+
+    <snapshotRepository>
+      <id>jena-repo-dev</id>
+      <name>Jena development repo</name>
+      <url>sftp://openjena.org/var/repo-dev</url>
+      <!--<url>file:tmp</url>-->
+      <layout>default</layout>
+    </snapshotRepository>
+
+  </distributionManagement>
+
+</project>
diff --git a/queries/query1.txt b/queries/query1.txt
diff --git a/queries/query10.txt b/queries/query10.txt
diff --git a/queries/query10desc.txt b/queries/query10desc.txt
diff --git a/queries/query10valid.txt b/queries/query10valid.txt
diff --git a/queries/query11.txt b/queries/query11.txt
diff --git a/queries/query11desc.txt b/queries/query11desc.txt
diff --git a/queries/query11valid.txt b/queries/query11valid.txt
diff --git a/queries/query12.txt b/queries/query12.txt
diff --git a/queries/query12desc.txt b/queries/query12desc.txt
diff --git a/queries/query12valid.txt b/queries/query12valid.txt
diff --git a/queries/query1desc.txt b/queries/query1desc.txt
diff --git a/queries/query1valid.txt b/queries/query1valid.txt
diff --git a/queries/query2.txt b/queries/query2.txt
diff --git a/queries/query2desc.txt b/queries/query2desc.txt
diff --git a/queries/query2valid.txt b/queries/query2valid.txt
diff --git a/queries/query3.txt b/queries/query3.txt
diff --git a/queries/query3desc.txt b/queries/query3desc.txt
diff --git a/queries/query3valid.txt b/queries/query3valid.txt
diff --git a/queries/query4.txt b/queries/query4.txt
diff --git a/queries/query4desc.txt b/queries/query4desc.txt
diff --git a/queries/query4valid.txt b/queries/query4valid.txt
diff --git a/queries/query5.txt b/queries/query5.txt
diff --git a/queries/query5desc.txt b/queries/query5desc.txt
diff --git a/queries/query5valid.txt b/queries/query5valid.txt
diff --git a/queries/query6.txt b/queries/query6.txt
diff --git a/queries/query6desc.txt b/queries/query6desc.txt
diff --git a/queries/query6valid.txt b/queries/query6valid.txt
diff --git a/queries/query7.txt b/queries/query7.txt
diff --git a/queries/query7desc.txt b/queries/query7desc.txt
diff --git a/queries/query7valid.txt b/queries/query7valid.txt
diff --git a/queries/query8.txt b/queries/query8.txt
diff --git a/queries/query8desc.txt b/queries/query8desc.txt
diff --git a/queries/query8valid.txt b/queries/query8valid.txt
diff --git a/queries/query9.txt b/queries/query9.txt
diff --git a/queries/query9desc.txt b/queries/query9desc.txt
diff --git a/queries/query9valid.txt b/queries/query9valid.txt
diff --git a/querymix.txt b/querymix.txt
diff --git a/sqlQueries/query1.txt b/sqlQueries/query1.txt
diff --git a/sqlQueries/query10.txt b/sqlQueries/query10.txt
diff --git a/sqlQueries/query10desc.txt b/sqlQueries/query10desc.txt
diff --git a/sqlQueries/query10valid.txt b/sqlQueries/query10valid.txt
diff --git a/sqlQueries/query11.txt b/sqlQueries/query11.txt
diff --git a/sqlQueries/query11desc.txt b/sqlQueries/query11desc.txt
diff --git a/sqlQueries/query11valid.txt b/sqlQueries/query11valid.txt
diff --git a/sqlQueries/query12.txt b/sqlQueries/query12.txt
diff --git a/sqlQueries/query12desc.txt b/sqlQueries/query12desc.txt
diff --git a/sqlQueries/query12valid.txt b/sqlQueries/query12valid.txt
diff --git a/sqlQueries/query1desc.txt b/sqlQueries/query1desc.txt
diff --git a/sqlQueries/query1valid.txt b/sqlQueries/query1valid.txt
diff --git a/sqlQueries/query2.txt b/sqlQueries/query2.txt
diff --git a/sqlQueries/query2desc.txt b/sqlQueries/query2desc.txt
diff --git a/sqlQueries/query2valid.txt b/sqlQueries/query2valid.txt
diff --git a/sqlQueries/query3.txt b/sqlQueries/query3.txt
diff --git a/sqlQueries/query3desc.txt b/sqlQueries/query3desc.txt
diff --git a/sqlQueries/query3valid.txt b/sqlQueries/query3valid.txt
diff --git a/sqlQueries/query4.txt b/sqlQueries/query4.txt
diff --git a/sqlQueries/query4desc.txt b/sqlQueries/query4desc.txt
diff --git a/sqlQueries/query4valid.txt b/sqlQueries/query4valid.txt
diff --git a/sqlQueries/query5.txt b/sqlQueries/query5.txt
diff --git a/sqlQueries/query5desc.txt b/sqlQueries/query5desc.txt
diff --git a/sqlQueries/query5valid.txt b/sqlQueries/query5valid.txt
diff --git a/sqlQueries/query6.txt b/sqlQueries/query6.txt
diff --git a/sqlQueries/query6desc.txt b/sqlQueries/query6desc.txt
diff --git a/sqlQueries/query6valid.txt b/sqlQueries/query6valid.txt
diff --git a/sqlQueries/query7.txt b/sqlQueries/query7.txt
diff --git a/sqlQueries/query7desc.txt b/sqlQueries/query7desc.txt
diff --git a/sqlQueries/query7valid.txt b/sqlQueries/query7valid.txt
diff --git a/sqlQueries/query8.txt b/sqlQueries/query8.txt
diff --git a/sqlQueries/query8desc.txt b/sqlQueries/query8desc.txt
diff --git a/sqlQueries/query8valid.txt b/sqlQueries/query8valid.txt
diff --git a/sqlQueries/query9.txt b/sqlQueries/query9.txt
diff --git a/sqlQueries/query9desc.txt b/sqlQueries/query9desc.txt
diff --git a/sqlQueries/query9valid.txt b/sqlQueries/query9valid.txt
diff --git a/src/benchmark/generator/DateGenerator.java b/src/benchmark/generator/DateGenerator.java
diff --git a/src/benchmark/generator/Generator.java b/src/benchmark/generator/Generator.java
diff --git a/src/benchmark/generator/NormalDistGenerator.java b/src/benchmark/generator/NormalDistGenerator.java
diff --git a/src/benchmark/generator/NormalDistRangeGenerator.java b/src/benchmark/generator/NormalDistRangeGenerator.java
diff --git a/src/benchmark/generator/ParetoDistGenerator.java b/src/benchmark/generator/ParetoDistGenerator.java
diff --git a/src/benchmark/generator/RandomBucket.java b/src/benchmark/generator/RandomBucket.java
diff --git a/src/benchmark/generator/TextGenerator.java b/src/benchmark/generator/TextGenerator.java
diff --git a/src/benchmark/generator/ValueGenerator.java b/src/benchmark/generator/ValueGenerator.java
diff --git a/src/benchmark/model/BSBMResource.java b/src/benchmark/model/BSBMResource.java
diff --git a/src/benchmark/model/Offer.java b/src/benchmark/model/Offer.java
diff --git a/src/benchmark/model/Person.java b/src/benchmark/model/Person.java
diff --git a/src/benchmark/model/Producer.java b/src/benchmark/model/Producer.java
diff --git a/src/benchmark/model/Product.java b/src/benchmark/model/Product.java
diff --git a/src/benchmark/model/ProductFeature.java b/src/benchmark/model/ProductFeature.java
diff --git a/src/benchmark/model/ProductType.java b/src/benchmark/model/ProductType.java
diff --git a/src/benchmark/model/RatingSite.java b/src/benchmark/model/RatingSite.java
diff --git a/src/benchmark/model/Review.java b/src/benchmark/model/Review.java
diff --git a/src/benchmark/model/Vendor.java b/src/benchmark/model/Vendor.java
diff --git a/src/benchmark/qualification/Qualification.java b/src/benchmark/qualification/Qualification.java
diff --git a/src/benchmark/qualification/QualificationDefaultValues.java b/src/benchmark/qualification/QualificationDefaultValues.java
diff --git a/src/benchmark/qualification/QueryResult.java b/src/benchmark/qualification/QueryResult.java
diff --git a/src/benchmark/serializer/NTriples.java b/src/benchmark/serializer/NTriples.java
diff --git a/src/benchmark/serializer/ObjectBundle.java b/src/benchmark/serializer/ObjectBundle.java
diff --git a/src/benchmark/serializer/SQLSerializer.java b/src/benchmark/serializer/SQLSerializer.java
diff --git a/src/benchmark/serializer/Serializer.java b/src/benchmark/serializer/Serializer.java
diff --git a/src/benchmark/serializer/TriG.java b/src/benchmark/serializer/TriG.java
diff --git a/src/benchmark/serializer/Turtle.java b/src/benchmark/serializer/Turtle.java
diff --git a/src/benchmark/serializer/VirtSerializer.java b/src/benchmark/serializer/VirtSerializer.java
diff --git a/src/benchmark/serializer/XMLSerializer.java b/src/benchmark/serializer/XMLSerializer.java
diff --git a/src/benchmark/testdriver/AbstractParameterPool.java b/src/benchmark/testdriver/AbstractParameterPool.java
diff --git a/src/benchmark/testdriver/ClientManager.java b/src/benchmark/testdriver/ClientManager.java
diff --git a/src/benchmark/testdriver/ClientThread.java b/src/benchmark/testdriver/ClientThread.java
diff --git a/src/benchmark/testdriver/CompiledQuery.java b/src/benchmark/testdriver/CompiledQuery.java
diff --git a/src/benchmark/testdriver/CompiledQueryMix.java b/src/benchmark/testdriver/CompiledQueryMix.java
diff --git a/src/benchmark/testdriver/LocalConnectionJena.java b/src/benchmark/testdriver/LocalConnectionJena.java
diff --git a/src/benchmark/testdriver/LocalSPARQLParameterPool.java b/src/benchmark/testdriver/LocalSPARQLParameterPool.java
diff --git a/src/benchmark/testdriver/NetQuery.java b/src/benchmark/testdriver/NetQuery.java
diff --git a/src/benchmark/testdriver/PreCalcParameterPool.java b/src/benchmark/testdriver/PreCalcParameterPool.java
diff --git a/src/benchmark/testdriver/Query.java b/src/benchmark/testdriver/Query.java
diff --git a/src/benchmark/testdriver/QueryMix.java b/src/benchmark/testdriver/QueryMix.java
diff --git a/src/benchmark/testdriver/SPARQLConnection.java b/src/benchmark/testdriver/SPARQLConnection.java
diff --git a/src/benchmark/testdriver/SQLConnection.java b/src/benchmark/testdriver/SQLConnection.java
diff --git a/src/benchmark/testdriver/SQLParameterPool.java b/src/benchmark/testdriver/SQLParameterPool.java
diff --git a/src/benchmark/testdriver/ServerConnection.java b/src/benchmark/testdriver/ServerConnection.java
diff --git a/src/benchmark/testdriver/TestDriver.java b/src/benchmark/testdriver/TestDriver.java
diff --git a/src/benchmark/testdriver/TestDriverDefaultValues.java b/src/benchmark/testdriver/TestDriverDefaultValues.java
diff --git a/src/benchmark/tools/ResultTransform.java b/src/benchmark/tools/ResultTransform.java
diff --git a/src/benchmark/vocabulary/BSBM.java b/src/benchmark/vocabulary/BSBM.java
diff --git a/src/benchmark/vocabulary/DC.java b/src/benchmark/vocabulary/DC.java
diff --git a/src/benchmark/vocabulary/FOAF.java b/src/benchmark/vocabulary/FOAF.java
diff --git a/src/benchmark/vocabulary/ISO3166.java b/src/benchmark/vocabulary/ISO3166.java
diff --git a/src/benchmark/vocabulary/RDF.java b/src/benchmark/vocabulary/RDF.java
diff --git a/src/benchmark/vocabulary/RDFS.java b/src/benchmark/vocabulary/RDFS.java
diff --git a/src/benchmark/vocabulary/REV.java b/src/benchmark/vocabulary/REV.java
diff --git a/src/benchmark/vocabulary/XSD.java b/src/benchmark/vocabulary/XSD.java
diff --git a/titlewords.txt b/titlewords.txt
diff --git a/virtSQLqueries/query1.txt b/virtSQLqueries/query1.txt
diff --git a/virtSQLqueries/query10.txt b/virtSQLqueries/query10.txt
diff --git a/virtSQLqueries/query10desc.txt b/virtSQLqueries/query10desc.txt
diff --git a/virtSQLqueries/query10valid.txt b/virtSQLqueries/query10valid.txt
diff --git a/virtSQLqueries/query11.txt b/virtSQLqueries/query11.txt
diff --git a/virtSQLqueries/query11desc.txt b/virtSQLqueries/query11desc.txt
diff --git a/virtSQLqueries/query11valid.txt b/virtSQLqueries/query11valid.txt
diff --git a/virtSQLqueries/query12.txt b/virtSQLqueries/query12.txt
diff --git a/virtSQLqueries/query12desc.txt b/virtSQLqueries/query12desc.txt
diff --git a/virtSQLqueries/query12valid.txt b/virtSQLqueries/query12valid.txt
diff --git a/virtSQLqueries/query1desc.txt b/virtSQLqueries/query1desc.txt
diff --git a/virtSQLqueries/query1valid.txt b/virtSQLqueries/query1valid.txt
diff --git a/virtSQLqueries/query2.txt b/virtSQLqueries/query2.txt
diff --git a/virtSQLqueries/query2desc.txt b/virtSQLqueries/query2desc.txt
diff --git a/virtSQLqueries/query2valid.txt b/virtSQLqueries/query2valid.txt
diff --git a/virtSQLqueries/query3.txt b/virtSQLqueries/query3.txt
diff --git a/virtSQLqueries/query3desc.txt b/virtSQLqueries/query3desc.txt
diff --git a/virtSQLqueries/query3valid.txt b/virtSQLqueries/query3valid.txt
diff --git a/virtSQLqueries/query4.txt b/virtSQLqueries/query4.txt
diff --git a/virtSQLqueries/query4desc.txt b/virtSQLqueries/query4desc.txt
diff --git a/virtSQLqueries/query4valid.txt b/virtSQLqueries/query4valid.txt
diff --git a/virtSQLqueries/query5.txt b/virtSQLqueries/query5.txt
diff --git a/virtSQLqueries/query5desc.txt b/virtSQLqueries/query5desc.txt
diff --git a/virtSQLqueries/query5valid.txt b/virtSQLqueries/query5valid.txt
diff --git a/virtSQLqueries/query6.txt b/virtSQLqueries/query6.txt
diff --git a/virtSQLqueries/query6desc.txt b/virtSQLqueries/query6desc.txt
diff --git a/virtSQLqueries/query6valid.txt b/virtSQLqueries/query6valid.txt
diff --git a/virtSQLqueries/query7.txt b/virtSQLqueries/query7.txt
diff --git a/virtSQLqueries/query7desc.txt b/virtSQLqueries/query7desc.txt
diff --git a/virtSQLqueries/query7valid.txt b/virtSQLqueries/query7valid.txt
diff --git a/virtSQLqueries/query8.txt b/virtSQLqueries/query8.txt
diff --git a/virtSQLqueries/query8desc.txt b/virtSQLqueries/query8desc.txt
diff --git a/virtSQLqueries/query8valid.txt b/virtSQLqueries/query8valid.txt
diff --git a/virtSQLqueries/query9.txt b/virtSQLqueries/query9.txt
diff --git a/virtSQLqueries/query9desc.txt b/virtSQLqueries/query9desc.txt
diff --git a/virtSQLqueries/query9valid.txt b/virtSQLqueries/query9valid.txt