diff --git a/src/zutil/network/FTPClient.java b/src/zutil/network/FTPClient.java index 17d044f..9dbb725 100644 --- a/src/zutil/network/FTPClient.java +++ b/src/zutil/network/FTPClient.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.BufferedReader; import java.io.File; diff --git a/src/zutil/network/POP3Client.java b/src/zutil/network/POP3Client.java index ad6c458..459915e 100644 --- a/src/zutil/network/POP3Client.java +++ b/src/zutil/network/POP3Client.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/zutil/network/SMTPClient.java b/src/zutil/network/SMTPClient.java index 7bc9024..5b3aad3 100644 --- a/src/zutil/network/SMTPClient.java +++ b/src/zutil/network/SMTPClient.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/zutil/network/ServerFind.java b/src/zutil/network/ServerFind.java index 7003cb4..5557200 100644 --- a/src/zutil/network/ServerFind.java +++ b/src/zutil/network/ServerFind.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.IOException; import java.net.DatagramPacket; diff --git a/src/zutil/network/ServerFindClient.java b/src/zutil/network/ServerFindClient.java index 78bdb5b..9b86d23 100644 --- a/src/zutil/network/ServerFindClient.java +++ b/src/zutil/network/ServerFindClient.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.IOException; import java.net.DatagramPacket; diff --git a/src/zutil/network/UpdateClient.java b/src/zutil/network/UpdateClient.java index 6849989..2a85501 100644 --- a/src/zutil/network/UpdateClient.java +++ b/src/zutil/network/UpdateClient.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.File; import java.io.FileOutputStream; diff --git a/src/zutil/network/UpdateServer.java b/src/zutil/network/UpdateServer.java index 35a8bdf..f06ca0c 100644 --- a/src/zutil/network/UpdateServer.java +++ b/src/zutil/network/UpdateServer.java @@ -1,4 +1,4 @@ -package zutil.network; +package zutil.net; import java.io.File; import java.io.FileInputStream; diff --git a/src/zutil/network/Zupdater.java b/src/zutil/network/Zupdater.java index 497a6ef..89e04a1 100644 --- a/src/zutil/network/Zupdater.java +++ b/src/zutil/network/Zupdater.java @@ -4,7 +4,7 @@ * Created on den 27 juli 2008, 23:32 */ -package zutil.network; +package zutil.net; import java.awt.Dimension; diff --git a/src/zutil/network/http/HTTPHeaderParser.java b/src/zutil/network/http/HTTPHeaderParser.java index 5fd7ebf..3ec6800 100644 --- a/src/zutil/network/http/HTTPHeaderParser.java +++ b/src/zutil/network/http/HTTPHeaderParser.java @@ -1,4 +1,4 @@ -package zutil.network.http; +package zutil.net.http; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/zutil/network/http/HttpPage.java b/src/zutil/network/http/HttpPage.java index 2d76325..b2d1215 100644 --- a/src/zutil/network/http/HttpPage.java +++ b/src/zutil/network/http/HttpPage.java @@ -1,4 +1,4 @@ -package zutil.network.http; +package zutil.net.http; import java.util.Map; diff --git a/src/zutil/network/http/HttpPrintStream.java b/src/zutil/network/http/HttpPrintStream.java index d3c7c21..4a2bd22 100644 --- a/src/zutil/network/http/HttpPrintStream.java +++ b/src/zutil/network/http/HttpPrintStream.java @@ -1,4 +1,4 @@ -package zutil.network.http; +package zutil.net.http; import java.io.OutputStream; import java.io.PrintStream; diff --git a/src/zutil/network/http/HttpServer.java b/src/zutil/network/http/HttpServer.java index e7452b4..61d5c87 100644 --- a/src/zutil/network/http/HttpServer.java +++ b/src/zutil/network/http/HttpServer.java @@ -1,4 +1,4 @@ -package zutil.network.http; +package zutil.net.http; import java.io.BufferedReader; import java.io.File; @@ -14,8 +14,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import zutil.log.LogUtil; -import zutil.network.threaded.ThreadedTCPNetworkServer; -import zutil.network.threaded.ThreadedTCPNetworkServerThread; +import zutil.net.threaded.ThreadedTCPNetworkServer; +import zutil.net.threaded.ThreadedTCPNetworkServerThread; /** diff --git a/src/zutil/network/http/multipart/MultipartField.java b/src/zutil/network/http/multipart/MultipartField.java index 6231d0a..10809ba 100644 --- a/src/zutil/network/http/multipart/MultipartField.java +++ b/src/zutil/network/http/multipart/MultipartField.java @@ -1,4 +1,4 @@ -package zutil.network.http.multipart; +package zutil.net.http.multipart; import java.io.BufferedReader; import java.io.File; diff --git a/src/zutil/network/http/multipart/MultipartFile.java b/src/zutil/network/http/multipart/MultipartFile.java index 9045706..15f2e82 100644 --- a/src/zutil/network/http/multipart/MultipartFile.java +++ b/src/zutil/network/http/multipart/MultipartFile.java @@ -1,4 +1,4 @@ -package zutil.network.http.multipart; +package zutil.net.http.multipart; import java.io.BufferedReader; import java.io.File; diff --git a/src/zutil/network/http/multipart/MultipartParser.java b/src/zutil/network/http/multipart/MultipartParser.java index a82ff0f..01d28a9 100644 --- a/src/zutil/network/http/multipart/MultipartParser.java +++ b/src/zutil/network/http/multipart/MultipartParser.java @@ -1,4 +1,4 @@ -package zutil.network.http.multipart; +package zutil.net.http.multipart; import java.io.BufferedOutputStream; import java.io.BufferedReader; @@ -13,7 +13,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import zutil.ProgressListener; -import zutil.network.http.HTTPHeaderParser; +import zutil.net.http.HTTPHeaderParser; /** * Parses a multipart/form-data http request, diff --git a/src/zutil/network/http/soap/SOAPClientFactory.java b/src/zutil/network/http/soap/SOAPClientFactory.java index 4513d29..54cf5a0 100644 --- a/src/zutil/network/http/soap/SOAPClientFactory.java +++ b/src/zutil/network/http/soap/SOAPClientFactory.java @@ -1,4 +1,4 @@ -package zutil.network.http.soap; +package zutil.net.http.soap; import javax.wsdl.WSDLException; @@ -8,9 +8,9 @@ import javassist.CtClass; import javassist.CtMethod; import javassist.CtNewMethod; import javassist.NotFoundException; -import zutil.network.ws.WSInterface; -import zutil.network.ws.WSMethodDef; -import zutil.network.ws.WebServiceDef; +import zutil.net.ws.WSInterface; +import zutil.net.ws.WSMethodDef; +import zutil.net.ws.WebServiceDef; /** * This is an factory that generates clients for web services diff --git a/src/zutil/network/http/soap/SOAPException.java b/src/zutil/network/http/soap/SOAPException.java index af5f597..7a92fcf 100644 --- a/src/zutil/network/http/soap/SOAPException.java +++ b/src/zutil/network/http/soap/SOAPException.java @@ -1,4 +1,4 @@ -package zutil.network.http.soap; +package zutil.net.http.soap; /** * This generates an client fault message diff --git a/src/zutil/network/http/soap/SOAPHttpPage.java b/src/zutil/network/http/soap/SOAPHttpPage.java index 17178d5..e1ed39d 100644 --- a/src/zutil/network/http/soap/SOAPHttpPage.java +++ b/src/zutil/network/http/soap/SOAPHttpPage.java @@ -1,4 +1,4 @@ -package zutil.network.http.soap; +package zutil.net.http.soap; import java.lang.annotation.Annotation; import java.lang.reflect.Array; @@ -49,14 +49,14 @@ import org.xml.sax.SAXException; import zutil.converters.Converter; import zutil.io.StringOutputStream; import zutil.log.LogUtil; -import zutil.network.http.HttpPage; -import zutil.network.http.HttpPrintStream; -import zutil.network.ws.WSInterface; -import zutil.network.ws.WSObject; -import zutil.network.ws.WSReturnValueList; -import zutil.network.ws.WSInterface.WSDocumentation; -import zutil.network.ws.WSInterface.WSParamDocumentation; -import zutil.network.ws.WSObject.WSFieldName; +import zutil.net.http.HttpPage; +import zutil.net.http.HttpPrintStream; +import zutil.net.ws.WSInterface; +import zutil.net.ws.WSObject; +import zutil.net.ws.WSReturnValueList; +import zutil.net.ws.WSInterface.WSDocumentation; +import zutil.net.ws.WSInterface.WSParamDocumentation; +import zutil.net.ws.WSObject.WSFieldName; import com.ibm.wsdl.extensions.PopulatedExtensionRegistry; import com.ibm.wsdl.extensions.soap.SOAPConstants; diff --git a/src/zutil/network/nio/NioClient.java b/src/zutil/network/nio/NioClient.java index 41e985d..96ce2f9 100644 --- a/src/zutil/network/nio/NioClient.java +++ b/src/zutil/network/nio/NioClient.java @@ -1,4 +1,4 @@ -package zutil.network.nio; +package zutil.net.nio; import java.io.IOException; import java.net.InetAddress; @@ -7,9 +7,9 @@ import java.nio.channels.Selector; import java.nio.channels.SocketChannel; import java.nio.channels.spi.SelectorProvider; -import zutil.network.nio.message.Message; -import zutil.network.nio.message.type.ResponseRequestMessage; -import zutil.network.nio.response.ResponseEvent; +import zutil.net.nio.message.Message; +import zutil.net.nio.message.type.ResponseRequestMessage; +import zutil.net.nio.response.ResponseEvent; public class NioClient extends NioNetwork{ diff --git a/src/zutil/network/nio/NioNetwork.java b/src/zutil/network/nio/NioNetwork.java index 053f115..2c452b8 100644 --- a/src/zutil/network/nio/NioNetwork.java +++ b/src/zutil/network/nio/NioNetwork.java @@ -1,4 +1,4 @@ -package zutil.network.nio; +package zutil.net.nio; import java.io.IOException; import java.net.InetAddress; @@ -21,13 +21,13 @@ import zutil.converters.Converter; import zutil.io.DynamicByteArrayStream; import zutil.io.MultiPrintStream; import zutil.log.LogUtil; -import zutil.network.nio.message.type.ResponseRequestMessage; -import zutil.network.nio.message.type.SystemMessage; -import zutil.network.nio.response.ResponseEvent; -import zutil.network.nio.server.ChangeRequest; -import zutil.network.nio.server.ClientData; -import zutil.network.nio.worker.SystemWorker; -import zutil.network.nio.worker.Worker; +import zutil.net.nio.message.type.ResponseRequestMessage; +import zutil.net.nio.message.type.SystemMessage; +import zutil.net.nio.response.ResponseEvent; +import zutil.net.nio.server.ChangeRequest; +import zutil.net.nio.server.ClientData; +import zutil.net.nio.worker.SystemWorker; +import zutil.net.nio.worker.Worker; public abstract class NioNetwork implements Runnable { diff --git a/src/zutil/network/nio/NioServer.java b/src/zutil/network/nio/NioServer.java index a5c4ff7..4dc7f08 100644 --- a/src/zutil/network/nio/NioServer.java +++ b/src/zutil/network/nio/NioServer.java @@ -1,4 +1,4 @@ -package zutil.network.nio; +package zutil.net.nio; import java.io.IOException; import java.net.InetAddress; diff --git a/src/zutil/network/nio/message/ChatMessage.java b/src/zutil/network/nio/message/ChatMessage.java index 353b07b..a10914b 100644 --- a/src/zutil/network/nio/message/ChatMessage.java +++ b/src/zutil/network/nio/message/ChatMessage.java @@ -1,4 +1,4 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; public class ChatMessage extends Message{ private static final long serialVersionUID = 1L; diff --git a/src/zutil/network/nio/message/GraphicsSyncMessage.java b/src/zutil/network/nio/message/GraphicsSyncMessage.java index 49a8ce8..6d5acbc 100644 --- a/src/zutil/network/nio/message/GraphicsSyncMessage.java +++ b/src/zutil/network/nio/message/GraphicsSyncMessage.java @@ -1,4 +1,4 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; public class GraphicsSyncMessage extends SyncMessage{ diff --git a/src/zutil/network/nio/message/GridMessage.java b/src/zutil/network/nio/message/GridMessage.java index b21365d..cb17f8d 100644 --- a/src/zutil/network/nio/message/GridMessage.java +++ b/src/zutil/network/nio/message/GridMessage.java @@ -1,4 +1,4 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; public class GridMessage extends Message{ private static final long serialVersionUID = 1L; diff --git a/src/zutil/network/nio/message/KeepAliveMessage.java b/src/zutil/network/nio/message/KeepAliveMessage.java index 5f57898..357aa8b 100644 --- a/src/zutil/network/nio/message/KeepAliveMessage.java +++ b/src/zutil/network/nio/message/KeepAliveMessage.java @@ -1,6 +1,6 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; -import zutil.network.nio.message.type.SystemMessage; +import zutil.net.nio.message.type.SystemMessage; /** * Tells the destination that the diff --git a/src/zutil/network/nio/message/Message.java b/src/zutil/network/nio/message/Message.java index 8792f14..8215bb4 100644 --- a/src/zutil/network/nio/message/Message.java +++ b/src/zutil/network/nio/message/Message.java @@ -1,4 +1,4 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; import java.io.Serializable; diff --git a/src/zutil/network/nio/message/StringMessage.java b/src/zutil/network/nio/message/StringMessage.java index ff9376a..6f0948a 100644 --- a/src/zutil/network/nio/message/StringMessage.java +++ b/src/zutil/network/nio/message/StringMessage.java @@ -1,7 +1,7 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; -import zutil.network.nio.message.type.EchoMessage; -import zutil.network.nio.message.type.ResponseRequestMessage; +import zutil.net.nio.message.type.EchoMessage; +import zutil.net.nio.message.type.ResponseRequestMessage; diff --git a/src/zutil/network/nio/message/SyncMessage.java b/src/zutil/network/nio/message/SyncMessage.java index d595071..5ed1404 100644 --- a/src/zutil/network/nio/message/SyncMessage.java +++ b/src/zutil/network/nio/message/SyncMessage.java @@ -1,6 +1,6 @@ -package zutil.network.nio.message; +package zutil.net.nio.message; -import zutil.network.nio.message.type.SystemMessage; +import zutil.net.nio.message.type.SystemMessage; public class SyncMessage extends Message implements SystemMessage{ private static final long serialVersionUID = 1L; diff --git a/src/zutil/network/nio/message/type/EchoMessage.java b/src/zutil/network/nio/message/type/EchoMessage.java index bb40f79..c1c5158 100644 --- a/src/zutil/network/nio/message/type/EchoMessage.java +++ b/src/zutil/network/nio/message/type/EchoMessage.java @@ -1,6 +1,6 @@ -package zutil.network.nio.message.type; +package zutil.net.nio.message.type; -import zutil.network.nio.message.Message; +import zutil.net.nio.message.Message; /** * The reciver will echo out this message to the sender diff --git a/src/zutil/network/nio/message/type/ResponseRequestMessage.java b/src/zutil/network/nio/message/type/ResponseRequestMessage.java index 6ee1823..629f3c8 100644 --- a/src/zutil/network/nio/message/type/ResponseRequestMessage.java +++ b/src/zutil/network/nio/message/type/ResponseRequestMessage.java @@ -1,4 +1,4 @@ -package zutil.network.nio.message.type; +package zutil.net.nio.message.type; /** * This interface means that the sender diff --git a/src/zutil/network/nio/message/type/SystemMessage.java b/src/zutil/network/nio/message/type/SystemMessage.java index f2f07dd..436fc01 100644 --- a/src/zutil/network/nio/message/type/SystemMessage.java +++ b/src/zutil/network/nio/message/type/SystemMessage.java @@ -1,4 +1,4 @@ -package zutil.network.nio.message.type; +package zutil.net.nio.message.type; /** * A message that implements this will be diff --git a/src/zutil/network/nio/response/PrintRsp.java b/src/zutil/network/nio/response/PrintRsp.java index f970877..562ac92 100644 --- a/src/zutil/network/nio/response/PrintRsp.java +++ b/src/zutil/network/nio/response/PrintRsp.java @@ -1,4 +1,4 @@ -package zutil.network.nio.response; +package zutil.net.nio.response; import zutil.io.MultiPrintStream; diff --git a/src/zutil/network/nio/response/ResponseEvent.java b/src/zutil/network/nio/response/ResponseEvent.java index 3e0a444..dcee623 100644 --- a/src/zutil/network/nio/response/ResponseEvent.java +++ b/src/zutil/network/nio/response/ResponseEvent.java @@ -1,4 +1,4 @@ -package zutil.network.nio.response; +package zutil.net.nio.response; public abstract class ResponseEvent { diff --git a/src/zutil/network/nio/response/ResponseHandler.java b/src/zutil/network/nio/response/ResponseHandler.java index 9c28ac9..6cc8736 100644 --- a/src/zutil/network/nio/response/ResponseHandler.java +++ b/src/zutil/network/nio/response/ResponseHandler.java @@ -1,4 +1,4 @@ -package zutil.network.nio.response; +package zutil.net.nio.response; import java.util.LinkedList; import java.util.List; diff --git a/src/zutil/network/nio/server/ChangeRequest.java b/src/zutil/network/nio/server/ChangeRequest.java index 366d33b..ca932a4 100644 --- a/src/zutil/network/nio/server/ChangeRequest.java +++ b/src/zutil/network/nio/server/ChangeRequest.java @@ -1,4 +1,4 @@ -package zutil.network.nio.server; +package zutil.net.nio.server; import java.nio.channels.SocketChannel; diff --git a/src/zutil/network/nio/server/ClientData.java b/src/zutil/network/nio/server/ClientData.java index aeca8ec..9f0e4f8 100644 --- a/src/zutil/network/nio/server/ClientData.java +++ b/src/zutil/network/nio/server/ClientData.java @@ -1,4 +1,4 @@ -package zutil.network.nio.server; +package zutil.net.nio.server; import java.net.InetSocketAddress; import java.nio.channels.SocketChannel; diff --git a/src/zutil/network/nio/service/NetworkService.java b/src/zutil/network/nio/service/NetworkService.java index f0a00ef..c76ffd5 100644 --- a/src/zutil/network/nio/service/NetworkService.java +++ b/src/zutil/network/nio/service/NetworkService.java @@ -1,9 +1,9 @@ -package zutil.network.nio.service; +package zutil.net.nio.service; import java.nio.channels.SocketChannel; -import zutil.network.nio.NioNetwork; -import zutil.network.nio.message.Message; +import zutil.net.nio.NioNetwork; +import zutil.net.nio.message.Message; public abstract class NetworkService { protected static NetworkService instance; diff --git a/src/zutil/network/nio/service/chat/ChatListener.java b/src/zutil/network/nio/service/chat/ChatListener.java index 6f07635..b6f2afa 100644 --- a/src/zutil/network/nio/service/chat/ChatListener.java +++ b/src/zutil/network/nio/service/chat/ChatListener.java @@ -1,4 +1,4 @@ -package zutil.network.nio.service.chat; +package zutil.net.nio.service.chat; /** * Tis is a listener class for new chat messages diff --git a/src/zutil/network/nio/service/chat/ChatService.java b/src/zutil/network/nio/service/chat/ChatService.java index 4e9ba79..067d71a 100644 --- a/src/zutil/network/nio/service/chat/ChatService.java +++ b/src/zutil/network/nio/service/chat/ChatService.java @@ -1,4 +1,4 @@ -package zutil.network.nio.service.chat; +package zutil.net.nio.service.chat; import java.nio.channels.SocketChannel; import java.util.HashMap; @@ -6,10 +6,10 @@ import java.util.LinkedList; import java.util.logging.Logger; import zutil.log.LogUtil; -import zutil.network.nio.NioNetwork; -import zutil.network.nio.message.ChatMessage; -import zutil.network.nio.message.Message; -import zutil.network.nio.service.NetworkService; +import zutil.net.nio.NioNetwork; +import zutil.net.nio.message.ChatMessage; +import zutil.net.nio.message.Message; +import zutil.net.nio.service.NetworkService; /** * A simple chat service with users and rooms diff --git a/src/zutil/network/nio/service/sync/ObjectSync.java b/src/zutil/network/nio/service/sync/ObjectSync.java index 71eb24a..94f6412 100644 --- a/src/zutil/network/nio/service/sync/ObjectSync.java +++ b/src/zutil/network/nio/service/sync/ObjectSync.java @@ -1,6 +1,6 @@ -package zutil.network.nio.service.sync; +package zutil.net.nio.service.sync; -import zutil.network.nio.message.SyncMessage; +import zutil.net.nio.message.SyncMessage; public abstract class ObjectSync { public String id; diff --git a/src/zutil/network/nio/service/sync/SyncService.java b/src/zutil/network/nio/service/sync/SyncService.java index 777f9c9..23f5390 100644 --- a/src/zutil/network/nio/service/sync/SyncService.java +++ b/src/zutil/network/nio/service/sync/SyncService.java @@ -1,14 +1,14 @@ -package zutil.network.nio.service.sync; +package zutil.net.nio.service.sync; import java.nio.channels.SocketChannel; import java.util.HashMap; import java.util.logging.Logger; import zutil.log.LogUtil; -import zutil.network.nio.NioNetwork; -import zutil.network.nio.message.Message; -import zutil.network.nio.message.SyncMessage; -import zutil.network.nio.service.NetworkService; +import zutil.net.nio.NioNetwork; +import zutil.net.nio.message.Message; +import zutil.net.nio.message.SyncMessage; +import zutil.net.nio.service.NetworkService; public class SyncService extends NetworkService{ private static Logger logger = LogUtil.getLogger(); diff --git a/src/zutil/network/nio/worker/EchoWorker.java b/src/zutil/network/nio/worker/EchoWorker.java index 72ec21c..c3c48a6 100644 --- a/src/zutil/network/nio/worker/EchoWorker.java +++ b/src/zutil/network/nio/worker/EchoWorker.java @@ -1,4 +1,4 @@ -package zutil.network.nio.worker; +package zutil.net.nio.worker; import java.io.IOException; diff --git a/src/zutil/network/nio/worker/SystemWorker.java b/src/zutil/network/nio/worker/SystemWorker.java index e4208a4..df35c45 100644 --- a/src/zutil/network/nio/worker/SystemWorker.java +++ b/src/zutil/network/nio/worker/SystemWorker.java @@ -1,20 +1,20 @@ -package zutil.network.nio.worker; +package zutil.net.nio.worker; import java.util.HashMap; import java.util.Map; import java.util.logging.Logger; import zutil.log.LogUtil; -import zutil.network.nio.NioNetwork; -import zutil.network.nio.message.ChatMessage; -import zutil.network.nio.message.Message; -import zutil.network.nio.message.SyncMessage; -import zutil.network.nio.message.type.EchoMessage; -import zutil.network.nio.message.type.ResponseRequestMessage; -import zutil.network.nio.response.ResponseEvent; -import zutil.network.nio.service.NetworkService; -import zutil.network.nio.service.chat.ChatService; -import zutil.network.nio.service.sync.SyncService; +import zutil.net.nio.NioNetwork; +import zutil.net.nio.message.ChatMessage; +import zutil.net.nio.message.Message; +import zutil.net.nio.message.SyncMessage; +import zutil.net.nio.message.type.EchoMessage; +import zutil.net.nio.message.type.ResponseRequestMessage; +import zutil.net.nio.response.ResponseEvent; +import zutil.net.nio.service.NetworkService; +import zutil.net.nio.service.chat.ChatService; +import zutil.net.nio.service.sync.SyncService; public class SystemWorker extends ThreadedEventWorker { diff --git a/src/zutil/network/nio/worker/ThreadedEventWorker.java b/src/zutil/network/nio/worker/ThreadedEventWorker.java index cf7eb3c..55782c9 100644 --- a/src/zutil/network/nio/worker/ThreadedEventWorker.java +++ b/src/zutil/network/nio/worker/ThreadedEventWorker.java @@ -1,4 +1,4 @@ -package zutil.network.nio.worker; +package zutil.net.nio.worker; public abstract class ThreadedEventWorker extends Worker{ private Thread thread; diff --git a/src/zutil/network/nio/worker/Worker.java b/src/zutil/network/nio/worker/Worker.java index b19cfb1..6c5afa4 100644 --- a/src/zutil/network/nio/worker/Worker.java +++ b/src/zutil/network/nio/worker/Worker.java @@ -1,10 +1,10 @@ -package zutil.network.nio.worker; +package zutil.net.nio.worker; import java.nio.channels.SocketChannel; import java.util.LinkedList; import java.util.List; -import zutil.network.nio.NioNetwork; +import zutil.net.nio.NioNetwork; public abstract class Worker implements Runnable { diff --git a/src/zutil/network/nio/worker/WorkerDataEvent.java b/src/zutil/network/nio/worker/WorkerDataEvent.java index 1b7733d..30536f7 100644 --- a/src/zutil/network/nio/worker/WorkerDataEvent.java +++ b/src/zutil/network/nio/worker/WorkerDataEvent.java @@ -1,8 +1,8 @@ -package zutil.network.nio.worker; +package zutil.net.nio.worker; import java.nio.channels.SocketChannel; -import zutil.network.nio.NioNetwork; +import zutil.net.nio.NioNetwork; public class WorkerDataEvent { diff --git a/src/zutil/network/nio/worker/grid/GridClient.java b/src/zutil/network/nio/worker/grid/GridClient.java index 6ae5801..afbd319 100644 --- a/src/zutil/network/nio/worker/grid/GridClient.java +++ b/src/zutil/network/nio/worker/grid/GridClient.java @@ -1,14 +1,14 @@ -package zutil.network.nio.worker.grid; +package zutil.net.nio.worker.grid; import java.io.IOException; import java.util.LinkedList; import java.util.Queue; import zutil.io.MultiPrintStream; -import zutil.network.nio.NioClient; -import zutil.network.nio.message.GridMessage; -import zutil.network.nio.worker.ThreadedEventWorker; -import zutil.network.nio.worker.WorkerDataEvent; +import zutil.net.nio.NioClient; +import zutil.net.nio.message.GridMessage; +import zutil.net.nio.worker.ThreadedEventWorker; +import zutil.net.nio.worker.WorkerDataEvent; /** * This class is the client part of the grid. diff --git a/src/zutil/network/nio/worker/grid/GridJob.java b/src/zutil/network/nio/worker/grid/GridJob.java index e3b26d4..547da04 100644 --- a/src/zutil/network/nio/worker/grid/GridJob.java +++ b/src/zutil/network/nio/worker/grid/GridJob.java @@ -1,4 +1,4 @@ -package zutil.network.nio.worker.grid; +package zutil.net.nio.worker.grid; /** * A internal class for handling the jobs diff --git a/src/zutil/network/nio/worker/grid/GridJobGenerator.java b/src/zutil/network/nio/worker/grid/GridJobGenerator.java index c246509..8417a00 100644 --- a/src/zutil/network/nio/worker/grid/GridJobGenerator.java +++ b/src/zutil/network/nio/worker/grid/GridJobGenerator.java @@ -1,4 +1,4 @@ -package zutil.network.nio.worker.grid; +package zutil.net.nio.worker.grid; /** diff --git a/src/zutil/network/nio/worker/grid/GridResultHandler.java b/src/zutil/network/nio/worker/grid/GridResultHandler.java index 7f4b8d0..ffc8151 100644 --- a/src/zutil/network/nio/worker/grid/GridResultHandler.java +++ b/src/zutil/network/nio/worker/grid/GridResultHandler.java @@ -1,4 +1,4 @@ -package zutil.network.nio.worker.grid; +package zutil.net.nio.worker.grid; /** * Handles the incoming results from the grid diff --git a/src/zutil/network/nio/worker/grid/GridServerWorker.java b/src/zutil/network/nio/worker/grid/GridServerWorker.java index c4b7487..ddf8094 100644 --- a/src/zutil/network/nio/worker/grid/GridServerWorker.java +++ b/src/zutil/network/nio/worker/grid/GridServerWorker.java @@ -1,13 +1,13 @@ -package zutil.network.nio.worker.grid; +package zutil.net.nio.worker.grid; import java.io.IOException; import java.util.HashMap; import java.util.LinkedList; import java.util.Queue; -import zutil.network.nio.message.GridMessage; -import zutil.network.nio.worker.ThreadedEventWorker; -import zutil.network.nio.worker.WorkerDataEvent; +import zutil.net.nio.message.GridMessage; +import zutil.net.nio.worker.ThreadedEventWorker; +import zutil.net.nio.worker.WorkerDataEvent; /** * Implements a simple network computing server diff --git a/src/zutil/network/nio/worker/grid/GridThread.java b/src/zutil/network/nio/worker/grid/GridThread.java index 25aa321..68cb0a8 100644 --- a/src/zutil/network/nio/worker/grid/GridThread.java +++ b/src/zutil/network/nio/worker/grid/GridThread.java @@ -1,4 +1,4 @@ -package zutil.network.nio.worker.grid; +package zutil.net.nio.worker.grid; /** * This interface is the thread that will do diff --git a/src/zutil/network/ssdp/SSDPClient.java b/src/zutil/network/ssdp/SSDPClient.java index 6227b6f..e3f13f0 100644 --- a/src/zutil/network/ssdp/SSDPClient.java +++ b/src/zutil/network/ssdp/SSDPClient.java @@ -1,4 +1,4 @@ -package zutil.network.ssdp; +package zutil.net.ssdp; import java.io.IOException; import java.net.DatagramPacket; @@ -10,10 +10,10 @@ import java.util.logging.Logger; import zutil.io.StringOutputStream; import zutil.log.LogUtil; -import zutil.network.http.HTTPHeaderParser; -import zutil.network.http.HttpPrintStream; -import zutil.network.threaded.ThreadedUDPNetwork; -import zutil.network.threaded.ThreadedUDPNetworkThread; +import zutil.net.http.HTTPHeaderParser; +import zutil.net.http.HttpPrintStream; +import zutil.net.threaded.ThreadedUDPNetwork; +import zutil.net.threaded.ThreadedUDPNetworkThread; /** * An SSDP client class that will request diff --git a/src/zutil/network/ssdp/SSDPServer.java b/src/zutil/network/ssdp/SSDPServer.java index 1a51d05..dd72490 100644 --- a/src/zutil/network/ssdp/SSDPServer.java +++ b/src/zutil/network/ssdp/SSDPServer.java @@ -1,4 +1,4 @@ -package zutil.network.ssdp; +package zutil.net.ssdp; import java.io.IOException; import java.net.DatagramPacket; @@ -12,10 +12,10 @@ import java.util.logging.Logger; import zutil.io.MultiPrintStream; import zutil.io.StringOutputStream; import zutil.log.LogUtil; -import zutil.network.http.HTTPHeaderParser; -import zutil.network.http.HttpPrintStream; -import zutil.network.threaded.ThreadedUDPNetworkThread; -import zutil.network.threaded.ThreadedUDPNetwork; +import zutil.net.http.HTTPHeaderParser; +import zutil.net.http.HttpPrintStream; +import zutil.net.threaded.ThreadedUDPNetworkThread; +import zutil.net.threaded.ThreadedUDPNetwork; /** * A Server class that announces an service by the SSDP diff --git a/src/zutil/network/ssdp/SSDPServiceInfo.java b/src/zutil/network/ssdp/SSDPServiceInfo.java index 7b6bc90..7ee7237 100644 --- a/src/zutil/network/ssdp/SSDPServiceInfo.java +++ b/src/zutil/network/ssdp/SSDPServiceInfo.java @@ -1,4 +1,4 @@ -package zutil.network.ssdp; +package zutil.net.ssdp; /** * This class contains information about a service from diff --git a/src/zutil/network/ssdp/StandardSSDPInfo.java b/src/zutil/network/ssdp/StandardSSDPInfo.java index e07d840..c2fb043 100644 --- a/src/zutil/network/ssdp/StandardSSDPInfo.java +++ b/src/zutil/network/ssdp/StandardSSDPInfo.java @@ -1,4 +1,4 @@ -package zutil.network.ssdp; +package zutil.net.ssdp; import java.util.Date; import java.util.UUID; diff --git a/src/zutil/network/threaded/ThreadedTCPNetworkServer.java b/src/zutil/network/threaded/ThreadedTCPNetworkServer.java index 4568369..7e8dd63 100644 --- a/src/zutil/network/threaded/ThreadedTCPNetworkServer.java +++ b/src/zutil/network/threaded/ThreadedTCPNetworkServer.java @@ -1,4 +1,4 @@ -package zutil.network.threaded; +package zutil.net.threaded; import java.io.File; import java.io.IOException; diff --git a/src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java b/src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java index 21f9ddb..1888c61 100644 --- a/src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java +++ b/src/zutil/network/threaded/ThreadedTCPNetworkServerThread.java @@ -1,4 +1,4 @@ -package zutil.network.threaded; +package zutil.net.threaded; /** * The class that will handle the TCP connection will incclude diff --git a/src/zutil/network/threaded/ThreadedUDPNetwork.java b/src/zutil/network/threaded/ThreadedUDPNetwork.java index db7f644..922e035 100644 --- a/src/zutil/network/threaded/ThreadedUDPNetwork.java +++ b/src/zutil/network/threaded/ThreadedUDPNetwork.java @@ -1,4 +1,4 @@ -package zutil.network.threaded; +package zutil.net.threaded; import java.io.IOException; import java.net.DatagramPacket; diff --git a/src/zutil/network/threaded/ThreadedUDPNetworkThread.java b/src/zutil/network/threaded/ThreadedUDPNetworkThread.java index 48a381a..496a1f1 100644 --- a/src/zutil/network/threaded/ThreadedUDPNetworkThread.java +++ b/src/zutil/network/threaded/ThreadedUDPNetworkThread.java @@ -1,4 +1,4 @@ -package zutil.network.threaded; +package zutil.net.threaded; import java.net.DatagramPacket; diff --git a/src/zutil/network/torrent/Torrent.java b/src/zutil/network/torrent/Torrent.java index 1636f5d..f0856e3 100644 --- a/src/zutil/network/torrent/Torrent.java +++ b/src/zutil/network/torrent/Torrent.java @@ -1,4 +1,4 @@ -package zutil.network.torrent; +package zutil.net.torrent; import java.io.File; import java.io.IOException; diff --git a/src/zutil/network/torrent/TorrentParser.java b/src/zutil/network/torrent/TorrentParser.java index 598807c..d566e3b 100644 --- a/src/zutil/network/torrent/TorrentParser.java +++ b/src/zutil/network/torrent/TorrentParser.java @@ -1,4 +1,4 @@ -package zutil.network.torrent; +package zutil.net.torrent; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/zutil/network/upnp/UPnPMediaServer.java b/src/zutil/network/upnp/UPnPMediaServer.java index dc6af79..2743a9a 100644 --- a/src/zutil/network/upnp/UPnPMediaServer.java +++ b/src/zutil/network/upnp/UPnPMediaServer.java @@ -1,9 +1,9 @@ -package zutil.network.upnp; +package zutil.net.upnp; import java.util.Map; import java.util.UUID; -import zutil.network.http.HttpPrintStream; +import zutil.net.http.HttpPrintStream; /** * This class is a UPnP AV Media Server that handles all the diff --git a/src/zutil/network/upnp/UPnPRootDevice.java b/src/zutil/network/upnp/UPnPRootDevice.java index 172f186..009a922 100644 --- a/src/zutil/network/upnp/UPnPRootDevice.java +++ b/src/zutil/network/upnp/UPnPRootDevice.java @@ -1,7 +1,7 @@ -package zutil.network.upnp; +package zutil.net.upnp; -import zutil.network.http.HttpPage; -import zutil.network.ssdp.SSDPServiceInfo; +import zutil.net.http.HttpPage; +import zutil.net.ssdp.SSDPServiceInfo; /** * This class is a UPnP Server class that will be extended * by all root devices handles all the other UPnP services diff --git a/src/zutil/network/upnp/UPnPService.java b/src/zutil/network/upnp/UPnPService.java index 70c1236..68d305e 100644 --- a/src/zutil/network/upnp/UPnPService.java +++ b/src/zutil/network/upnp/UPnPService.java @@ -1,4 +1,4 @@ -package zutil.network.upnp; +package zutil.net.upnp; /** * Information about a UPNP Service diff --git a/src/zutil/network/upnp/services/BrowseRetObj.java b/src/zutil/network/upnp/services/BrowseRetObj.java index b782da5..e2d3876 100644 --- a/src/zutil/network/upnp/services/BrowseRetObj.java +++ b/src/zutil/network/upnp/services/BrowseRetObj.java @@ -1,6 +1,6 @@ -package zutil.network.upnp.services; +package zutil.net.upnp.services; -import zutil.network.ws.WSReturnValueList; +import zutil.net.ws.WSReturnValueList; public class BrowseRetObj extends WSReturnValueList{ @WSValueName("Result") diff --git a/src/zutil/network/upnp/services/UPnPContentDirectory.java b/src/zutil/network/upnp/services/UPnPContentDirectory.java index 16385f7..596b280 100644 --- a/src/zutil/network/upnp/services/UPnPContentDirectory.java +++ b/src/zutil/network/upnp/services/UPnPContentDirectory.java @@ -1,4 +1,4 @@ -package zutil.network.upnp.services; +package zutil.net.upnp.services; import java.io.File; import java.util.LinkedList; @@ -8,11 +8,11 @@ import java.util.Map; import org.dom4j.DocumentException; import zutil.io.file.FileUtil; -import zutil.network.http.HttpPage; -import zutil.network.http.HttpPrintStream; -import zutil.network.upnp.UPnPService; -import zutil.network.ws.WSInterface; -import zutil.network.ws.WSReturnValueList; +import zutil.net.http.HttpPage; +import zutil.net.http.HttpPrintStream; +import zutil.net.upnp.UPnPService; +import zutil.net.ws.WSInterface; +import zutil.net.ws.WSReturnValueList; /** * Information about a UPNP Service diff --git a/src/zutil/network/ws/WSInterface.java b/src/zutil/network/ws/WSInterface.java index 420987a..0cb8adb 100644 --- a/src/zutil/network/ws/WSInterface.java +++ b/src/zutil/network/ws/WSInterface.java @@ -1,4 +1,4 @@ -package zutil.network.ws; +package zutil.net.ws; import java.lang.annotation.*; /** diff --git a/src/zutil/network/ws/WSMethodDef.java b/src/zutil/network/ws/WSMethodDef.java index 856a37b..4236aa9 100644 --- a/src/zutil/network/ws/WSMethodDef.java +++ b/src/zutil/network/ws/WSMethodDef.java @@ -1,4 +1,4 @@ -package zutil.network.ws; +package zutil.net.ws; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -6,7 +6,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import zutil.network.ws.WSInterface.WSDocumentation; +import zutil.net.ws.WSInterface.WSDocumentation; // TODO: Header parameters public class WSMethodDef { diff --git a/src/zutil/network/ws/WSObject.java b/src/zutil/network/ws/WSObject.java index 1ea7c06..6fd0518 100644 --- a/src/zutil/network/ws/WSObject.java +++ b/src/zutil/network/ws/WSObject.java @@ -1,4 +1,4 @@ -package zutil.network.ws; +package zutil.net.ws; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/zutil/network/ws/WSParameterDef.java b/src/zutil/network/ws/WSParameterDef.java index 0051e8b..9561bb4 100644 --- a/src/zutil/network/ws/WSParameterDef.java +++ b/src/zutil/network/ws/WSParameterDef.java @@ -1,4 +1,5 @@ -package zutil.network.ws; +package zutil.net.ws; + public class WSParameterDef{ /** The class type of the parameter **/ protected Class paramClass; diff --git a/src/zutil/network/ws/WSReturnValueList.java b/src/zutil/network/ws/WSReturnValueList.java index 5741461..d47283c 100644 --- a/src/zutil/network/ws/WSReturnValueList.java +++ b/src/zutil/network/ws/WSReturnValueList.java @@ -1,4 +1,4 @@ -package zutil.network.ws; +package zutil.net.ws; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/zutil/network/ws/WebServiceDef.java b/src/zutil/network/ws/WebServiceDef.java index 48aacb3..1f94897 100644 --- a/src/zutil/network/ws/WebServiceDef.java +++ b/src/zutil/network/ws/WebServiceDef.java @@ -1,4 +1,4 @@ -package zutil.network.ws; +package zutil.net.ws; import java.lang.reflect.Method; import java.lang.reflect.Modifier;