Project refactor

Moving files to main folder.
Using Gradle to define, manage dependecies and build project.
Removed Ant.

.classpath

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="java" />
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
-	<classpathentry kind="lib" path="dist/libs/c3p0-0.9.5.1.jar" />
-	<classpathentry kind="lib" path="dist/libs/HikariCP-2.3.8.jar" />
-	<classpathentry kind="lib" path="dist/libs/jython.jar" />
-	<classpathentry kind="lib" path="dist/libs/jython-engine-2.2.1.jar" />
-	<classpathentry kind="lib" path="dist/libs/L2J_GeoDriver.jar" />
-	<classpathentry kind="lib" path="dist/libs/mail-1.5.2.jar" />
-	<classpathentry kind="lib" path="dist/libs/mmocore.jar" />
-	<classpathentry kind="lib" path="dist/libs/weupnp-0.1.3.jar" />
-	<classpathentry kind="lib" path="dist/libs/slf4j-api-1.7.12.jar" />
-	<classpathentry kind="lib" path="dist/libs/slf4j-jdk14-1.7.12.jar" />
-	<classpathentry kind="output" path="bin" />
-</classpath>

.gitignore

@@ -3,3 +3,5 @@
 /.gradle/
 .DS_Store
 *.log
+.project
+.classpath

.project

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>L2J_Server</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

.settings/.gitignore

@@ -0,0 +1 @@
+/gradle.prefs

build.gradle

@@ -1,25 +1,55 @@
 apply plugin: 'java'
 apply plugin: 'distribution'
+apply plugin: 'eclipse'
 
-defaultTasks('build')
+defaultTasks('clean', 'build')
 
-sourceCompatibility = '1.8'
+sourceCompatibility = JavaVersion.VERSION_1_8
 
 sourceSets {
-	main {
+	mainSource {
 		java {
-			srcDir('java')
+			srcDir('src/main/java')
+		}
+		resources {
+			srcDir('src/main/resources')
+		}
+	}
+	testSource {
+		java {
+			srcDir('src/test/java')
+		}
+		resources {
+			srcDir('src/test/resources')
 		}
 	}
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
-	compile(fileTree(dir: 'dist/libs', include: '*.jar'))
+	compile 'c3p0:c3p0:0.9.1.2'
+	compile 'com.sun.mail:javax.mail:1.5.4'
+	compile 'io.ratpack:ratpack-hikari:0.9.18'
+	compile 'mysql:mysql-connector-java:5.1.36'
+	compile 'org.bitlet:weupnp:0.1.3'
+	compile 'org.eclipse.jdt.core.compiler:ecj:4.4.2'
+	compile 'org.python:jython:2.2.1'
+	compile 'org.slf4j:slf4j-api:1.7.12'
+	compile 'org.slf4j:slf4j-jdk14:1.7.12'
+	compile files('dist/libs/java-engine-1.8.jar')
+	compile files('dist/libs/jython-engine-2.2.1.jar')
+	compile files('dist/libs/L2J_GeoDriver.jar')
+	compile files('dist/libs/mmocore.jar')
+	testCompile 'org.mockito:mockito-all:2.0.2-beta'
+	testCompile 'org.testng:testng:6.9.6'
 }
 
 def generalManifest = manifest {
 	attributes('Built-By': System.getProperty('user.name'),
-			'Built-Date': new Date(),
+			'Built-Date': new Date().format("yyyy-MM-dd HH:mm:ss"),
 			'Implementation-URL': 'http://www.l2jserver.com/',
 			'Class-Path': configurations.runtime.collect({ '../libs/' + it.getName() }).join(' '))
 }
@@ -32,8 +62,7 @@ jar {
 	exclude('**/gsregistering/**')
 	manifest {
 		from(generalManifest)
-		attributes 'Class-Path': configurations.compile.collect { it.getName() }.join(','),
-				'Main-Class': 'com.l2jserver.gameserver.GameServer'
+		attributes ('Main-Class': 'com.l2jserver.gameserver.GameServer')
 	}
 }
 
@@ -44,8 +73,7 @@ task loginJar(type: Jar, dependsOn: classes) {
 	exclude('**/gameserver/**')
 	manifest {
 		from(generalManifest)
-		attributes(//'Class-Path': '../libs/c3p0-0.9.5-pre10.jar ../libs/mail-1.5.2.jar ../libs/mmocore.jar ../libs/mysql-connector-java-5.1.31-bin.jar ../libs/weupnp-0.1.3.jar',
-				'Main-Class': 'com.l2jserver.loginserver.L2LoginServer')
+		attributes('Main-Class': 'com.l2jserver.loginserver.L2LoginServer')
 	}
 }
 
@@ -122,10 +150,31 @@ task zip(type: Zip, dependsOn: build) {
 		from(dbInstLsJar)
 		from(dbInstGsJar)
 	}
+	
+	def fileName = 'L2J_Server_' + new Date().format("yyyy-MM-dd")
+	baseName = fileName
+	println 'Build in build/distributions/' + fileName + '.zip'
 }
 
-build.finalizedBy(zip) 
+build.finalizedBy(zip)
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '2.2.1'
+	gradleVersion = '2.6-rc-1'
+}
+
+eclipse {
+	project {
+		comment 'L2J Server Project'
+		natures 'org.eclipse.buildship.core.gradleprojectbuilde'
+	}
+	jdt {
+		file {
+			whenMerged {jdt ->
+				def propertiesField = org.gradle.plugins.ide.internal.generator.PropertiesPersistableConfigurationObject.getDeclaredField('properties')
+				propertiesField.accessible = true
+				Properties properties = propertiesField.get(jdt)
+				properties.setProperty 'org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch', 'ignore'
+			}
+		}
+	}
 }

build.xml

@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="L2J_Server" default="build" basedir=".">
-	<description>
-		Copyright (C) 2004-2015 L2J Server
-		
-		This script will build the L2J Server.
-
-		This program is free software; you can redistribute it and/or modify
-		it under the terms of the GNU General Public License as published by
-		the Free Software Foundation; either version 3, or (at your option)
-		any later version.
-
-		This program is distributed in the hope that it will be useful,
-		but WITHOUT ANY WARRANTY; without even the implied warranty of
-		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-		GNU General Public License for more details.
-
-		You should have received a copy of the GNU General Public License
-		along with this program; if not, write to the Free Software
-		Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-		02111-1307, USA.
-
-		http://www.gnu.org/copyleft/gpl.html
-	</description>
-
-	<property name="build" location="build" />
-	<property name="build.bin" location="${build}/bin" />
-	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.doc" location="${build.dist}/doc" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
-	<property name="build.dist.tools" location="${build.dist}/tools" />
-	<property name="libs" location="dist/libs" />
-	<property name="src" location="java" />
-
-	<path id="classpath">
-		<fileset dir="${libs}">
-			<include name="*.jar" />
-		</fileset>
-	</path>
-
-	<pathconvert property="manifest.libs" pathsep=" ">
-		<path refid="classpath" />
-		<mapper>
-			<chainedmapper>
-				<flattenmapper />
-				<globmapper from="*.jar" to="../libs/*.jar" />
-			</chainedmapper>
-		</mapper>
-	</pathconvert>
-
-	<target name="checkRequirements" description="Check Requirements.">
-		<fail message="Ant 1.8.2 is required. But your version is ${ant.version} and if you are using Eclipse probably is outdated.">
-			<condition>
-				<not>
-					<antversion atleast="1.8.2" />
-				</not>
-			</condition>
-		</fail>
-		<available classname="java.util.stream.Stream" property="JDK8.present" />
-		<fail unless="JDK8.present" message="Java 1.8 is required. But your version is Java ${ant.java.version} and probably JDK is not installed." />
-	</target>
-
-	<target name="init" depends="checkRequirements" description="Create the output directories.">
-		<delete dir="${build.bin}" quiet="true" />
-		<mkdir dir="${build.bin}" />
-	</target>
-
-	<target name="dist" depends="init" description="Export the files to the output directory.">
-		<sync todir="${build.dist}" includeemptydirs="true">
-			<fileset dir="dist" />
-		</sync>
-	</target>
-
-	<target name="compile" depends="dist" description="Compile the source.">
-		<javac srcdir="${src}" classpathref="classpath" destdir="${build.bin}" compiler="modern" debug="true" debuglevel="lines,vars,source" includeantruntime="false" source="1.8" target="1.8" />
-	</target>
-
-	<target name="jar" depends="compile" description="Create the jar files.">
-		<tstamp>
-			<format property="time.stamp" pattern="yyyy-MM-dd HH:mm:ss" />
-		</tstamp>
-
-		<jar destfile="${build.dist.login}/l2jlogin.jar" level="9">
-			<fileset dir="${build.bin}">
-				<exclude name="**/dbinstaller/**" />
-				<exclude name="**/gameserver/**" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${time.stamp}" />
-				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
-				<attribute name="Main-Class" value="com.l2jserver.loginserver.L2LoginServer" />
-			</manifest>
-		</jar>
-		<jar destfile="${build.dist.login}/L2J_Configurator.jar" level="9">
-			<fileset dir="${build.bin}">
-				<include name="**/configurator/**" />
-				<include name="**/i18n/**" />
-				<include name="**/images/**" />
-				<exclude name="**/accountmanager/**" />
-				<exclude name="**/dbinstaller/**" />
-				<exclude name="**/gameserver/**" />
-				<exclude name="**/gsregistering/**" />
-				<exclude name="**/log/**" />
-				<exclude name="**/loginserver/**" />
-				<exclude name="**/status/**" />
-				<exclude name="**/util/**" />
-				<exclude name="**/Config/**" />
-				<exclude name="**/ConnectionFactory/**" />
-				<exclude name="**/Server/**" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${time.stamp}" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
-				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
-				<attribute name="Main-Class" value="com.l2jserver.tools.configurator.ConfigUserInterface" />
-			</manifest>
-		</jar>
-		<jar destfile="${build.dist.game}/l2jserver.jar" level="9">
-			<fileset dir="${build.bin}">
-				<exclude name="**/dbinstaller/**" />
-				<exclude name="**/loginserver/**" />
-				<exclude name="**/accountmanager/**" />
-				<exclude name="**/gsregistering/**" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${time.stamp}" />
-				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
-				<attribute name="Main-Class" value="com.l2jserver.gameserver.GameServer" />
-			</manifest>
-		</jar>
-		<jar destfile="${build.dist.game}/L2J_Configurator.jar" level="9">
-			<fileset dir="${build.bin}">
-				<include name="**/configurator/**" />
-				<include name="**/i18n/**" />
-				<include name="**/images/**" />
-				<exclude name="**/accountmanager/**" />
-				<exclude name="**/dbinstaller/**" />
-				<exclude name="**/gameserver/**" />
-				<exclude name="**/gsregistering/**" />
-				<exclude name="**/log/**" />
-				<exclude name="**/loginserver/**" />
-				<exclude name="**/status/**" />
-				<exclude name="**/util/**" />
-				<exclude name="**/Config/**" />
-				<exclude name="**/ConnectionFactory/**" />
-				<exclude name="**/Server/**" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${time.stamp}" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
-				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
-				<attribute name="Main-Class" value="com.l2jserver.tools.configurator.ConfigUserInterface" />
-			</manifest>
-		</jar>
-		<jar destfile="${build.dist.tools}/Database_Installer_GS.jar" level="9">
-			<fileset dir="${build.bin}">
-				<include name="**/dbinstaller/**" />
-				<include name="**/images/**" />
-				<include name="**/util/**" />
-				<include name="**/SQLFilter**" />
-				<exclude name="**/LauncherLS*" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${time.stamp}" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
-				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
-				<attribute name="Main-Class" value="com.l2jserver.tools.dbinstaller.LauncherGS" />
-			</manifest>
-		</jar>
-		<jar destfile="${build.dist.tools}/Database_Installer_LS.jar" level="9">
-			<fileset dir="${build.bin}">
-				<include name="**/dbinstaller/**" />
-				<include name="**/images/**" />
-				<include name="**/util/**" />
-				<include name="**/SQLFilter**" />
-				<exclude name="**/LauncherGS*" />
-			</fileset>
-			<manifest>
-				<attribute name="Built-By" value="${user.name}" />
-				<attribute name="Built-Date" value="${time.stamp}" />
-				<attribute name="Class-Path" value="${manifest.libs}" />
-				<attribute name="Implementation-URL" value="http://www.l2jserver.com/" />
-				<attribute name="Main-Class" value="com.l2jserver.tools.dbinstaller.LauncherLS" />
-			</manifest>
-		</jar>
-	</target>
-
-	<target name="build" depends="jar" description="Create the Zip file.">
-		<tstamp>
-			<format property="build.date" pattern="yyyy-MM-dd"/>
-		</tstamp>
-		<zip destfile="${build}/L2J_Server_${build.date}.zip" basedir="${build.dist}" level="9" />
-	</target>
-</project>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sat Feb 07 19:13:56 EET 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-rc-1-bin.zip

gradlew.bat

@@ -1,90 +1,90 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega