Author: jpz6311whu
Date: Sun Jul 27 14:38:34 2014
New Revision: 1613800
URL: http://svn.apache.org/r1613800
Log:
fix some warnings for packaging jena-csv
Added:
jena/Experimental/jena-csv/src/test/resources/log4j.properties (with
props)
Modified:
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/PropertyTable.java
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java
Modified:
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/PropertyTable.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/PropertyTable.java?rev=1613800&r1=1613799&r2=1613800&view=diff
==============================================================================
---
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/PropertyTable.java
(original)
+++
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/PropertyTable.java
Sun Jul 27 14:38:34 2014
@@ -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);
Modified:
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java?rev=1613800&r1=1613799&r2=1613800&view=diff
==============================================================================
---
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java
(original)
+++
jena/Experimental/jena-csv/src/main/java/org/apache/jena/propertytable/impl/StageGeneratorPropertyTable.java
Sun Jul 27 14:38:34 2014
@@ -44,10 +44,10 @@ public class StageGeneratorPropertyTable
// 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);
}
Added: jena/Experimental/jena-csv/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-csv/src/test/resources/log4j.properties?rev=1613800&view=auto
==============================================================================
--- jena/Experimental/jena-csv/src/test/resources/log4j.properties (added)
+++ jena/Experimental/jena-csv/src/test/resources/log4j.properties Sun Jul 27
14:38:34 2014
@@ -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
Propchange: jena/Experimental/jena-csv/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
