* Streaming: Move streaming to new package (ticket #1135)

apps/ministreaming/java/src/net/i2p/client/streaming/AcceptingChannel.java

@@ -16,11 +16,11 @@ import java.nio.channels.SelectableChannel;
  */
 public abstract class AcceptingChannel extends SelectableChannel {
 
-    abstract I2PSocket accept() throws I2PException, ConnectException;
+    public abstract I2PSocket accept() throws I2PException, ConnectException;
 
     protected final I2PSocketManager _socketManager;
 
-    AcceptingChannel(I2PSocketManager manager) {
+    protected AcceptingChannel(I2PSocketManager manager) {
         this._socketManager = manager;
     }
 }

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java

@@ -25,7 +25,7 @@ import net.i2p.util.Log;
 public class I2PSocketManagerFactory {
 
     public static final String PROP_MANAGER = "i2p.streaming.manager";
-    public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.I2PSocketManagerFull";
+    public static final String DEFAULT_MANAGER = "net.i2p.client.streaming.impl.I2PSocketManagerFull";
     
     /**
      * Create a socket manager using a brand new destination connected to the

apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketOptionsImpl.java

@@ -6,7 +6,7 @@ import java.util.Properties;
  * Define the configuration for streaming and verifying data on the socket.
  * Use I2PSocketManager.buildOptions() to get one of these.
  */
-class I2PSocketOptionsImpl implements I2PSocketOptions {
+public class I2PSocketOptionsImpl implements I2PSocketOptions {
     private long _connectTimeout;
     private long _readTimeout;
     private long _writeTimeout;
@@ -93,7 +93,7 @@ class I2PSocketOptionsImpl implements I2PSocketOptions {
         }
     }
     
-    protected static double getDouble(Properties opts, String name, double defaultVal) {
+    public static double getDouble(Properties opts, String name, double defaultVal) {
         if (opts == null) return defaultVal;
         String val = opts.getProperty(name);
         if (val == null) {

apps/streaming/java/src/net/i2p/client/streaming/impl/AcceptingChannelImpl.java

@@ -1,6 +1,10 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PException;
+import net.i2p.client.streaming.AcceptingChannel;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.I2PSocketManager;
 
 import java.net.SocketTimeoutException;
 import java.net.ConnectException;
@@ -29,7 +33,7 @@ class AcceptingChannelImpl extends AcceptingChannel {
     private volatile I2PSocket next;
     private final I2PServerSocket socket;
 
-    I2PSocket accept() throws I2PException, ConnectException {
+    public I2PSocket accept() throws I2PException, ConnectException {
         I2PSocket sock;
         try {
             sock = socket.accept();
@@ -43,7 +47,7 @@ class AcceptingChannelImpl extends AcceptingChannel {
         }
     }
 
-    AcceptingChannelImpl(I2PSocketManager manager) {
+    protected AcceptingChannelImpl(I2PSocketManager manager) {
         super(manager);
         // this cheats and just sets the manager timeout low in order to repeatedly poll it.
         // that means we can "only" accept one new connection every 100 milliseconds.

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnThrottler.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.util.ArrayList;

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionDataReceiver.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.data.ByteArray;

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionHandler.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.HashSet;
 import java.util.Iterator;

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionOptions.java

@@ -1,4 +1,7 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
+
+import net.i2p.client.streaming.I2PSocketOptionsImpl;
+import net.i2p.client.streaming.I2PSocketOptions;
 
 import java.util.Collections;
 import java.util.HashSet;

apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionPacketHandler.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.List;
 

apps/streaming/java/src/net/i2p/client/streaming/impl/I2PServerSocketFull.java

@@ -1,7 +1,11 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.net.SocketTimeoutException;
 import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PServerSocket;
+import net.i2p.client.streaming.AcceptingChannel;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketManager;
 
 /**
  * Bridge to allow accepting new connections

apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketFull.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -10,6 +10,8 @@ import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketOptions;
 
 /**
  * Bridge between the full streaming lib and the I2PSocket API

apps/streaming/java/src/net/i2p/client/streaming/impl/I2PSocketManagerFull.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.net.NoRouteToHostException;
@@ -17,7 +17,10 @@ import net.i2p.client.I2PSession;
 import net.i2p.client.I2PSessionException;
 import net.i2p.data.Destination;
 import net.i2p.util.Log;
-
+import net.i2p.client.streaming.I2PSocketManager;
+import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PServerSocket;
 
 /**
  * Centralize the coordination and multiplexing of the local client's streaming.

apps/streaming/java/src/net/i2p/client/streaming/impl/MessageChannel.java

@@ -1,4 +1,6 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
+
+import net.i2p.client.streaming.I2PSocket;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

apps/streaming/java/src/net/i2p/client/streaming/impl/MessageHandler.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -9,6 +9,7 @@ import net.i2p.client.I2PSessionException;
 import net.i2p.client.I2PSessionMuxedListener;
 import net.i2p.client.streaming.I2PSocketManager.DisconnectListener;
 import net.i2p.util.Log;
+import net.i2p.client.streaming.I2PSocketManager;
 
 /**
  * Receive raw information from the I2PSession and turn it into

apps/streaming/java/src/net/i2p/client/streaming/impl/MessageInputStream.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.io.InputStream;

apps/streaming/java/src/net/i2p/client/streaming/impl/MessageOutputStream.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

apps/streaming/java/src/net/i2p/client/streaming/impl/PacketHandler.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;

apps/streaming/java/src/net/i2p/client/streaming/impl/PacketLocal.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.util.Collections;

apps/streaming/java/src/net/i2p/client/streaming/impl/PacketQueue.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.client.I2PSession;

apps/streaming/java/src/net/i2p/client/streaming/impl/PcapWriter.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.BufferedOutputStream;
 import java.io.File;

apps/streaming/java/src/net/i2p/client/streaming/impl/RetransmissionTimer.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.SimpleTimer2;

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerChooser.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.ArrayList;
 import java.util.List;

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosed.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerClosing.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnectedBulk.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerConnecting.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerDead.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerHardDisconnected.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerImpl.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerPreconnect.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;

apps/streaming/java/src/net/i2p/client/streaming/impl/SchedulerReceived.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;

apps/streaming/java/src/net/i2p/client/streaming/impl/StandardServerSocket.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -9,6 +9,7 @@ import java.net.SocketException;
 import java.nio.channels.ServerSocketChannel;
 
 import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
 
 /**
  * Bridge to I2PServerSocket.

apps/streaming/java/src/net/i2p/client/streaming/impl/StandardSocket.java

@@ -1,4 +1,7 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
+
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketOptions;
 
 import java.io.IOException;
 import java.io.InputStream;

apps/streaming/java/src/net/i2p/client/streaming/impl/TCBShare.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import java.util.Iterator;
 import java.util.Map;

apps/streaming/java/src/net/i2p/client/streaming/impl/TaskScheduler.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 /**
  * Coordinates what we do 'next'.  The scheduler used by a connection is

apps/streaming/java/src/net/i2p/client/streaming/impl/TooManyStreamsException.java

@@ -1,4 +1,4 @@
-package net.i2p.client.streaming;
+package net.i2p.client.streaming.impl;
 
 import net.i2p.I2PException;
 

history.txt

@@ -1,3 +1,6 @@
+2014-01-04 dg
+ * Streaming: Move streaming to new package (ticket #1135)
+
 2013-12-25 dg
  * Console: Add 'advanced warning' to /configclients
  * SOCKS5Server: Remove redundant, commented out line from my previous findbugs