You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/08/05 20:55:50 UTC
[1/3] jena git commit: Rename to make clear when processing the
server configuration.
Repository: jena
Updated Branches:
refs/heads/master 81cc6f4e5 -> b5d4fcbe0
Rename to make clear when processing the server configuration.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2a19e1a8
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2a19e1a8
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2a19e1a8
Branch: refs/heads/master
Commit: 2a19e1a86baa47fa599905c9bee93f04922584f6
Parents: 81cc6f4
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 20:06:02 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 20:06:02 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/FusekiLogging.java | 4 +---
.../java/org/apache/jena/fuseki/server/FusekiServer.java | 8 ++++----
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2a19e1a8/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
index a315f69..6eb669b 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
@@ -62,9 +62,7 @@ public class FusekiLogging
allowLoggingReset = value ;
}
- /** Set up logging.
- * This is mainly for the standalone server.
- */
+ /** Set up logging - standalone and war packaging */
public static synchronized void setLogging() {
if ( ! allowLoggingReset )
return ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2a19e1a8/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
index d375e51..6adbf0d 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
@@ -234,11 +234,11 @@ public class FusekiServer
return datasets ;
if ( params.fusekiCmdLineConfigFile != null ) {
- List<DataAccessPoint> confDatasets = processConfigFile(params.fusekiCmdLineConfigFile) ;
+ List<DataAccessPoint> confDatasets = processServerConfigFile(params.fusekiCmdLineConfigFile) ;
datasets.addAll(confDatasets) ;
}
else if ( params.fusekiServerConfigFile != null ) {
- List<DataAccessPoint> confDatasets = processConfigFile(params.fusekiServerConfigFile) ;
+ List<DataAccessPoint> confDatasets = processServerConfigFile(params.fusekiServerConfigFile) ;
datasets.addAll(confDatasets) ;
}
else if ( params.dsg != null ) {
@@ -252,13 +252,13 @@ public class FusekiServer
return datasets ;
}
- private static List<DataAccessPoint> processConfigFile(String configFilename) {
+ private static List<DataAccessPoint> processServerConfigFile(String configFilename) {
if ( ! FileOps.exists(configFilename) ) {
Fuseki.configLog.warn("Configuration file '" + configFilename+"' does not exist") ;
return Collections.emptyList();
}
Fuseki.configLog.info("Configuration file: " + configFilename) ;
- return FusekiConfig.readConfigFile(configFilename) ;
+ return FusekiConfig.readServerConfigFile(configFilename) ;
}
private static DataAccessPoint configFromTemplate(String templateFile, String datasetPath,
[2/3] jena git commit: Provide reading and creating DataAccessPoints
from a single file.
Posted by an...@apache.org.
Provide reading and creating DataAccessPoints from a single file.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5235b5f6
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5235b5f6
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5235b5f6
Branch: refs/heads/master
Commit: 5235b5f6f28efd931d2e7eb4f8e347f5aaa31749
Parents: 2a19e1a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 20:06:39 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 20:06:39 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/build/FusekiConfig.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5235b5f6/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
index f7908fb..5082bf0 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
@@ -71,7 +71,7 @@ public class FusekiConfig {
} ;
/** Has side effects in server setup */
- public static List<DataAccessPoint> readConfigFile(String filename) {
+ public static List<DataAccessPoint> readServerConfigFile(String filename) {
// Old-style config file.
Model model = readAssemblerFile(filename) ;
if ( model.size() == 0 )
@@ -209,6 +209,19 @@ public class FusekiConfig {
return dataServiceRef ;
}
+ /** Read and process one file */
+ public static List<DataAccessPoint> readConfigurationFile(String fn) {
+ List<DataAccessPoint> acc = new ArrayList<>() ;
+ Model m = readAssemblerFile(fn) ;
+ DatasetDescriptionRegistry dsDescMap = new DatasetDescriptionRegistry() ;
+ readConfiguration(m, dsDescMap, acc) ;
+ return acc ;
+ }
+
+ /** Read a configuration in a model.
+ * Allow dataset descriptions to be carried over from anothe rplace.
+ * Add to a list.
+ */
private static void readConfiguration(Model m, DatasetDescriptionRegistry dsDescMap, List<DataAccessPoint> dataServiceRef) {
List<Resource> services = getByType(FusekiVocab.fusekiService, m) ;
[3/3] jena git commit: Remove some unnecessary logging.
Posted by an...@apache.org.
Remove some unnecessary logging.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b5d4fcbe
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b5d4fcbe
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b5d4fcbe
Branch: refs/heads/master
Commit: b5d4fcbe0037995c99cb86e4f249044497f755cf
Parents: 5235b5f
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 5 21:55:26 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 5 21:55:26 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/servlets/SPARQL_Query.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b5d4fcbe/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
index dc2e89b..d9962a6 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
@@ -314,37 +314,34 @@ public abstract class SPARQL_Query extends SPARQL_Protocol
ResultSet rs = queryExecution.execSelect() ;
// Force some query execution now.
- //
// If the timeout-first-row goes off, the output stream has not
// been started so the HTTP error code is sent.
rs.hasNext() ;
// If we wanted perfect query time cancellation, we could consume
- // the result now
- // to see if the timeout-end-of-query goes off.
-
+ // the result now to see if the timeout-end-of-query goes off.
// rs = ResultSetFactory.copyResults(rs) ;
- action.log.info(format("[%d] exec/select", action.id)) ;
+ //action.log.info(format("[%d] exec/select", action.id)) ;
return new SPARQLResult(rs) ;
}
if ( query.isConstructType() ) {
Dataset dataset = queryExecution.execConstructDataset();
- action.log.info(format("[%d] exec/construct", action.id));
+ //action.log.info(format("[%d] exec/construct", action.id));
return new SPARQLResult(dataset);
}
if ( query.isDescribeType() ) {
Model model = queryExecution.execDescribe() ;
- action.log.info(format("[%d] exec/describe", action.id)) ;
+ //action.log.info(format("[%d] exec/describe", action.id)) ;
return new SPARQLResult(model) ;
}
if ( query.isAskType() ) {
boolean b = queryExecution.execAsk() ;
- action.log.info(format("[%d] exec/ask", action.id)) ;
+ //action.log.info(format("[%d] exec/ask", action.id)) ;
return new SPARQLResult(b) ;
}