fix some warnings for packaging jena-csv git-svn-id: http://svn.apache.org/repos/asf/jena/Experimental/jena-csv@1613800 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9bc28c30 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9bc28c30 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9bc28c30 Branch: refs/heads/master Commit: 9bc28c30fc45948caa4ae621bd3d1f24df5c5255 Parents: 5b0eaa4 Author: Ying Jiang <[email protected]> Authored: Sun Jul 27 14:38:34 2014 +0000 Committer: Ying Jiang <[email protected]> Committed: Sun Jul 27 14:38:34 2014 +0000 ---------------------------------------------------------------------- .../jena/propertytable/PropertyTable.java | 23 +++++++++----------- .../impl/StageGeneratorPropertyTable.java | 4 ++-- src/test/resources/log4j.properties | 19 ++++++++++++++++ 3 files changed, 31 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/9bc28c30/src/main/java/org/apache/jena/propertytable/PropertyTable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/PropertyTable.java b/src/main/java/org/apache/jena/propertytable/PropertyTable.java index d488828..6c9b9a8 100644 --- a/src/main/java/org/apache/jena/propertytable/PropertyTable.java +++ b/src/main/java/org/apache/jena/propertytable/PropertyTable.java @@ -20,10 +20,7 @@ package org.apache.jena.propertytable; import java.util.Collection; import java.util.List; -import org.apache.jena.riot.lang.LangCSV; - import com.hp.hpl.jena.graph.Node; -import com.hp.hpl.jena.graph.NodeFactory; import com.hp.hpl.jena.graph.Triple; import com.hp.hpl.jena.util.iterator.ExtendedIterator; @@ -38,29 +35,29 @@ public interface PropertyTable { /** * Query for ?s <p> <o> - * @param column, the Column with the columnKey Node of the predicate - * @param value, the object (or value) Node + * @param column the Column with the columnKey Node of the predicate + * @param value the object (or value) Node * @return the ExtendedIterator of the matching Triples */ ExtendedIterator<Triple> getTripleIterator(Column column, Node value); /** * Query for ?s <p> ?o - * @param column, the Column with the columnKey Node of the predicate + * @param column the Column with the columnKey Node of the predicate * @return the ExtendedIterator of the matching Triples */ ExtendedIterator<Triple> getTripleIterator(Column column); /** * Query for ?s ?p <o> - * @param value, the object (or value) Node + * @param value the object (or value) Node * @return the ExtendedIterator of the matching Triples */ ExtendedIterator<Triple> getTripleIterator(Node value); /** * Query for <s> ?p ?o - * @param row, the Row with the rowKey Node of the subject + * @param row the Row with the rowKey Node of the subject * @return the ExtendedIterator of the matching Triples */ ExtendedIterator<Triple> getTripleIterator(Row row); @@ -78,7 +75,7 @@ public interface PropertyTable { /** * Get Column by its columnKey Node of the predicate - * @param p, columnKey Node of the predicate + * @param p columnKey Node of the predicate * @return the Column */ Column getColumn(Node p); @@ -91,7 +88,7 @@ public interface PropertyTable { /** * Get Row by its rowKey Node of the subject - * @param s, rowKey Node of the subject + * @param s rowKey Node of the subject * @return the Row */ Row getRow(Node s); @@ -99,7 +96,7 @@ public interface PropertyTable { /** * Create Row by its rowKey Node of the subject - * @param s, rowKey Node of the subject + * @param s rowKey Node of the subject * @return the Row created */ Row createRow(Node s); @@ -120,8 +117,8 @@ public interface PropertyTable { /** * Get the Rows matching the value of a Column - * @param column, the Column with the columnKey Node of the predicate - * @param value, the object (or value) Node + * @param column the Column with the columnKey Node of the predicate + * @param value the object (or value) Node * @return the matching Rows */ Collection<Row> getMatchingRows(Column column, Node value); http://git-wip-us.apache.org/repos/asf/jena/blob/9bc28c30/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java b/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java index 408c516..68fb025 100644 --- a/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java +++ b/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java @@ -44,10 +44,10 @@ public class StageGeneratorPropertyTable implements StageGenerator { // Not us - bounce up the StageGenerator chain return above.execute(pattern, input, execCxt) ; if (pattern.size() <= 1){ - System.out.println( "<=1 "+ pattern); +// System.out.println( "<=1 "+ pattern); return above.execute(pattern, input, execCxt) ; } - System.out.println( ">1" + pattern); +// System.out.println( ">1" + pattern); return QueryIterPropertyTable.create(input, pattern, execCxt); } http://git-wip-us.apache.org/repos/asf/jena/blob/9bc28c30/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties new file mode 100644 index 0000000..6d3889d --- /dev/null +++ b/src/test/resources/log4j.properties @@ -0,0 +1,19 @@ +log4j.rootLogger=INFO, stdlog + +log4j.appender.stdlog=org.apache.log4j.ConsoleAppender +## log4j.appender.stdlog.target=System.err +log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout +log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n + +# Execution logging +log4j.logger.com.hp.hpl.jena.arq.info=INFO +log4j.logger.com.hp.hpl.jena.arq.exec=INFO + +# Everything else in Jena +log4j.logger.com.hp.hpl.jena=WARN +log4j.logger.org.openjena=WARN +log4j.logger.org.openjena.riot=INFO + +# Apache Commons HTTP +# May be useful to turn up to DEBUG if debugging HTTP communication issues +log4j.logger.org.apache.http=WARN
