Skip to content

Commit 6572bb1

Browse files
author
Miel Vander Sande
committed
Added favicon
1 parent 3b382fd commit 6572bb1

File tree

5 files changed

+44
-24
lines changed

5 files changed

+44
-24
lines changed

‎pom.xml

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<name>Ruben Verborgh</name>
3030
<email>[email protected]</email>
3131
<url>http://ruben.verborgh.org</url>
32-
<organization>iMinds</organization>
33-
<organizationUrl>http://iminds.be</organizationUrl>
32+
<organization>imec</organization>
33+
<organizationUrl>http://imec.be</organizationUrl>
3434
<timezone>Europe/Brussels</timezone>
3535
</developer>
3636
<developer>
@@ -39,7 +39,7 @@
3939
<email>[email protected]</email>
4040
<url>http://semweb.mmlab.be</url>
4141
<organization>iMinds</organization>
42-
<organizationUrl>http://iminds.be</organizationUrl>
42+
<organizationUrl>http://imec.be</organizationUrl>
4343
<timezone>Europe/Brussels</timezone>
4444
</developer>
4545
</developers>
@@ -60,22 +60,22 @@
6060
<dependency>
6161
<groupId>org.apache.jena</groupId>
6262
<artifactId>jena-core</artifactId>
63-
<version>3.0.0</version>
63+
<version>3.0.1</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>org.apache.jena</groupId>
6767
<artifactId>jena-arq</artifactId>
68-
<version>3.0.0</version>
68+
<version>3.0.1</version>
6969
</dependency>
7070
<dependency>
7171
<groupId>org.apache.httpcomponents</groupId>
7272
<artifactId>httpclient</artifactId>
73-
<version>4.3.5</version>
73+
<version>4.3.6</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.google.code.gson</groupId>
7777
<artifactId>gson</artifactId>
78-
<version>2.5</version>
78+
<version>2.7</version>
7979
</dependency>
8080
<dependency>
8181
<groupId>javax.servlet</groupId>

‎src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import java.io.File;
55
import java.io.FileReader;
66
import java.io.IOException;
7+
import java.io.InputStream;
8+
import java.net.URL;
79
import java.util.ArrayList;
810
import java.util.Collection;
911
import java.util.HashMap;
@@ -13,8 +15,6 @@
1315
import javax.servlet.http.HttpServlet;
1416
import javax.servlet.http.HttpServletRequest;
1517
import javax.servlet.http.HttpServletResponse;
16-
import org.apache.jena.rdf.model.Model;
17-
import org.apache.jena.rdf.model.ModelFactory;
1818
import org.apache.jena.riot.Lang;
1919
import org.linkeddatafragments.config.ConfigReader;
2020
import org.linkeddatafragments.datasource.DataSourceFactory;
@@ -46,7 +46,7 @@ public class LinkedDataFragmentServlet extends HttpServlet {
4646
/**
4747
*
4848
*/
49-
public final static String CFGFILE = "configFile";
49+
public final static String CFGFILE = "configFile";
5050

5151
private ConfigReader config;
5252
private final HashMap<String, IDataSource> dataSources = new HashMap<>();

‎src/main/java/org/linkeddatafragments/standalone/JettyServer.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package org.linkeddatafragments.standalone;
22

3+
import java.net.URL;
34
import org.apache.commons.cli.CommandLine;
45
import org.apache.commons.cli.CommandLineParser;
56
import org.apache.commons.cli.DefaultParser;
67
import org.apache.commons.cli.HelpFormatter;
78
import org.apache.commons.cli.Options;
8-
import org.eclipse.jetty.server.Handler;
99
import org.eclipse.jetty.server.Server;
10-
import org.eclipse.jetty.server.handler.ContextHandler;
11-
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
12-
import org.eclipse.jetty.server.handler.ResourceHandler;
1310
import org.eclipse.jetty.servlet.DefaultServlet;
1411
import org.eclipse.jetty.servlet.ServletContextHandler;
15-
import org.eclipse.jetty.servlet.ServletHandler;
1612
import org.eclipse.jetty.servlet.ServletHolder;
17-
import org.eclipse.jetty.util.resource.Resource;
1813
import org.linkeddatafragments.servlet.LinkedDataFragmentServlet;
1914

2015
/**
@@ -36,7 +31,7 @@
3631
public class JettyServer {
3732
private static void printHelp(Options options) {
3833
HelpFormatter formatter = new HelpFormatter();
39-
formatter.printHelp(JettyServer.class.getName() + " [config-example.json] [<options>]",
34+
formatter.printHelp("java -jar target/ldf-server.jar [config-example.json] [<options>]",
4035
"Starts a standalone LDF Triple Pattern server. Options:", options, "");
4136
}
4237

@@ -52,13 +47,13 @@ public static void main(String[] args) throws Exception {
5247

5348
CommandLineParser parser = new DefaultParser();
5449
CommandLine commandLine = parser.parse(options, args);
55-
50+
5651
String config = null;
5752
if (!commandLine.getArgList().isEmpty()) {
5853
config = commandLine.getArgs()[0];
5954
}
6055

61-
if (config == null || commandLine.hasOption('h')) {
56+
if (commandLine.hasOption('h')) {
6257
printHelp(options);
6358
System.exit(-1);
6459
}

‎src/main/resources/views/base.ftl.html

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<html lang="en" prefix="hydra: http://www.w3.org/ns/hydra/core# void: http://rdfs.org/ns/void#">
55
<head>
66
<meta charset="utf-8">
7-
<title>${ title!header!"Linked Data Fragments Server" }</title>
7+
<title>${ title!header!"Linked Data Fragments Server" }</title>
8+
<link rel="shortcut icon" href="assets/favicon.ico">
89
<link rel="stylesheet" href="${ assetsPath }style.css" />
910
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Open+Sans:700italic,400,700|Droid+Sans+Mono" type="text/css" />
1011
<meta name="viewport" content="width=device-width,minimum-scale=1,maximum-scale=1">
@@ -22,7 +23,7 @@ <h1><a href="/">${header!"Linked Data Fragments Server"}</a></h1>
2223
<footer>
2324
<p>
2425
Powered by a <a href="https://github.com/LinkedDataFragments/Server.java" target="_blank">Linked Data Fragments Server</a>
25-
©2013–${date?string.yyyy} Multimedia Lab – iMinds – Ghent University
26+
©2013–${date?string.yyyy} Ghent University - imec
2627
</p>
2728
</footer>
2829
</body>

‎src/main/resources/views/fragment.ftl.html

+27-3
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,38 @@ <h3>Matches in ${datasource.getTitle()} for <em class="pattern">${ (query.getPat
5252
<#assign object = triple.getObject().asNode().toString()>
5353
<li>
5454
<a href="?subject=${subject?url}">
55-
<abbr title="${ subject }"><#if (subject?last_index_of("/") > -1)>${ subject?keep_after_last("/") }<#else>${ subject }</#if></abbr>
55+
<abbr title="${ subject }">
56+
<#if (subject?last_index_of("#") > -1) >
57+
${ subject?keep_after_last("#") }
58+
<#elseif (subject?last_index_of("/") > -1)>
59+
${ subject?keep_after_last("/") }
60+
<#else>
61+
${ subject }
62+
</#if>
63+
</abbr>
5664
</a>
5765
<a href="?predicate=${predicate?url}">
58-
<abbr title="${ predicate }">${predicate?keep_after_last("/")}</abbr>
66+
<abbr title="${ predicate }">
67+
<#if (predicate?last_index_of("#") > -1) >
68+
${ predicate?keep_after_last("#") }
69+
<#elseif (predicate?last_index_of("/") > -1)>
70+
${ predicate?keep_after_last("/") }
71+
<#else>
72+
${ predicate }
73+
</#if>
74+
</abbr>
5975
</a>
6076
<#if !triple.getObject().isLiteral()>
6177
<a href="?object=${object?url}" resource="${ subject}">
62-
<abbr title="${ object }" property="${ predicate }" resource="${ object }"><#if (object?last_index_of("/") > -1)>${ object?keep_after_last("/") }<#else>${ object }</#if></abbr>
78+
<abbr title="${ object }" property="${ predicate }" resource="${ object }">
79+
<#if (object?last_index_of("#") > -1) >
80+
${ object?keep_after_last("#") }
81+
<#elseif (object?last_index_of("/") > -1)>
82+
${ object?keep_after_last("/") }
83+
<#else>
84+
${ object }
85+
</#if>
86+
</abbr>
6387
</a>.
6488
<#else>
6589
<a href="?object=${object?url}" resource="${ subject}">${object}</a>.

0 commit comments

Comments
 (0)