Merged commons folders.

trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -18,14 +18,14 @@
  */
 package handlers;
 
+import handlers.effecthandlers.*;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.handler.EffectHandler;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 
-import handlers.effecthandlers.*;
-
 /**
  * Effect Master handler.
  * @author BiggBoss, Zoey76

trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminPForge.java

@@ -24,8 +24,7 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.StringTokenizer;
 
-import commons.mmocore.NioNetStringBuffer;
+import com.l2jserver.commons.mmocore.NioNetStringBuffer;
-
 import com.l2jserver.gameserver.GameServer;
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.gameserver.cache.HtmCache;

trunk/java/com/l2jserver/commons/geodriver/Cell.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver;
+package com.l2jserver.commons.geodriver;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/GeoDriver.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver;
+package com.l2jserver.commons.geodriver;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
@@ -25,8 +25,8 @@ import java.nio.channels.FileChannel.MapMode;
 import java.nio.file.Path;
 import java.util.concurrent.atomic.AtomicReferenceArray;
 
-import commons.geodriver.regions.NullRegion;
+import com.l2jserver.commons.geodriver.regions.NullRegion;
-import commons.geodriver.regions.Region;
+import com.l2jserver.commons.geodriver.regions.Region;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/IBlock.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver;
+package com.l2jserver.commons.geodriver;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/IRegion.java

@@ -16,7 +16,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver;
+package com.l2jserver.commons.geodriver;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/blocks/ComplexBlock.java

@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver.blocks;
+package com.l2jserver.commons.geodriver.blocks;
 
 import java.nio.ByteBuffer;
 
-import commons.geodriver.IBlock;
+import com.l2jserver.commons.geodriver.IBlock;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/blocks/FlatBlock.java

@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver.blocks;
+package com.l2jserver.commons.geodriver.blocks;
 
 import java.nio.ByteBuffer;
 
-import commons.geodriver.IBlock;
+import com.l2jserver.commons.geodriver.IBlock;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/blocks/MultilayerBlock.java

@@ -16,11 +16,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver.blocks;
+package com.l2jserver.commons.geodriver.blocks;
 
 import java.nio.ByteBuffer;
 
-import commons.geodriver.IBlock;
+import com.l2jserver.commons.geodriver.IBlock;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/regions/NullRegion.java

@@ -16,9 +16,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver.regions;
+package com.l2jserver.commons.geodriver.regions;
 
-import commons.geodriver.IRegion;
+import com.l2jserver.commons.geodriver.IRegion;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/geodriver/regions/Region.java

@@ -16,15 +16,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package commons.geodriver.regions;
+package com.l2jserver.commons.geodriver.regions;
 
 import java.nio.ByteBuffer;
 
-import commons.geodriver.IBlock;
+import com.l2jserver.commons.geodriver.IBlock;
-import commons.geodriver.IRegion;
+import com.l2jserver.commons.geodriver.IRegion;
-import commons.geodriver.blocks.ComplexBlock;
+import com.l2jserver.commons.geodriver.blocks.ComplexBlock;
-import commons.geodriver.blocks.FlatBlock;
+import com.l2jserver.commons.geodriver.blocks.FlatBlock;
-import commons.geodriver.blocks.MultilayerBlock;
+import com.l2jserver.commons.geodriver.blocks.MultilayerBlock;
 
 /**
  * @author HorridoJoho

trunk/java/com/l2jserver/commons/javaengine/CompilationException.java

@@ -1,4 +1,4 @@
-package commons.javaengine;
+package com.l2jserver.commons.javaengine;
 
 public class CompilationException extends Exception
 {

trunk/java/com/l2jserver/commons/javaengine/JavaCompiler.java

@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package commons.javaengine;
+package com.l2jserver.commons.javaengine;
 
 import java.io.PrintWriter;
 import java.io.Writer;

trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngine.java

@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package commons.javaengine;
+package com.l2jserver.commons.javaengine;
 
 import java.io.IOException;
 import java.io.Reader;

trunk/java/com/l2jserver/commons/javaengine/JavaScriptEngineFactory.java

@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package commons.javaengine;
+package com.l2jserver.commons.javaengine;
 
 import java.util.ArrayList;
 import java.util.Collections;

trunk/java/com/l2jserver/commons/javaengine/MemoryClassLoader.java

@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package commons.javaengine;
+package com.l2jserver.commons.javaengine;
 
 import java.io.File;
 import java.net.MalformedURLException;

trunk/java/com/l2jserver/commons/javaengine/MemoryJavaFileManager.java

@@ -21,7 +21,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-package commons.javaengine;
+package com.l2jserver.commons.javaengine;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

trunk/java/com/l2jserver/commons/mmocore/AbstractPacket.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.nio.ByteBuffer;
 

trunk/java/com/l2jserver/commons/mmocore/IAcceptFilter.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.nio.channels.SocketChannel;
 

trunk/java/com/l2jserver/commons/mmocore/IClientFactory.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 /**
  * @author KenM

trunk/java/com/l2jserver/commons/mmocore/IMMOExecutor.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 /**
  * @author KenM

trunk/java/com/l2jserver/commons/mmocore/IPacketHandler.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.nio.ByteBuffer;
 

trunk/java/com/l2jserver/commons/mmocore/MMOClient.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.nio.ByteBuffer;
 

trunk/java/com/l2jserver/commons/mmocore/MMOConnection.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.io.IOException;
 import java.net.InetAddress;

trunk/java/com/l2jserver/commons/mmocore/NioNetStackList.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 /**
  * @author Forsaiken

trunk/java/com/l2jserver/commons/mmocore/NioNetStringBuffer.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.nio.BufferOverflowException;
 

trunk/java/com/l2jserver/commons/mmocore/ReceivablePacket.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.nio.ByteBuffer;
 

trunk/java/com/l2jserver/commons/mmocore/SelectorConfig.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 /**
  * @author KenM

trunk/java/com/l2jserver/commons/mmocore/SelectorThread.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 import java.io.IOException;
 import java.net.InetAddress;

trunk/java/com/l2jserver/commons/mmocore/SendablePacket.java

@@ -15,7 +15,7 @@
  *
  * http://www.gnu.org/copyleft/gpl.html
  */
-package commons.mmocore;
+package com.l2jserver.commons.mmocore;
 
 /**
  * @author KenM

trunk/java/com/l2jserver/gameserver/GameServer.java

@@ -30,12 +30,11 @@ import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import commons.mmocore.SelectorConfig;
-import commons.mmocore.SelectorThread;
-
 import com.l2jserver.Config;
 import com.l2jserver.Server;
 import com.l2jserver.commons.database.pool.impl.ConnectionFactory;
+import com.l2jserver.commons.mmocore.SelectorConfig;
+import com.l2jserver.commons.mmocore.SelectorThread;
 import com.l2jserver.gameserver.cache.HtmCache;
 import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
 import com.l2jserver.gameserver.data.sql.impl.CharNameTable;

trunk/java/com/l2jserver/gameserver/GeoData.java

@@ -23,10 +23,9 @@ import java.nio.file.Path;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import commons.geodriver.Cell;
-import commons.geodriver.GeoDriver;
-
 import com.l2jserver.Config;
+import com.l2jserver.commons.geodriver.Cell;
+import com.l2jserver.commons.geodriver.GeoDriver;
 import com.l2jserver.gameserver.data.xml.impl.DoorData;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;

trunk/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -34,12 +34,11 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import commons.mmocore.MMOClient;
-import commons.mmocore.MMOConnection;
-import commons.mmocore.ReceivablePacket;
-
 import com.l2jserver.Config;
 import com.l2jserver.commons.database.pool.impl.ConnectionFactory;
+import com.l2jserver.commons.mmocore.MMOClient;
+import com.l2jserver.commons.mmocore.MMOConnection;
+import com.l2jserver.commons.mmocore.ReceivablePacket;
 import com.l2jserver.gameserver.LoginServerThread;
 import com.l2jserver.gameserver.LoginServerThread.SessionKey;
 import com.l2jserver.gameserver.ThreadPoolManager;

trunk/java/com/l2jserver/gameserver/network/L2GamePacketHandler.java

@@ -21,13 +21,12 @@ package com.l2jserver.gameserver.network;
 import java.nio.ByteBuffer;
 import java.util.logging.Logger;
 
-import commons.mmocore.IClientFactory;
-import commons.mmocore.IMMOExecutor;
-import commons.mmocore.IPacketHandler;
-import commons.mmocore.MMOConnection;
-import commons.mmocore.ReceivablePacket;
-
 import com.l2jserver.Config;
+import com.l2jserver.commons.mmocore.IClientFactory;
+import com.l2jserver.commons.mmocore.IMMOExecutor;
+import com.l2jserver.commons.mmocore.IPacketHandler;
+import com.l2jserver.commons.mmocore.MMOConnection;
+import com.l2jserver.commons.mmocore.ReceivablePacket;
 import com.l2jserver.gameserver.network.L2GameClient.GameClientState;
 import com.l2jserver.gameserver.network.clientpackets.*;
 import com.l2jserver.gameserver.network.clientpackets.adenadistribution.RequestDivideAdena;

trunk/java/com/l2jserver/gameserver/network/clientpackets/L2GameClientPacket.java

@@ -22,9 +22,8 @@ import java.nio.BufferUnderflowException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import commons.mmocore.ReceivablePacket;
-
 import com.l2jserver.Config;
+import com.l2jserver.commons.mmocore.ReceivablePacket;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.SystemMessageId;

trunk/java/com/l2jserver/gameserver/network/serverpackets/L2GameServerPacket.java

@@ -21,8 +21,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import commons.mmocore.SendablePacket;
+import com.l2jserver.commons.mmocore.SendablePacket;
-
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.interfaces.IPositionable;
 import com.l2jserver.gameserver.model.interfaces.IUpdateTypeComponent;

trunk/java/com/l2jserver/gameserver/pathfinding/cellnodes/NodeLoc.java

@@ -18,8 +18,7 @@
  */
 package com.l2jserver.gameserver.pathfinding.cellnodes;
 
-import commons.geodriver.Cell;
+import com.l2jserver.commons.geodriver.Cell;
-
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.pathfinding.AbstractNodeLoc;
 

trunk/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java

@@ -41,9 +41,8 @@ import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import javax.script.SimpleScriptContext;
 
-import commons.javaengine.JavaScriptEngineFactory;
-
 import com.l2jserver.Config;
+import com.l2jserver.commons.javaengine.JavaScriptEngineFactory;
 
 /**
  * Caches script engines and provides functionality for executing and managing scripts.

trunk/java/com/l2jserver/gameserver/util/GeoUtils.java

@@ -20,8 +20,7 @@ package com.l2jserver.gameserver.util;
 
 import java.awt.Color;
 
-import commons.geodriver.Cell;
+import com.l2jserver.commons.geodriver.Cell;
-
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExServerPrimitive;

trunk/java/com/l2jserver/loginserver/L2LoginServer.java

@@ -31,12 +31,11 @@ import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
 
-import commons.mmocore.SelectorConfig;
-import commons.mmocore.SelectorThread;
-
 import com.l2jserver.Config;
 import com.l2jserver.Server;
 import com.l2jserver.commons.database.pool.impl.ConnectionFactory;
+import com.l2jserver.commons.mmocore.SelectorConfig;
+import com.l2jserver.commons.mmocore.SelectorThread;
 import com.l2jserver.loginserver.network.L2LoginClient;
 import com.l2jserver.loginserver.network.L2LoginPacketHandler;
 import com.l2jserver.status.Status;

trunk/java/com/l2jserver/loginserver/SelectorHelper.java

@@ -25,12 +25,11 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
-import commons.mmocore.IAcceptFilter;
+import com.l2jserver.commons.mmocore.IAcceptFilter;
-import commons.mmocore.IClientFactory;
+import com.l2jserver.commons.mmocore.IClientFactory;
-import commons.mmocore.IMMOExecutor;
+import com.l2jserver.commons.mmocore.IMMOExecutor;
-import commons.mmocore.MMOConnection;
+import com.l2jserver.commons.mmocore.MMOConnection;
-import commons.mmocore.ReceivablePacket;
+import com.l2jserver.commons.mmocore.ReceivablePacket;
-
 import com.l2jserver.loginserver.network.L2LoginClient;
 import com.l2jserver.loginserver.network.serverpackets.Init;
 import com.l2jserver.util.IPv4Filter;

trunk/java/com/l2jserver/loginserver/network/L2LoginClient.java

@@ -26,11 +26,10 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import commons.mmocore.MMOClient;
-import commons.mmocore.MMOConnection;
-import commons.mmocore.SendablePacket;
-
 import com.l2jserver.Config;
+import com.l2jserver.commons.mmocore.MMOClient;
+import com.l2jserver.commons.mmocore.MMOConnection;
+import com.l2jserver.commons.mmocore.SendablePacket;
 import com.l2jserver.loginserver.LoginController;
 import com.l2jserver.loginserver.SessionKey;
 import com.l2jserver.loginserver.network.serverpackets.L2LoginServerPacket;

trunk/java/com/l2jserver/loginserver/network/L2LoginPacketHandler.java

@@ -21,9 +21,8 @@ package com.l2jserver.loginserver.network;
 import java.nio.ByteBuffer;
 import java.util.logging.Logger;
 
-import commons.mmocore.IPacketHandler;
+import com.l2jserver.commons.mmocore.IPacketHandler;
-import commons.mmocore.ReceivablePacket;
+import com.l2jserver.commons.mmocore.ReceivablePacket;
-
 import com.l2jserver.loginserver.network.L2LoginClient.LoginClientState;
 import com.l2jserver.loginserver.network.clientpackets.AuthGameGuard;
 import com.l2jserver.loginserver.network.clientpackets.RequestAuthLogin;

trunk/java/com/l2jserver/loginserver/network/clientpackets/L2LoginClientPacket.java

@@ -21,8 +21,7 @@ package com.l2jserver.loginserver.network.clientpackets;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import commons.mmocore.ReceivablePacket;
+import com.l2jserver.commons.mmocore.ReceivablePacket;
-
 import com.l2jserver.loginserver.network.L2LoginClient;
 
 /**

trunk/java/com/l2jserver/loginserver/network/serverpackets/L2LoginServerPacket.java

@@ -18,8 +18,7 @@
  */
 package com.l2jserver.loginserver.network.serverpackets;
 
-import commons.mmocore.SendablePacket;
+import com.l2jserver.commons.mmocore.SendablePacket;
-
 import com.l2jserver.loginserver.network.L2LoginClient;
 
 /**

trunk/java/com/l2jserver/util/IPv4Filter.java

@@ -26,7 +26,7 @@ import java.util.Iterator;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
 
-import commons.mmocore.IAcceptFilter;
+import com.l2jserver.commons.mmocore.IAcceptFilter;
 
 /**
  * IPv4 filter.