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 2012/12/19 20:22:43 UTC
svn commit: r1424047 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/riot/process/
main/java/org/apache/jena/riot/process/inf/
main/java/org/apache/jena/riot/process/normalize/
main/java/org/openjena/riot/process/inf/ main/java/org/openjena/ri...
Author: andy
Date: Wed Dec 19 19:22:42 2012
New Revision: 1424047
URL: http://svn.apache.org/viewvc?rev=1424047&view=rev
Log:
Migrate validation and inference/expansion code.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InfFactory.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorQuads.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorRDFS.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorRDFS.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorTriples.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceSetupRDFS.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/CanonicalizeLiteral.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/DatatypeHandler.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/DatatypeHandler.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
- copied, changed from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java
Removed:
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorRDFS.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/CanonicalizeLiteral.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/DatatypeHandler.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java
Modified:
jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
jena/trunk/jena-arq/src/main/java/riotcmd/infer.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InfFactory.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InfFactory.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InfFactory.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InfFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InfFactory.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.inf;
+package org.apache.jena.riot.process.inf;
import org.apache.jena.atlas.lib.Sink ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorQuads.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorQuads.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorQuads.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorQuads.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorQuads.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.inf;
+package org.apache.jena.riot.process.inf;
import org.apache.jena.atlas.lib.Sink ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorRDFS.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorRDFS.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorRDFS.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorRDFS.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorRDFS.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorRDFS.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorRDFS.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.inf;
+package org.apache.jena.riot.process.inf;
import java.util.List ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorTriples.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorTriples.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorTriples.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceProcessorTriples.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceProcessorTriples.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.inf;
+package org.apache.jena.riot.process.inf;
import org.apache.jena.atlas.lib.Sink ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceSetupRDFS.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceSetupRDFS.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceSetupRDFS.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/inf/InferenceSetupRDFS.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/inf/InferenceSetupRDFS.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.inf;
+package org.apache.jena.riot.process.inf;
import java.util.ArrayList ;
import java.util.HashMap ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/CanonicalizeLiteral.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/CanonicalizeLiteral.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/CanonicalizeLiteral.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.normalize;
+package org.apache.jena.riot.process.normalize;
import java.util.HashMap ;
import java.util.Map ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/DatatypeHandler.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/DatatypeHandler.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/DatatypeHandler.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/DatatypeHandler.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/DatatypeHandler.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/DatatypeHandler.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/DatatypeHandler.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.normalize;
+package org.apache.jena.riot.process.normalize;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.graph.Node ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.normalize;
+package org.apache.jena.riot.process.normalize;
import java.math.BigDecimal ;
import java.math.BigInteger ;
Copied: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java (from r1422690, jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java?p2=jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java&p1=jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java&r1=1422690&r2=1424047&rev=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/process/normalize/NormalizeValue2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java Wed Dec 19 19:22:42 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.riot.process.normalize;
+package org.apache.jena.riot.process.normalize;
import static org.apache.jena.atlas.lib.Chars.CH_DOT ;
import static org.apache.jena.atlas.lib.Chars.CH_MINUS ;
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java?rev=1424047&r1=1424046&r2=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/CmdLangParse.java Wed Dec 19 19:22:42 2012
@@ -32,6 +32,8 @@ import org.apache.jena.atlas.lib.SinkCou
import org.apache.jena.atlas.lib.SinkNull ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.riot.lang.* ;
+import org.apache.jena.riot.process.inf.InfFactory ;
+import org.apache.jena.riot.process.inf.InferenceSetupRDFS ;
import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.system.SyntaxLabels ;
import org.apache.jena.riot.tokens.Tokenizer ;
@@ -41,8 +43,6 @@ import org.openjena.riot.* ;
import org.openjena.riot.out.NodeToLabel ;
import org.openjena.riot.out.SinkQuadOutput ;
import org.openjena.riot.out.SinkTripleOutput ;
-import org.openjena.riot.process.inf.InfFactory ;
-import org.openjena.riot.process.inf.InferenceSetupRDFS ;
import arq.cmd.CmdException ;
import arq.cmdline.* ;
Modified: jena/trunk/jena-arq/src/main/java/riotcmd/infer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/riotcmd/infer.java?rev=1424047&r1=1424046&r2=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/riotcmd/infer.java (original)
+++ jena/trunk/jena-arq/src/main/java/riotcmd/infer.java Wed Dec 19 19:22:42 2012
@@ -27,10 +27,10 @@ import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.riot.lang.LangRIOT ;
import org.apache.jena.riot.lang.RDFParserOutput ;
import org.apache.jena.riot.lang.RDFParserOutputLib ;
+import org.apache.jena.riot.process.inf.InfFactory ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.out.SinkQuadOutput ;
-import org.openjena.riot.process.inf.InfFactory ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdGeneral ;
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java?rev=1424047&r1=1424046&r2=1424047&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java Wed Dec 19 19:22:42 2012
@@ -19,8 +19,8 @@
package org.openjena.riot.process;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.riot.process.normalize.CanonicalizeLiteral ;
import org.junit.Test ;
-import org.openjena.riot.process.normalize.CanonicalizeLiteral ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;