You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2014/01/08 12:03:39 UTC
[1/4] git commit: switched templating to lean template loading which
fixes step 2 for MARMOTTA-379
Updated Branches:
refs/heads/develop e5e54ff1b -> bc88f463f
switched templating to lean template loading which fixes step 2 for MARMOTTA-379
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/bc88f463
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/bc88f463
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/bc88f463
Branch: refs/heads/develop
Commit: bc88f463f2e73fee10c0b4c18a69f0b1ba6c718d
Parents: b4a418d
Author: Jakob Frank <ja...@apache.org>
Authored: Wed Jan 8 11:59:54 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Jan 8 12:02:32 2014 +0100
----------------------------------------------------------------------
.../templating/TemplatingServiceImpl.java | 40 ++++++++++++--------
1 file changed, 24 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/bc88f463/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
index e19b770..02a5ff7 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java
@@ -84,23 +84,25 @@ public class TemplatingServiceImpl implements TemplatingService {
if (!templateDir.exists()) templateDir.mkdirs();
- for (String fName: new String[] {
- TemplatingService.ADMIN_TPL,
- TemplatingService.ERROR_404_TPL,
- TemplatingService.RDF_HTML_TPL }) {
- final File dT = new File(templateDir, fName);
- if (!dT.exists()) {
- try {
- log.warn("Default template not found at {}, copying fallback...", dT.getAbsolutePath());
- final InputStream str = this.getClass().getResourceAsStream(TemplatingService.PATH + fName);
- FileUtils.copyInputStreamToFile(str, dT);
- } catch (IOException e) {
- log.error("Could not create fallback template, templating might react weird!", e);
- }
- }
- }
}
-
+
+ private void loadTemplateFromClasspath(String templateName, Class<?> clazz) {
+ final String src = TemplatingService.PATH + templateName;
+ final File dT = new File(templateDir, templateName);
+ if (!dT.exists()) {
+ try {
+ log.info("template {} not found in {}, copying fallback...", templateName, templateDir.getAbsolutePath());
+ final InputStream str = clazz.getResourceAsStream(src);
+ if (str == null) {
+ throw new IOException("Resource " + src + " not found in ClassLoader (" + clazz + ")");
+ }
+ FileUtils.copyInputStreamToFile(str, dT);
+ } catch (IOException e) {
+ log.error("Could not load template from classpath, templating might react weird!", e);
+ }
+ }
+ }
+
/**
* Update the data model in case an important value has changed
* @param event
@@ -135,11 +137,17 @@ public class TemplatingServiceImpl implements TemplatingService {
@Override
public Template getTemplate(String name) throws IOException {
+ // make sure template exists
+ loadTemplateFromClasspath(name, TemplatingServiceImpl.class);
+
return getConfiguration().getTemplate(name);
}
@Override
public Template getTemplate(Class<?> cls, String name) throws IOException {
+ // make sure template exists
+ loadTemplateFromClasspath(name, cls);
+
return getConfiguration(cls).getTemplate(name);
}
[3/4] git commit: fixed some warnings
Posted by ja...@apache.org.
fixed some warnings
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/b4a418d8
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/b4a418d8
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/b4a418d8
Branch: refs/heads/develop
Commit: b4a418d89d651d3c1fdab12e6747722270dc5a4b
Parents: 433d632
Author: Jakob Frank <ja...@apache.org>
Authored: Wed Jan 8 11:56:28 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Jan 8 12:02:32 2014 +0100
----------------------------------------------------------------------
.../platform/sparql/services/sparql/SparqlServiceImpl.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/b4a418d8/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
index a2c0c94..ac5d5cd 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparql/SparqlServiceImpl.java
@@ -110,7 +110,9 @@ public class SparqlServiceImpl implements SparqlService {
* @deprecated beginning with Sesame 2.8, use {@link RDFFormat#getStandardURI()} or {@link QueryResultFormat#etStandardURI()}
*/
@Deprecated
- private static final Map<FileFormat, String> w3cFormatID = new HashMap<FileFormat, String>() {{
+ private static final Map<FileFormat, String> w3cFormatID = new HashMap<FileFormat, String>() {
+ private static final long serialVersionUID = 1L;
+ {
put(RDFFormat.JSONLD, "http://www.w3.org/ns/formats/JSON-LD");
put(RDFFormat.N3, "http://www.w3.org/ns/formats/N3");
put(RDFFormat.NTRIPLES, "http://www.w3.org/ns/formats/N-Triples");
@@ -257,7 +259,6 @@ public class SparqlServiceImpl implements SparqlService {
public void query(final QueryLanguage queryLanguage, final String query, final QueryResultWriter writer, final int timeoutInSeconds) throws MarmottaException, MalformedQueryException, QueryEvaluationException, TimeoutException {
log.debug("executing SPARQL query:\n{}", query);
Future<Boolean> future = executorService.submit(new Callable<Boolean>() {
- @SuppressWarnings("deprecation")
@Override
public Boolean call() throws Exception {
long start = System.currentTimeMillis();
[2/4] git commit: MARMOTTA-379: First step fixed,
WriterConfig was not initialized in the SPARQLResultsHTMLWriter.
Posted by ja...@apache.org.
MARMOTTA-379: First step fixed, WriterConfig was not initialized in the SPARQLResultsHTMLWriter.
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/433d6326
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/433d6326
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/433d6326
Branch: refs/heads/develop
Commit: 433d6326e82815c16af83d368e037f6071aa0863
Parents: ab9df24
Author: Jakob Frank <ja...@apache.org>
Authored: Wed Jan 8 10:23:32 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Jan 8 12:02:32 2014 +0100
----------------------------------------------------------------------
.../services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/433d6326/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
index da64ce2..9577166 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLResultsHTMLWriter.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * SPARQL results to HTML writer usong Freemarker
+ * SPARQL results to HTML writer using Freemarker
*
* @author Sergio Fernández
*/
@@ -63,7 +63,7 @@ public class SPARQLResultsHTMLWriter extends TupleQueryResultHandlerBase impleme
SUPPORTED_SETTINGS = Collections.unmodifiableSet(tempSettings);
}
- private OutputStream out;
+ final private OutputStream out;
private List<String> vars;
@@ -73,6 +73,7 @@ public class SPARQLResultsHTMLWriter extends TupleQueryResultHandlerBase impleme
public SPARQLResultsHTMLWriter(OutputStream out) {
this.out = out;
+ this.config = new WriterConfig();
}
public SPARQLResultsHTMLWriter(OutputStream out, TemplatingService templatingService) {
[4/4] git commit: fixed some warnings
Posted by ja...@apache.org.
fixed some warnings
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/ab9df242
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/ab9df242
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/ab9df242
Branch: refs/heads/develop
Commit: ab9df2426f0c808ea96942fc9ea5a9b582c851b2
Parents: e5e54ff
Author: Jakob Frank <ja...@apache.org>
Authored: Wed Jan 8 10:23:17 2014 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Wed Jan 8 12:02:32 2014 +0100
----------------------------------------------------------------------
.../core/services/templating/AdminTemplatingServiceImpl.java | 4 ----
.../services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab9df242/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
index b0c9db5..66cb7a7 100644
--- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
+++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/AdminTemplatingServiceImpl.java
@@ -19,11 +19,7 @@ package org.apache.marmotta.platform.core.services.templating;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
http://git-wip-us.apache.org/repos/asf/marmotta/blob/ab9df242/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
index acdb561..3345183 100644
--- a/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
+++ b/platform/marmotta-sparql/src/main/java/org/apache/marmotta/platform/sparql/services/sparqlio/sparqlhtml/SPARQLBooleanHTMLWriter.java
@@ -20,9 +20,8 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.nio.charset.Charset;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import javax.xml.transform.Source;
@@ -162,7 +161,7 @@ public class SPARQLBooleanHTMLWriter implements BooleanQueryResultWriter
@Override
public Collection<RioSetting<?>> getSupportedSettings()
{
- return new ArrayList<RioSetting<?>>();
+ return Collections.emptySet();
}
@Override