incubator-any23-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ans...@apache.org
Subject svn commit: r1371036 - in /incubator/any23/trunk: ./ core/src/main/java/org/apache/any23/io/nquads/ core/src/test/java/org/apache/any23/cli/ core/src/test/java/org/apache/any23/rdf/ plugins/basic-crawler/src/test/java/org/apache/any23/cli/
Date Thu, 09 Aug 2012 04:06:38 GMT
Author: ansell
Date: Thu Aug  9 04:06:37 2012
New Revision: 1371036

URL: http://svn.apache.org/viewvc?rev=1371036&view=rev
Log:
ANY23-101 : Bump sesame to 2.6.8 and replace NQuads.FORMAT with RDFFormat.NQUADS

Removed:
    incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuads.java
Modified:
    incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java
    incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParserFactory.java
    incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java
    incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriterFactory.java
    incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/package-info.java
    incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/RoverTest.java
    incubator/any23/trunk/core/src/test/java/org/apache/any23/rdf/RDFUtilsTest.java
    incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java
    incubator/any23/trunk/pom.xml

Modified: incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java
(original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java
Thu Aug  9 04:06:37 2012
@@ -67,7 +67,7 @@ public class NQuadsParser extends RDFPar
     public NQuadsParser() {}
 
     public RDFFormat getRDFFormat() {
-        return NQuads.FORMAT;
+        return RDFFormat.NQUADS;
     }
 
     public void parse(Reader reader, String s)

Modified: incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParserFactory.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParserFactory.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParserFactory.java
(original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsParserFactory.java
Thu Aug  9 04:06:37 2012
@@ -34,7 +34,7 @@ public class NQuadsParserFactory impleme
 
     @Override
     public RDFFormat getRDFFormat() {
-        return NQuads.FORMAT;
+        return RDFFormat.NQUADS;
     }
 
     @Override

Modified: incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java
(original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java
Thu Aug  9 04:06:37 2012
@@ -70,7 +70,7 @@ public class NQuadsWriter implements RDF
     }
 
     public RDFFormat getRDFFormat() {
-        return NQuads.FORMAT;
+        return RDFFormat.NQUADS;
     }
 
     public void startRDF() throws RDFHandlerException {

Modified: incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriterFactory.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriterFactory.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriterFactory.java
(original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/NQuadsWriterFactory.java
Thu Aug  9 04:06:37 2012
@@ -35,7 +35,7 @@ public class NQuadsWriterFactory impleme
 
     @Override
     public RDFFormat getRDFFormat() {
-        return NQuads.FORMAT;
+        return RDFFormat.NQUADS;
     }
 
     @Override

Modified: incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/package-info.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/package-info.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/package-info.java
(original)
+++ incubator/any23/trunk/core/src/main/java/org/apache/any23/io/nquads/package-info.java
Thu Aug  9 04:06:37 2012
@@ -16,7 +16,7 @@
  */
 
 /**
- * This package contains an <i>NQuads</i>
+ * This package contains an <i><a href="http://sw.deri.org/2008/07/n-quads/">NQuads</a></i>
  * parser and writer based on the <i><a href="http://www.openrdf.org/">Sesame</a>
API</i>.
  */
 package org.apache.any23.io.nquads;
\ No newline at end of file

Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/RoverTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/RoverTest.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/RoverTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/cli/RoverTest.java Thu Aug 
9 04:06:37 2012
@@ -17,7 +17,6 @@
 
 package org.apache.any23.cli;
 
-import org.apache.any23.io.nquads.NQuads;
 import org.apache.any23.rdf.RDFUtils;
 import org.apache.any23.util.FileUtils;
 import org.apache.any23.util.StringUtils;
@@ -26,6 +25,7 @@ import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
 import org.openrdf.model.Statement;
+import org.openrdf.rio.RDFFormat;
 
 import java.io.File;
 
@@ -121,7 +121,7 @@ public class RoverTest extends ToolTestB
         );
 
         final String outNQuads = FileUtils.readFileContent(outFile);
-        final Statement[] statements = RDFUtils.parseRDF(NQuads.FORMAT, outNQuads);
+        final Statement[] statements = RDFUtils.parseRDF(RDFFormat.NQUADS, outNQuads);
         Assert.assertTrue("Unexpected number of statements.", statements.length > 10);
     }
 

Modified: incubator/any23/trunk/core/src/test/java/org/apache/any23/rdf/RDFUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/core/src/test/java/org/apache/any23/rdf/RDFUtilsTest.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/core/src/test/java/org/apache/any23/rdf/RDFUtilsTest.java (original)
+++ incubator/any23/trunk/core/src/test/java/org/apache/any23/rdf/RDFUtilsTest.java Thu Aug
 9 04:06:37 2012
@@ -17,7 +17,6 @@
 
 package org.apache.any23.rdf;
 
-import org.apache.any23.io.nquads.NQuads;
 import org.junit.Assert;
 import org.junit.Test;
 import org.openrdf.rio.RDFFormat;
@@ -69,8 +68,8 @@ public class RDFUtilsTest {
     public void testGetRDFFormatByExtension() {
         Assert.assertEquals(RDFFormat.NTRIPLES, RDFUtils.getFormatByExtension("nt"));
         Assert.assertEquals(RDFFormat.TURTLE  , RDFUtils.getFormatByExtension("ttl"));
-        Assert.assertEquals(NQuads.FORMAT, RDFUtils.getFormatByExtension("nq"));
-        Assert.assertEquals(NQuads.FORMAT, RDFUtils.getFormatByExtension(".nq"));
+        Assert.assertEquals(RDFFormat.NQUADS, RDFUtils.getFormatByExtension("nq"));
+        Assert.assertEquals(RDFFormat.NQUADS, RDFUtils.getFormatByExtension(".nq"));
     }
 
     /**
@@ -78,7 +77,7 @@ public class RDFUtilsTest {
      */
     @Test
     public void testGetNQuadsFormat() {
-        RDFUtils.getFormats().contains(NQuads.FORMAT);
+        RDFUtils.getFormats().contains(RDFFormat.NQUADS);
     }
 
     /**
@@ -86,7 +85,7 @@ public class RDFUtilsTest {
      */
     @Test
     public void testGetNQuadsParser() {
-        Assert.assertNotNull( RDFUtils.getParser(NQuads.FORMAT) );
+        Assert.assertNotNull( RDFUtils.getParser(RDFFormat.NQUADS) );
     }
 
     /**
@@ -95,7 +94,7 @@ public class RDFUtilsTest {
     @Test
     public void testGetNQuadsWriter() {
         Assert.assertNotNull(
-                RDFUtils.getWriter(NQuads.FORMAT, new OutputStreamWriter(new ByteArrayOutputStream()
) )
+                RDFUtils.getWriter(RDFFormat.NQUADS, new OutputStreamWriter(new ByteArrayOutputStream()
) )
         );
     }
 

Modified: incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java
(original)
+++ incubator/any23/trunk/plugins/basic-crawler/src/test/java/org/apache/any23/cli/CrawlerTest.java
Thu Aug  9 04:06:37 2012
@@ -18,11 +18,11 @@
 package org.apache.any23.cli;
 
 import org.apache.any23.Any23OnlineTestBase;
-import org.apache.any23.io.nquads.NQuads;
 import org.apache.any23.rdf.RDFUtils;
 import org.apache.any23.util.FileUtils;
 import org.junit.Test;
 import org.openrdf.model.Statement;
+import org.openrdf.rio.RDFFormat;
 import org.openrdf.rio.RDFHandlerException;
 import org.openrdf.rio.RDFParseException;
 import org.slf4j.Logger;
@@ -89,7 +89,7 @@ public class CrawlerTest extends Any23On
             allLinesExceptLast.append(lines[i]);
         }
 
-        final Statement[] statements = RDFUtils.parseRDF(NQuads.FORMAT, allLinesExceptLast.toString());
+        final Statement[] statements = RDFUtils.parseRDF(RDFFormat.NQUADS, allLinesExceptLast.toString());
         assertTrue(statements.length > 0);
     }
 

Modified: incubator/any23/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/any23/trunk/pom.xml?rev=1371036&r1=1371035&r2=1371036&view=diff
==============================================================================
--- incubator/any23/trunk/pom.xml (original)
+++ incubator/any23/trunk/pom.xml Thu Aug  9 04:06:37 2012
@@ -220,8 +220,8 @@
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format>
     <implementation.build>${scmBranch}@r${buildNumber}</implementation.build>
     <implementation.build.tstamp>${implementation.build}; ${maven.build.timestamp}</implementation.build.tstamp>
-    <slf4j.logger.version>1.5.6</slf4j.logger.version>
-    <sesame.version>2.6.1</sesame.version>
+    <slf4j.logger.version>1.6.6</slf4j.logger.version>
+    <sesame.version>2.6.8</sesame.version>
 
     <!-- Maven Plugin Versions -->
     <maven-javadoc-plugin.version>2.8</maven-javadoc-plugin.version>



Mime
View raw message