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/06/29 14:57:37 UTC
svn commit: r1355349 - in /jena/Scratch/AFS/Dev/trunk: src-archive/riot/comms/ src-archive/riot/comms/client/ src-archive/riot/comms/server1/nio/ src-archive/riot/comms/server1/socket/ src-archive/riot/io/section/ src/main/java/riot/io/

Author: andy
Date: Fri Jun 29 12:57:35 2012
New Revision: 1355349

URL: http://svn.apache.org/viewvc?rev=1355349&view=rev
Log:
Put things in the right place.

Added:
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/CommsException.java
      - copied, changed from r1336054, jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/CommsException.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java
      - copied, changed from r1336054, jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenComms.java
Removed:
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/CommsException.java
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenComms.java
Modified:
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/DirectChannel.java
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/nio/NioServer.java
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/socket/SocketServer.java
    jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java
    jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenStreamEndpoint.java Fri Jun 29 12:57:35 2012
@@ -30,10 +30,7 @@ import org.openjena.atlas.io.IO ;
 import org.openjena.riot.tokens.Tokenizer ;
 import org.openjena.riot.tokens.TokenizerFactory ;
 import riot.comms.client.DirectChannel ;
-import riot.io.TokenInputStream ;
-import riot.io.TokenInputStreamBase ;
-import riot.io.TokenOutputStream ;
-import riot.io.TokenOutputStreamWriter ;
+import riot.io.* ;
 
 /** A two-way flow of tuples */
 public class TokenStreamEndpoint

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/DirectChannel.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/DirectChannel.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/DirectChannel.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/client/DirectChannel.java Fri Jun 29 12:57:35 2012
@@ -23,7 +23,7 @@ import java.net.InetSocketAddress ;
 import java.net.Socket ;
 import java.nio.channels.SocketChannel ;
 
-import riot.comms.CommsException ;
+import riot.io.CommsException ;
 
 /** Direct cut-through.  Use with great case */
 public class DirectChannel

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/nio/NioServer.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/nio/NioServer.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/nio/NioServer.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/nio/NioServer.java Fri Jun 29 12:57:35 2012
@@ -33,11 +33,11 @@ import java.util.Iterator ;
 
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
-import riot.comms.CommsException ;
 import riot.comms.server0.Server ;
 import riot.comms.server0.Service ;
 import riot.comms.server0.ServiceType ;
 import riot.comms.server1.socket.ServerRequestHandler ;
+import riot.io.CommsException ;
 
 /** Basic channel handling with NIO */
 class NioServer extends Server implements Service, Runnable

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/socket/SocketServer.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/socket/SocketServer.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/socket/SocketServer.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/server1/socket/SocketServer.java Fri Jun 29 12:57:35 2012
@@ -50,11 +50,11 @@ import java.util.concurrent.atomic.Atomi
 
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
-import riot.comms.CommsException ;
 import riot.comms.server0.Server ;
 import riot.comms.server0.Service ;
 import riot.comms.server0.ServiceState ;
 import riot.comms.server0.ServiceType ;
+import riot.io.CommsException ;
 
 /** Classical socket-based, non NIO, server */ 
 public class SocketServer extends Server implements Service, Runnable

Modified: jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src-archive/riot/io/section/TokenInputSection.java Fri Jun 29 12:57:35 2012
@@ -25,8 +25,8 @@ import java.util.NoSuchElementException 
 import org.openjena.atlas.lib.Pool ;
 import org.openjena.riot.tokens.Token ;
 import riot.comms.End ;
-import riot.comms.TokenComms ;
 import riot.comms.TokenStreamEndpoint ;
+import riot.io.TokenComms ;
 import riot.io.TokenInputStream ;
 
 

Copied: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/CommsException.java (from r1336054, jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/CommsException.java)
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/CommsException.java?p2=jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/CommsException.java&p1=jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/CommsException.java&r1=1336054&r2=1355349&rev=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/CommsException.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/CommsException.java Fri Jun 29 12:57:35 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package riot.comms;
+package riot.io;
 
 public class CommsException extends RuntimeException
 {

Copied: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java (from r1336054, jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenComms.java)
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java?p2=jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java&p1=jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenComms.java&r1=1336054&r2=1355349&rev=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src-archive/riot/comms/TokenComms.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenComms.java Fri Jun 29 12:57:35 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package riot.comms;
+package riot.io;
 
 import java.io.UnsupportedEncodingException ;
 import java.util.List ;

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenInputStreamBase.java Fri Jun 29 12:57:35 2012
@@ -31,7 +31,6 @@ import static org.openjena.riot.tokens.T
 import org.openjena.riot.tokens.Tokenizer ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
-import riot.comms.CommsException ;
 
 /** Tokenizer that sorts out prefixes and groups into sequences of token */
 public class TokenInputStreamBase implements TokenInputStream

Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java?rev=1355349&r1=1355348&r2=1355349&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/riot/io/TokenOutputStreamWriter.java Fri Jun 29 12:57:35 2012
@@ -29,8 +29,6 @@ import org.openjena.riot.system.PrefixMa
 import org.openjena.riot.tokens.Token ;
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
-import riot.comms.CommsException ;
-import riot.comms.TokenComms ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.sparql.util.FmtUtils ;