initial commit of Sesame 2.7.12 upgrade - first clean compile

git-svn-id: svn+ssh://svn.code.sf.net/p/bigdata/code/branches/SESAME_2_7@8430 8f7bc0f5-282e-0410-95e3-8d296e9bb460

Author: mrpersonick

.classpath

@@ -40,7 +40,6 @@
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/unimi/colt-1.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-4.8.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/icu/icu4j-charset-4.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="bigdata/lib/junit-3.8.1.jar" sourcepath="/root/.m2/repository/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/browser.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/classserver.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-jini/lib/jini/lib/fiddler.jar"/>
@@ -76,10 +75,6 @@
 	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-fileupload-1.2.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/httpcomponents/commons-io-2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/apache/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.6.10-onejar.jar" sourcepath="/Users/bryan/Documents/workspace/org.openrdf.sesame-2.6.10"/>
-	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.6.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.6.10.jar"/>
-	<classpathentry exported="true" kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.6.10.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata-rdf/lib/nxparser-1.2.3.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-client-9.1.4.v20140401.jar"/>
 	<classpathentry exported="true" kind="lib" path="bigdata/lib/jetty/jetty-continuation-9.1.4.v20140401.jar"/>
@@ -99,5 +94,11 @@
 	<classpathentry kind="lib" path="bigdata-blueprints/lib/blueprints-test-2.5.0.jar"/>
 	<classpathentry kind="lib" path="bigdata-blueprints/lib/rexster-core-2.5.0.jar"/>
 	<classpathentry kind="lib" path="bigdata-blueprints/lib/commons-configuration-1.10.jar"/>
+	<classpathentry kind="lib" path="bigdata-rdf/lib/openrdf-sesame-2.7.11-onejar.jar"/>
+	<classpathentry kind="lib" path="bigdata-rdf/lib/sesame-rio-testsuite-2.7.11.jar"/>
+	<classpathentry kind="lib" path="bigdata-sails/lib/sesame-sparql-testsuite-2.7.11.jar" sourcepath="/Users/mikepersonick/.m2/repository/org/openrdf/sesame/sesame-sparql-testsuite/2.7.11/sesame-sparql-testsuite-2.7.11-sources.jar"/>
+	<classpathentry kind="lib" path="bigdata-sails/lib/sesame-store-testsuite-2.7.11.jar" sourcepath="/Users/mikepersonick/.m2/repository/org/openrdf/sesame/sesame-store-testsuite/2.7.11/sesame-store-testsuite-2.7.11-sources.jar"/>
+	<classpathentry kind="lib" path="bigdata/lib/junit-4.11.jar" sourcepath="/Users/mikepersonick/.m2/repository/junit/junit/4.11/junit-4.11-sources.jar"/>
+	<classpathentry kind="lib" path="bigdata/lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//bigdata-sails/src/test/org/openrdf/repository/RepositoryConnectionTest.java=UTF-8

bigdata-gom/src/test/com/bigdata/gom/TestNumericBNodes.java

@@ -6,7 +6,6 @@
 import org.openrdf.rio.RDFParserRegistry;
 
 import com.bigdata.rdf.axioms.NoAxioms;
-import com.bigdata.rdf.rio.nquads.NQuadsParser;
 import com.bigdata.rdf.rio.turtle.BigdataTurtleParser;
 import com.bigdata.rdf.store.AbstractTripleStore;
 
@@ -32,7 +31,7 @@ protected Properties getProperties() throws Exception {
 	 * Mike,
 	 * 
 	 * If you load the attached file into the NSS and then execute
-	 * bigdata-gom/samples/É/Example1 (or Example2) it will throw an exception
+	 * bigdata-gom/samples//Example1 (or Example2) it will throw an exception
 	 * having to do with bnode Ids. This is the issue that David Booth posted
 	 * here [1].
 	 * 

bigdata-rdf/lib/openrdf-sesame-2.7.11-onejar.jar

@@ -32,17 +32,16 @@
 import java.util.ServiceLoader;
 
 import org.openrdf.query.QueryLanguage;
+import org.openrdf.query.resultio.TupleQueryResultParserRegistry;
 import org.openrdf.query.resultio.TupleQueryResultWriterRegistry;
 import org.openrdf.rio.RDFFormat;
 import org.openrdf.rio.RDFParserRegistry;
 import org.openrdf.rio.RDFWriterRegistry;
 
 import com.bigdata.rdf.model.StatementEnum;
 import com.bigdata.rdf.rio.json.BigdataSPARQLResultsJSONParserFactory;
-import com.bigdata.rdf.rio.json.BigdataSPARQLResultsJSONWriterFactoryForConstruct;
-import com.bigdata.rdf.rio.json.BigdataSPARQLResultsJSONWriterFactoryForSelect;
+import com.bigdata.rdf.rio.json.BigdataSPARQLResultsJSONWriterFactory;
 import com.bigdata.rdf.rio.ntriples.BigdataNTriplesParserFactory;
-import com.bigdata.rdf.rio.rdfxml.BigdataRDFXMLWriterFactory;
 import com.bigdata.rdf.rio.turtle.BigdataTurtleParserFactory;
 import com.bigdata.rdf.rio.turtle.BigdataTurtleWriterFactory;
 
@@ -126,19 +125,27 @@ synchronized static public void forceLoad() {
              * Allows parsing of JSON SPARQL Results with an {s,p,o,[c]} header.
              * RDR-enabled.
              */
-            r.add(new BigdataSPARQLResultsJSONParserFactory());
+//            r.add(new BigdataSPARQLResultsJSONParserFactory());
 
         }
 
         {
 
         	final TupleQueryResultWriterRegistry r = TupleQueryResultWriterRegistry.getInstance();
 
-        	// add our custom RDR-enabled JSON writer (RDR-enabled)
-        	r.add(new BigdataSPARQLResultsJSONWriterFactoryForSelect());
+        	// add our custom RDR-enabled JSON writer
+        	r.add(new BigdataSPARQLResultsJSONWriterFactory());
 
         }
 
+        {
+            
+            final TupleQueryResultParserRegistry r = TupleQueryResultParserRegistry.getInstance();
+
+            // add our custom RDR-enabled JSON parser
+            r.add(new BigdataSPARQLResultsJSONParserFactory());
+            
+        }
 
         // Ditto, but for the writer.
         {
@@ -150,7 +157,7 @@ synchronized static public void forceLoad() {
             r.add(new BigdataTurtleWriterFactory());
 
             // RDR-enabled
-            r.add(new BigdataSPARQLResultsJSONWriterFactoryForConstruct());
+//            r.add(new BigdataSPARQLResultsJSONWriterFactory());
 
         }
 

bigdata-rdf/lib/sesame-rio-testsuite-2.7.11.jar

@@ -1,5 +1,6 @@
 package com.bigdata.rdf.model;
 
+import java.util.Date;
 import java.util.UUID;
 
 import javax.xml.datatype.XMLGregorianCalendar;
@@ -153,6 +154,10 @@ public BigdataLiteral createLiteral(XMLGregorianCalendar arg0) {
         return valueFactory.createLiteral(arg0);
     }
 
+    public BigdataLiteral createLiteral(Date arg0) {
+        return valueFactory.createLiteral(arg0);
+    }
+
 	public BigdataStatement createStatement(Resource s, URI p, Value o) {
         return valueFactory.createStatement(s, p, o);
     }

bigdata-rdf/src/java/com/bigdata/rdf/ServiceProviderHook.java

@@ -27,6 +27,8 @@
 
 package com.bigdata.rdf.model;
 
+import java.util.Date;
+
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.openrdf.model.BNode;
@@ -114,6 +116,8 @@ public interface BigdataValueFactory extends ValueFactory {
 
     BigdataLiteral createLiteral(XMLGregorianCalendar arg0);
 
+    BigdataLiteral createLiteral(Date arg0);
+
     BigdataLiteral createLiteral(String label, String language);
 
     BigdataLiteral createLiteral(String label, URI datatype);

bigdata-rdf/src/java/com/bigdata/rdf/model/BNodeContextFactory.java

@@ -27,16 +27,19 @@
 
 package com.bigdata.rdf.model;
 
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
 
+import javax.xml.datatype.DatatypeConfigurationException;
+import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.openrdf.model.BNode;
 import org.openrdf.model.Literal;
 import org.openrdf.model.Resource;
-import org.openrdf.model.Statement;
 import org.openrdf.model.URI;
 import org.openrdf.model.Value;
 import org.openrdf.model.datatypes.XMLDatatypeUtil;
@@ -396,6 +399,18 @@ public BigdataLiteralImpl createLiteral(double arg0) {
         return new BigdataLiteralImpl(this, "" + arg0, null, xsd_double);
 
     }
+    
+    public BigdataLiteralImpl createLiteral(final Date date) {
+        GregorianCalendar c = new GregorianCalendar();
+        c.setTime(date);
+        try {
+            XMLGregorianCalendar xmlGregCalendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(c);
+            return createLiteral(xmlGregCalendar);
+        }
+        catch (DatatypeConfigurationException e) {
+            throw new RuntimeException("Could not instantiate javax.xml.datatype.DatatypeFactory", e);
+        }
+    }
 
     public BigdataLiteralImpl createLiteral(final XMLGregorianCalendar arg0) {