Repository: jena Updated Branches: refs/heads/master 3ea2542c3 -> ec6c5053e
Clean jena-fuseki Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/77c97880 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/77c97880 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/77c97880 Branch: refs/heads/master Commit: 77c978803607a137b0816ab5584a79f992e580c2 Parents: 3ea2542 Author: Andy Seaborne <a...@apache.org> Authored: Tue Oct 28 15:50:25 2014 +0000 Committer: Andy Seaborne <a...@apache.org> Committed: Tue Oct 28 15:50:25 2014 +0000 ---------------------------------------------------------------------- .../dev/BackwardForwardDescribeFactory.java | 95 ------------ jena-fuseki/src-dev/dev/DevFuseki.java | 149 ------------------- .../java/org/apache/jena/fuseki/FusekiCmd.java | 1 - 3 files changed, 245 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/77c97880/jena-fuseki/src-dev/dev/BackwardForwardDescribeFactory.java ---------------------------------------------------------------------- diff --git a/jena-fuseki/src-dev/dev/BackwardForwardDescribeFactory.java b/jena-fuseki/src-dev/dev/BackwardForwardDescribeFactory.java deleted file mode 100644 index 2322929..0000000 --- a/jena-fuseki/src-dev/dev/BackwardForwardDescribeFactory.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev; - -import com.hp.hpl.jena.query.Dataset; -import com.hp.hpl.jena.rdf.model.Model; -import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.RDFNode; -import com.hp.hpl.jena.rdf.model.Resource; -import com.hp.hpl.jena.sparql.ARQConstants; -import com.hp.hpl.jena.sparql.core.Quad; -import com.hp.hpl.jena.sparql.core.describe.DescribeHandler; -import com.hp.hpl.jena.sparql.core.describe.DescribeHandlerFactory; -import com.hp.hpl.jena.sparql.core.describe.DescribeHandlerRegistry; -import com.hp.hpl.jena.sparql.util.Context; -import com.hp.hpl.jena.tdb.TDB ; -import com.hp.hpl.jena.util.iterator.ExtendedIterator; -import com.hp.hpl.jena.vocabulary.RDFS; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class BackwardForwardDescribeFactory implements DescribeHandlerFactory { - - final static Logger log = LoggerFactory.getLogger(BackwardForwardDescribeFactory.class); - - static { - TDB.init(); - log.info("Attaching replacement describe handler"); - DescribeHandlerRegistry reg = DescribeHandlerRegistry.get(); - log.info("Clearing existing describe handlers"); - reg.clear(); - reg.add(new BackwardForwardDescribeFactory()); - log.info("Attached"); - } - - @Override - public DescribeHandler create() { - return new BackwardForwardDescribe(); - } - - public static class BackwardForwardDescribe implements DescribeHandler { - - private Dataset dataset; - private Model result; - private Model defaultModel; - private Model unionModel; - - @Override - public void start(Model accumulateResultModel, Context qContext) { - this.result = accumulateResultModel; - this.dataset = (Dataset) qContext.get(ARQConstants.sysCurrentDataset); - this.defaultModel = dataset.getDefaultModel(); - this.unionModel = dataset.getNamedModel(Quad.unionGraph.getURI()); - } - - @Override - public void describe(Resource resource) { - result.add(defaultModel.listStatements(resource, null, (RDFNode) null)); - result.add(defaultModel.listStatements(null, null, resource)); - result.add(unionModel.listStatements(resource, null, (RDFNode) null)); - result.add(unionModel.listStatements(null, null, resource)); - - // Gather labels for dangling refs - Model labels = ModelFactory.createDefaultModel(); - ExtendedIterator<RDFNode> it = result.listObjects().andThen(result.listSubjects()); - while (it.hasNext()) { - RDFNode node = it.next(); - if (node.isLiteral() || resource.equals(node)) continue; - labels.add(defaultModel.listStatements((Resource) node, RDFS.label, (RDFNode) null)); - labels.add(unionModel.listStatements((Resource) node, RDFS.label, (RDFNode) null)); - } - result.add(labels); - } - - @Override - public void finish() { - } - } -} http://git-wip-us.apache.org/repos/asf/jena/blob/77c97880/jena-fuseki/src-dev/dev/DevFuseki.java ---------------------------------------------------------------------- diff --git a/jena-fuseki/src-dev/dev/DevFuseki.java b/jena-fuseki/src-dev/dev/DevFuseki.java deleted file mode 100644 index 70bbd7b..0000000 --- a/jena-fuseki/src-dev/dev/DevFuseki.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package dev; - -public class DevFuseki -{ - // SPARQL_QueryDataset.vialidate query -- but FROM etc is important for TDB. - // DatasetDescription from protocol - // createDataset from the ARQ. - // SPARQL_QueryGeneral.datasetFromDescription - - // Config: - // fuseki:name ==> fuseki:serviceName of fuseki:endpointBase - // rdfs:label for log files. - - // sparql.jsp needs to switch on presence and name of service endpoints. - // --accept for to soh for construct queries (check can get CONSTRUCT in TTL). - - // application/json for application/sparql-results+json. - // application/xml for application/sparql-results+xml. - - // LimitingGraph, LimitingBulkUpdateHandler --> change to use a limiting Sink<> - // Finish: SPARQL_QueryGeneral - // Parse errors and etc need to be passed out. - // --jetty-config documentation - - // Rework arguments. - // Explicit install pages. - // Pages for read-only. - - // RDF/XML_ABBREV in ResponseModel - // Config Jetty from a file? - // Alternatibe way to run Fuseki - - // Flint? - // Pages for publish mode. - - // Multiple Accept headers - // WebContent and ContentType clean up. - - // SOH default to not needing 'default' - // More error handling. - - // Migrate ContentType to RIOT - // use in WebContent. - - //soh : --accept application/turtle for CONSTRUCT queries. - - // Direct naming. - // Use absence/presence of a query string to switch. - - // sparql.jsp ==> if no dataset, go to choosing page or error page linking to. - - // Better handling of bad URI name for a graph http:/example/X => stacktrace. - - // FUSEKI_ROOT - - // Documentation: - // Plan documentation. - // MIME types supported - // Include a data file in the distribution. - // curl as commandline - - // Dataset servers - bulk loader. - // Access the bulk loader via web. [later] - - // Structure pages, different static content servers - // /Main - index.html = fuseki.html - // /validate - // /admin - - // Server-local graph naming - - // Plain text error pages - - // Deploy to sparql.org -- need query form for read-only mode. - - // + LARQ - - // Testing: - // No file -> error. - - // Remove from package conneg - use code from ARQ/Atlas. - // TypedStream TypedInoputStrea, TypedOutputStream, MediaType, MediaRange - - // Bundle tdb scripts with Fuseki. - - // ParserFor - share between SPARQL_REST and SPARQL_Upload - // UploadTo dataset (TriG, N-Quads) - - // populate forms with prefixes (later) - - // Tests - // TestProtocol (HTTP update, query, update), inc status codes. - // SPARQL Query servlet / SPARQL Update servlet - // TestContentNegotiation - is coveage enough? - - // ?? Slug header: - // http://bitworking.org/projects/atom/rfc5023.html#rfc.section.9.7 - - // ETags. - - // Authentication - - // SOH - // Refactor into body/no_body send & body/no_body receive - // All: - // -v --help --accept --user/--password ( or --auth user:pass) - // Drop --service. - // Local config file - read to get service settings. - - // --accept line/shortname : s-get, s-query - // Basic authentication: --user --password - - // Argument names: --service naming seems inconsistent. - - // Plug-ins: - // Dataset (query, Update), HttpInternalIF? - // "Connection" - // Locking => transaction support (via default model?) - // HttpAction.beginRead() etc. - - // Java clients: - // DatasetAccessor : don't serialise to byte[] and then send. - // DatasetAccessor : check existence of endpoint. - - // Content-Length: SHOULD - // Transfer-Encoding: identity - // "chunked" encoding - // gzip - - // Code examples -} http://git-wip-us.apache.org/repos/asf/jena/blob/77c97880/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java ---------------------------------------------------------------------- diff --git a/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java index b076871..1c5fe32 100644 --- a/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java +++ b/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java @@ -105,7 +105,6 @@ public class FusekiCmd extends CmdARQ String fn = "log4j.properties" ; File f = new File(fn) ; if ( f.exists() ) { - System.out.println("File") ; // Use file log4j.properties System.setProperty("log4j.configuration", "file:"+fn) ; return ;
