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 2015/08/21 16:45:53 UTC
[1/2] jena git commit: Broken example
Repository: jena
Updated Branches:
refs/heads/master c74a042ee -> c8427ba75
Broken example
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/84d40b99
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/84d40b99
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/84d40b99
Branch: refs/heads/master
Commit: 84d40b9983020c10a176ce0a714eb66d0c60d371
Parents: c74a042
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 21 15:35:03 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 21 15:35:03 2015 +0100
----------------------------------------------------------------------
jena-fuseki2/examples/jetty-fuseki.xml | 48 -----------------------------
1 file changed, 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/84d40b99/jena-fuseki2/examples/jetty-fuseki.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/examples/jetty-fuseki.xml b/jena-fuseki2/examples/jetty-fuseki.xml
deleted file mode 100644
index cb1f385..0000000
--- a/jena-fuseki2/examples/jetty-fuseki.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.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.
--->
-
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!--
-Simple example of using a jetty configuration file for setting up a Jetty server.
--->
-
-<!--
-http://www.eclipse.org/jetty/documentation/current/configuring-connectors.html
--->
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref refid="Server" /></Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <Item>
- <New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref refid="httpConfig" /></Arg>
- </New>
- </Item>
- </Array>
- </Arg>
- <Set name="port"><Property name="jetty.port" default="3535" /></Set>
- <!--<Set name="host"><Property name="jetty.host" default="localhost" /></Set>-->
- </New>
- </Arg>
- </Call>
-</Configure>
[2/2] jena git commit: JENA-1013: Ignore "file_on_bad_input_02" if a
json test.
Posted by an...@apache.org.
JENA-1013: Ignore "file_on_bad_input_02" if a json test.
Uses assumeFalse(file extension contains 'json')
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c8427ba7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c8427ba7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c8427ba7
Branch: refs/heads/master
Commit: c8427ba75aaa02ec55ba073f87b453581f71ad5f
Parents: 84d40b9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Aug 21 15:35:09 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Aug 21 15:35:09 2015 +0100
----------------------------------------------------------------------
.../rdf/io/input/AbstractNodeTupleInputFormatTests.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/c8427ba7/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
----------------------------------------------------------------------
diff --git a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
index e26445e..33ba4d4 100644
--- a/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
+++ b/jena-elephas/jena-elephas-io/src/test/java/org/apache/jena/hadoop/rdf/io/input/AbstractNodeTupleInputFormatTests.java
@@ -43,12 +43,7 @@ import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl;
import org.apache.jena.hadoop.rdf.io.HadoopIOConstants;
import org.apache.jena.hadoop.rdf.io.RdfIOConstants;
import org.apache.jena.hadoop.rdf.types.AbstractNodeTupleWritable;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.* ;
import org.junit.rules.TemporaryFolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -429,6 +424,8 @@ public abstract class AbstractNodeTupleInputFormatTests<TValue, T extends Abstra
*/
@Test(expected = IOException.class)
public final void fail_on_bad_input_02() throws IOException, InterruptedException {
+ Assume.assumeFalse("fail_on_bad_input_02: See JENA-1013 (JSON-LD tests)", this.getFileExtension().contains("jsonld")) ;
+
Configuration config = this.prepareConfiguration();
config.setBoolean(RdfIOConstants.INPUT_IGNORE_BAD_TUPLES, false);
Assert.assertFalse(config.getBoolean(RdfIOConstants.INPUT_IGNORE_BAD_TUPLES, true));