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 2011/07/25 09:59:46 UTC
svn commit: r1150571 - in /incubator/jena/Jena2/ARQ/trunk:
src-dev/dev/RunARQ.java src/org/openjena/atlas/json/JSON.java
src/org/openjena/atlas/json/io/JsonWriter.java
Author: andy
Date: Mon Jul 25 07:59:45 2011
New Revision: 1150571
URL: http://svn.apache.org/viewvc?rev=1150571&view=rev
Log:
Need to Signal output via startOutput/finishOutput (finish includes a flush).
Modified:
incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/JSON.java
incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/io/JsonWriter.java
Modified: incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java?rev=1150571&r1=1150570&r2=1150571&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src-dev/dev/RunARQ.java Mon Jul 25 07:59:45 2011
@@ -19,6 +19,7 @@ import java.util.concurrent.Executors ;
import org.openjena.atlas.io.IndentedWriter ;
import org.openjena.atlas.json.JSON ;
+import org.openjena.atlas.json.JsonObject ;
import org.openjena.atlas.json.JsonValue ;
import org.openjena.atlas.lib.Lib ;
import org.openjena.atlas.lib.Sink ;
@@ -127,6 +128,14 @@ public class RunARQ
public static void main(String[] argv) throws Exception
{
+ JsonObject result = new JsonObject();
+ result.put("progress", 100);
+ result.put("state", "Running");
+ JSON.write(System.out, result);
+ System.out.println() ;
+ System.out.flush();
+ exit(0) ;
+
//arq.sparql.main("--data=D.ttl", "--query=Q.rq") ;
//arq.qparse.main("--query=Q.rq", "--print=opt") ;
String DIR = "/home/afs/W3C/SPARQL-docs/tests/data-sparql11/subquery/" ;
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/JSON.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/JSON.java?rev=1150571&r1=1150570&r2=1150571&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/JSON.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/JSON.java Mon Jul 25 07:59:45 2011
@@ -1,5 +1,6 @@
/*
* (c) Copyright 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
* [See end of file]
*/
@@ -146,27 +147,30 @@ public class JSON
/** Write out a JSON value - pass a JSON Object to get legal exchangeable JSON */
public static void write(OutputStream output, JsonValue jValue)
{
- JsonWriter w = new JsonWriter(output) ;
- jValue.visit(w) ;
+ IndentedWriter iOut = new IndentedWriter(output) ;
+ write(iOut, jValue) ;
+ iOut.flush() ;
}
/** Write out a JSON value - pass a JSON Object to get legal exchangeable JSON */
public static void write(IndentedWriter output, JsonValue jValue)
{
JsonWriter w = new JsonWriter(output) ;
+ w.startOutput() ;
jValue.visit(w) ;
+ w.finishOutput() ;
}
/** Write out a JSON value to - pass a JSON Object to get legal exchangeable JSON */
public static void write(JsonValue jValue)
{
write(IndentedWriter.stdout, jValue) ;
- IndentedWriter.stdout.flush() ;
}
}
/*
* (c) Copyright 2009 Hewlett-Packard Development Company, LP
+ * (c) Copyright 2011 Epimorphics Ltd.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/io/JsonWriter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/io/JsonWriter.java?rev=1150571&r1=1150570&r2=1150571&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/io/JsonWriter.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/org/openjena/atlas/json/io/JsonWriter.java Mon Jul 25 07:59:45 2011
@@ -29,6 +29,7 @@ public class JsonWriter implements JsonV
IndentedWriter out ;
public JsonWriter() { this(IndentedWriter.stdout) ; }
+ @Deprecated
public JsonWriter(OutputStream ps) { this(new IndentedWriter(ps)) ; }
public JsonWriter(IndentedWriter ps) { out = ps ; }