Moved assets and views to resources

WebContent/WEB-INF/web.xml

@@ -2,16 +2,16 @@
 <web-app id="WebApp_ID" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
     <display-name>Linked Data Fragments Server</display-name>
     <servlet>
-        <display-name>BasicLdfServlet</display-name>
-        <servlet-name>BasicLdfServlet</servlet-name>
+        <display-name>TpfServlet</display-name>
+        <servlet-name>TpfServlet</servlet-name>
         <servlet-class>org.linkeddatafragments.servlet.LinkedDataFragmentServlet</servlet-class>
     </servlet>
     <servlet>
         <servlet-name>AssetServlet</servlet-name>
         <servlet-class>org.linkeddatafragments.servlet.AssetServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>BasicLdfServlet</servlet-name>
+        <servlet-name>TpfServlet</servlet-name>
         <url-pattern>/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>

pom.xml

@@ -127,7 +127,6 @@
         </dependency>
     </dependencies>
     <build>
-        <sourceDirectory>src</sourceDirectory>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -226,7 +225,7 @@
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </snapshotRepository>
     </distributionManagement>
 </project>

src/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java → src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java

@@ -10,6 +10,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.net.URL;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -19,7 +20,6 @@
 import org.linkeddatafragments.datasource.IDataSource;
 import org.linkeddatafragments.datasource.index.IndexDataSource;
 import org.linkeddatafragments.fragments.ILinkedDataFragment;
-import org.linkeddatafragments.fragments.ILinkedDataFragmentRequest;
 import org.linkeddatafragments.fragments.tpf.ITriplePatternFragment;
 import org.linkeddatafragments.fragments.tpf.ITriplePatternFragmentRequest;
 
@@ -39,7 +39,6 @@ public class HtmlTriplePatternFragmentWriterImpl extends TriplePatternFragmentWr
     private final Template errorTemplate;
 
     private final String HYDRA = "http://www.w3.org/ns/hydra/core#"; 
-    private final String VOID = "http://rdfs.org/ns/void#"; 
 
     /**
      *
@@ -51,7 +50,7 @@ public HtmlTriplePatternFragmentWriterImpl(Map<String, String> prefixes, HashMap
         super(prefixes, datasources);
 
         cfg = new Configuration(Configuration.VERSION_2_3_22);
-        cfg.setDirectoryForTemplateLoading(new File(System.getProperty("user.dir") + "/views"));
+        cfg.setClassForTemplateLoading(getClass(), "/views");
         cfg.setDefaultEncoding("UTF-8");
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
 

src/main/resources/config-example.json

@@ -0,0 +1,36 @@
+{
+  "title": "My Linked Data Fragments server",
+
+  "datasourcetypes": {
+    "HdtDatasource"       : "org.linkeddatafragments.datasource.hdt.HdtDataSourceType",
+    "JenaTDBDatasource"   : "org.linkeddatafragments.datasource.tdb.JenaTDBDataSourceType"
+  },
+
+  "datasources": {
+    "dbpedia": {
+      "title": "DBPedia",
+      "type": "HdtDatasource",
+      "description": "DBPedia with an HDT back-end",
+      "settings": { "file": "data/dbpedia.hdt" }
+    },
+    "swdf": {
+      "title": "Semantic Web Dog Food",
+      "type": "HdtDatasource",
+      "description": "Semantic Web Dog Food with an HDT back-end",
+      "settings": { "file": "data/swdf.hdt" }
+    }
+  },
+
+  "prefixes": {
+    "rdf":         "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "rdfs":        "http://www.w3.org/2000/01/rdf-schema#",
+    "xsd":         "http://www.w3.org/2001/XMLSchema#",
+    "dc":          "http://purl.org/dc/terms/",
+    "foaf":        "http://xmlns.com/foaf/0.1/",
+    "dbpedia":     "http://dbpedia.org/resource/",
+    "dbpedia-owl": "http://dbpedia.org/ontology/",
+    "dbpprop":     "http://dbpedia.org/property/",
+    "hydra":       "http://www.w3.org/ns/hydra/core#",
+    "void":        "http://rdfs.org/ns/void#"
+  }
+}

src/test/java/org/linkeddatafragments/TestSuite.java → src/test/java/org/linkeddatafragments/test/TestSuite.java

@@ -1,10 +1,10 @@
-package test.java.org.linkeddatafragments;
+package org.linkeddatafragments.test;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import test.java.org.linkeddatafragments.datasource.HdtDataSourceTest;
-import test.java.org.linkeddatafragments.datasource.JenaTDBDataSourceTest;
+import org.linkeddatafragments.test.datasource.HdtDataSourceTest;
+import org.linkeddatafragments.test.datasource.JenaTDBDataSourceTest;
 
 /**
  *

src/test/java/org/linkeddatafragments/datasource/DataSourceTest.java → src/test/java/org/linkeddatafragments/test/datasource/DataSourceTest.java

@@ -1,4 +1,4 @@
-package test.java.org.linkeddatafragments.datasource;
+package org.linkeddatafragments.test.datasource;
 
 import com.google.gson.JsonObject;
 

src/test/java/org/linkeddatafragments/datasource/HdtDataSourceTest.java → src/test/java/org/linkeddatafragments/test/datasource/HdtDataSourceTest.java

@@ -1,4 +1,4 @@
-package test.java.org.linkeddatafragments.datasource;
+package org.linkeddatafragments.test.datasource;
 
 import com.google.gson.JsonObject;
 import com.hp.hpl.jena.rdf.model.RDFNode;
@@ -17,6 +17,7 @@
 import org.rdfhdt.hdt.hdt.HDT;
 import org.rdfhdt.hdt.hdt.HDTManager;
 import org.rdfhdt.hdt.options.HDTSpecification;
+import org.linkeddatafragments.test.datasource.DataSourceTest;
 
 /**
  *

src/test/java/org/linkeddatafragments/datasource/JenaTDBDataSourceTest.java → src/test/java/org/linkeddatafragments/test/datasource/JenaTDBDataSourceTest.java

@@ -1,4 +1,4 @@
-package test.java.org.linkeddatafragments.datasource;
+package org.linkeddatafragments.test.datasource;
 
 import com.google.gson.JsonObject;