Towards getting the old REST API working again

linkedgeodata-core/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.aksw.linkedgeodata</groupId>
 		<artifactId>linkedgeodata-parent</artifactId>
-		<version>0.4-SNAPSHOT</version>
+		<version>0.4.2-SNAPSHOT</version>
 	</parent>
 
 <!--
@@ -23,14 +23,67 @@
 -->
 
 	<dependencies>
+<!-- 		<dependency> -->
+<!-- 			<groupId>org.aksw.sparqlify</groupId> -->
+<!-- 			<artifactId>sparqlify-core</artifactId> -->
+<!-- 		</dependency> -->
+
+		<dependency>
+			<groupId>org.aksw.jena-sparql-api</groupId>
+			<artifactId>jena-sparql-api-server</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aksw.jena-sparql-api</groupId>
+			<artifactId>jena-sparql-api-servlets</artifactId>
+		</dependency>
+
+		<dependency>
+                <groupId>org.aksw.jena-sparql-api</groupId>
+                <artifactId>jena-sparql-api-core</artifactId>
+        </dependency>
+		
+		<dependency>
+                <groupId>org.aksw.jena-sparql-api</groupId>
+                <artifactId>jena-sparql-api-cache-h2</artifactId>
+        </dependency>
+	
+	    <dependency>
+	            <groupId>org.springframework</groupId>
+	            <artifactId>spring-jdbc</artifactId>
+	    </dependency>
+	
 		<dependency>
-			<groupId>org.aksw.sparqlify</groupId>
-			<artifactId>sparqlify-core</artifactId>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+		</dependency>	
+		
+		<dependency>
+				<groupId>postgresql</groupId>
+				<artifactId>postgresql</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.jolbox</groupId>
+			<artifactId>bonecp</artifactId>
+			<version>0.7.1.RELEASE</version>				
+		</dependency>
+		
+		<dependency>
+			<groupId>org.openstreetmap.osmosis</groupId>
+			<artifactId>osmosis-core</artifactId>
 		</dependency>
+		
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 		</dependency>
+
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+		</dependency>
+
 	</dependencies>
 
 </project>

linkedgeodata-core/src/main/java/org/linkedgeodata/dump/LgdDumper.java

@@ -27,7 +27,6 @@
 import org.aksw.commons.collections.SinglePrefetchIterator;
 import org.aksw.commons.util.strings.StringUtils;
 import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;
 import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Options;
@@ -36,7 +35,6 @@
 import org.apache.jena.atlas.lib.Sink;
 import org.apache.jena.riot.out.SinkTripleOutput;
 import org.apache.log4j.PropertyConfigurator;
-import org.postgis.PGgeometry;
 import org.postgresql.ds.PGSimpleDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,15 +50,15 @@
 import com.hp.hpl.jena.sparql.expr.NodeValue;
 import com.hp.hpl.jena.vocabulary.RDF;
 
-interface GeometryRdfSerializer {
-	void write(PGgeometry geometry, Sink<Triple> sink);
-}
-
-class GeoVocabRdfSerializer implements GeometryRdfSerializer {
-
-	public void write(PGgeometry geometry, Sink<Triple> sink) {
-	}
-}
+//interface GeometryRdfSerializer {
+//	void write(PGgeometry geometry, Sink<Triple> sink);
+//}
+//
+//class GeoVocabRdfSerializer implements GeometryRdfSerializer {
+//
+//	public void write(PGgeometry geometry, Sink<Triple> sink) {
+//	}
+//}
 
 class ValidatingSink
 	implements Sink<Triple>
@@ -334,7 +332,7 @@ public static void main(String[] args) throws Exception {
 		 * FileInputStream("jdklog.properties"));
 		 */
 
-		CommandLineParser cliParser = new GnuParser();
+		GnuParser cliParser = new GnuParser();
 
 		/*
 		cliOptions.addOption("t", "type", true,

linkedgeodata-core/src/main/java/org/linkedgeodata/rest/MessageBodyWriterHtml.java

@@ -1,18 +0,0 @@
-package org.linkedgeodata.rest;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.ext.Provider;
-
-import com.hp.hpl.jena.sparql.engine.http.HttpParams;
-
-//@Provider
-//@Produces({HttpParams.contentTypeTurtle})
-//@Consumes({HttpParams.contentTypeTurtle, "text/html"})
-public class MessageBodyWriterHtml
-	extends AbstractModelMessageReaderWriterProvider
-{
-	public MessageBodyWriterHtml() {
-		super("HTML");
-	}
-}

linkedgeodata-core/src/main/java/org/linkedgeodata/rest/MessageBodyWriterNTriples.java

@@ -1,60 +0,0 @@
-package org.linkedgeodata.rest;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.ext.MessageBodyWriter;
-import javax.ws.rs.ext.Provider;
-
-import org.apache.jena.riot.WebContent;
-
-import com.hp.hpl.jena.rdf.model.Model;
-
-@Provider
-@Produces({WebContent.contentTypeNTriples})
-//@Consumes({HttpParams.contentTypeNTriples})
-public class MessageBodyWriterNTriples
-	//extends AbstractModelMessageReaderWriterProvider
-	implements MessageBodyWriter<Model>
-{
-	public MessageBodyWriterNTriples() {
-		System.out.println("---");
-	}
-	
-	/*
-	public MessageBodyWriterNTriples() {
-		super("N-TRIPLES");
-		
-		throw new RuntimeException("Hooray - Initialized");
-	}*/
-	
-	@Override
-	public boolean isWriteable(Class<?> type, Type genericType,
-			Annotation[] annotations, MediaType mediaType) {
-		return Model.class.isAssignableFrom(type);
-	}
-
-	@Override
-	public void writeTo(Model t, Class<?> type, Type genericType,
-			Annotation[] annotations, MediaType mediaType,
-			MultivaluedMap<String, Object> httpHeaders,
-			OutputStream entityStream) throws IOException,
-			WebApplicationException {
-
-
-		t.write(entityStream, "N-TRIPLES");
-	}
-
-	@Override
-	public long getSize(Model t, Class<?> type, Type genericType,
-			Annotation[] annotations, MediaType mediaType) {
-		return -1;
-	}	
-
-}