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 2014/07/22 17:52:18 UTC
svn commit: r1612596 - in /jena:
Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/
trunk/jena-arq/src/main/java/org/apache/jena/riot/
trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/
trunk/jena-arq/src/main/java/org/apache/jena...
Author: andy
Date: Tue Jul 22 15:52:17 2014
New Revision: 1612596
URL: http://svn.apache.org/r1612596
Log:
Move stream manager package inside org.apache.jena.system.
Added:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/
- copied from r1612205, jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/JenaIOEnvironment.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocationMapper.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/Locator.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFTP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorURL.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorZip.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java Tue Jul 22 15:52:17 2014
@@ -23,9 +23,9 @@ import java.util.TimeZone ;
import java.util.concurrent.TimeUnit ;
import org.apache.jena.riot.RIOT ;
-import org.apache.jena.riot.stream.LocatorFTP ;
-import org.apache.jena.riot.stream.LocatorHTTP ;
-import org.apache.jena.riot.stream.StreamManager ;
+import org.apache.jena.riot.system.stream.LocatorFTP ;
+import org.apache.jena.riot.system.stream.LocatorHTTP ;
+import org.apache.jena.riot.system.stream.StreamManager ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFDataMgr.java Tue Jul 22 15:52:17 2014
@@ -24,10 +24,10 @@ import java.util.Iterator ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.atlas.web.TypedInputStream ;
-import org.apache.jena.riot.stream.StreamManager ;
import org.apache.jena.riot.system.RiotLib ;
import org.apache.jena.riot.system.StreamRDF ;
import org.apache.jena.riot.system.StreamRDFLib ;
+import org.apache.jena.riot.system.stream.StreamManager ;
import org.apache.jena.riot.writer.NQuadsWriter ;
import org.apache.jena.riot.writer.NTriplesWriter ;
import org.slf4j.Logger ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java Tue Jul 22 15:52:17 2014
@@ -24,7 +24,7 @@ import java.util.Iterator ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.stream.* ;
+import org.apache.jena.riot.system.stream.* ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java Tue Jul 22 15:52:17 2014
@@ -22,7 +22,7 @@ import java.util.Iterator ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.stream.* ;
+import org.apache.jena.riot.system.stream.* ;
import com.hp.hpl.jena.sparql.util.Utils ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java Tue Jul 22 15:52:17 2014
@@ -20,7 +20,7 @@ package org.apache.jena.riot.adapters;
import java.util.Iterator ;
-import org.apache.jena.riot.stream.LocationMapper ;
+import org.apache.jena.riot.system.stream.LocationMapper ;
import com.hp.hpl.jena.rdf.model.Model ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocator.java Tue Jul 22 15:52:17 2014
@@ -19,7 +19,7 @@
package org.apache.jena.riot.adapters;
import org.apache.jena.atlas.web.TypedInputStream ;
-import org.apache.jena.riot.stream.Locator ;
+import org.apache.jena.riot.system.stream.Locator ;
public class AdapterLocator implements com.hp.hpl.jena.util.Locator
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_Web.java Tue Jul 22 15:52:17 2014
@@ -27,7 +27,7 @@ import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.WebContent ;
-import org.apache.jena.riot.stream.StreamManager ;
+import org.apache.jena.riot.system.stream.StreamManager ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.shared.NotFoundException ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/JenaIOEnvironment.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/JenaIOEnvironment.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/JenaIOEnvironment.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/JenaIOEnvironment.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import java.util.StringTokenizer ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocationMapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocationMapper.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocationMapper.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocationMapper.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import java.util.HashMap ;
import java.util.Iterator ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/Locator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/Locator.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/Locator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/Locator.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import org.apache.jena.atlas.web.TypedInputStream ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorClassLoader.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import java.io.InputStream ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFTP.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFTP.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream ;
+package org.apache.jena.riot.system.stream ;
import java.io.IOException ;
import java.io.InputStream ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorFile.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import java.io.File ;
import java.io.IOException ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorHTTP.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream ;
+package org.apache.jena.riot.system.stream ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.WebContent ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorURL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorURL.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorURL.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorURL.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import java.util.Locale ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorZip.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorZip.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorZip.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/LocatorZip.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream;
+package org.apache.jena.riot.system.stream;
import java.io.IOException ;
import java.io.InputStream ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java?rev=1612596&r1=1612205&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java Tue Jul 22 15:52:17 2014
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.riot.stream ;
+package org.apache.jena.riot.system.stream ;
import java.util.ArrayList ;
import java.util.Collections ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocators.java Tue Jul 22 15:52:17 2014
@@ -23,6 +23,7 @@ import java.io.File ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.WebContent ;
+import org.apache.jena.riot.system.stream.LocatorFile ;
import org.junit.Test ;
public class TestLocators extends BaseTest
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Tue Jul 22 15:52:17 2014
@@ -25,6 +25,9 @@ import org.apache.jena.atlas.junit.BaseT
import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RiotNotFoundException ;
+import org.apache.jena.riot.system.stream.LocatorFile ;
+import org.apache.jena.riot.system.stream.LocatorHTTP ;
+import org.apache.jena.riot.system.stream.StreamManager ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java?rev=1612596&r1=1612595&r2=1612596&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/Fuseki.java Tue Jul 22 15:52:17 2014
@@ -20,9 +20,9 @@ package org.apache.jena.fuseki;
import org.apache.jena.fuseki.server.SPARQLServer ;
import org.apache.jena.riot.RIOT ;
-import org.apache.jena.riot.stream.LocatorFTP ;
-import org.apache.jena.riot.stream.LocatorHTTP ;
-import org.apache.jena.riot.stream.StreamManager ;
+import org.apache.jena.riot.system.stream.LocatorFTP ;
+import org.apache.jena.riot.system.stream.LocatorHTTP ;
+import org.apache.jena.riot.system.stream.StreamManager ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;