2
0
Эх сурвалжийг харах

Lib update: c3p0-0.9.1.1. Thanks Melerix

Sami 18 жил өмнө
parent
commit
c5aea71cb9

+ 1 - 1
L2_GameServer_It/.classpath

@@ -10,7 +10,7 @@
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/bsh-2.0b4.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/c3p0-0.9.1.jar"/>
+	<classpathentry kind="lib" path="lib/c3p0-0.9.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/mmocore.jar"/>
 	<classpathentry kind="lib" path="lib/mysql-connector-java-5.0.5-bin.jar"/>
 	<classpathentry kind="output" path="bin"/>

+ 3 - 3
L2_GameServer_It/build.xml

@@ -32,7 +32,7 @@
     
     <path id="classpath">
         <fileset dir="${lib}">
-            <include name="c3p0-0.9.1.jar"/>
+            <include name="c3p0-0.9.1.1.jar"/>
             <include name="bsf.jar"/>
             <include name="bsh-2.0b4.jar"/>
         	<include name="commons-logging-1.1.jar"/>
@@ -79,7 +79,7 @@
             <fileset dir="${build.classes}"/>
             <manifest>
                 <attribute name="Main-Class" value="net.sf.l2j.Server"/>
-                <attribute name="Class-Path" value=". bsf.jar bsh-2.0b4.jar commons-logging-1.1.jar c3p0-0.9.1.jar jython.jar mysql-connector-java-5.0.5-bin.jar javolution.jar mmocore.jar"/>
+                <attribute name="Class-Path" value=". bsf.jar bsh-2.0b4.jar commons-logging-1.1.jar c3p0-0.9.1.1.jar jython.jar mysql-connector-java-5.0.5-bin.jar javolution.jar mmocore.jar"/>
             </manifest>
         </jar>
         
@@ -126,7 +126,7 @@
     	
     	<copy todir="${build.dist.login}">
 			<fileset dir="${src}/../lib">
-				<include name="c3p0-0.9.1.jar"/>
+				<include name="c3p0-0.9.1.1.jar"/>
 				<include name="mysql-connector-java-5.0.5-bin.jar"/>
 				<include name="javolution.jar"/>
 				<include name="mmocore.jar"/>

+ 1 - 1
L2_GameServer_It/dist/GameServer_loop.sh

@@ -7,7 +7,7 @@
 while :; do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	java -Xms512m -Xmx512m -cp bsf.jar:bsh-2.0b4.jar:commons-logging-1.1.jar:javolution.jar:mmocore.jar:jython.jar:c3p0-0.9.1.jar:mysql-connector-java-5.0.5-bin.jar:l2jserver.jar net.sf.l2j.gameserver.GameServer > log/stdout.log 2>&1
+	java -Xms512m -Xmx512m -cp bsf.jar:bsh-2.0b4.jar:commons-logging-1.1.jar:javolution.jar:mmocore.jar:jython.jar:c3p0-0.9.1.1.jar:mysql-connector-java-5.0.5-bin.jar:l2jserver.jar net.sf.l2j.gameserver.GameServer > log/stdout.log 2>&1
 	[ $? -ne 2 ] && break
 #	/etc/init.d/mysql restart
 	sleep 10

+ 1 - 1
L2_GameServer_It/dist/LoginServer_loop.sh

@@ -5,7 +5,7 @@ until [ $err == 0 ];
 do
 	[ -f log/java0.log.0 ] && mv log/java0.log.0 "log/`date +%Y-%m-%d_%H-%M-%S`_java.log"
 	[ -f log/stdout.log ] && mv log/stdout.log "log/`date +%Y-%m-%d_%H-%M-%S`_stdout.log"
-	nice -n -2 java -Xms512m -Xmx512m -cp javolution.jar:mmocore.jar:c3p0-0.9.1.jar:mysql-connector-java-5.0.5-bin.jar:l2jserver.jar net.sf.l2j.loginserver.L2LoginServer > log/stdout.log 2>&1
+	nice -n -2 java -Xms512m -Xmx512m -cp javolution.jar:mmocore.jar:c3p0-0.9.1.1.jar:mysql-connector-java-5.0.5-bin.jar:l2jserver.jar net.sf.l2j.loginserver.L2LoginServer > log/stdout.log 2>&1
 	err=$?
 #	/etc/init.d/mysql restart
 	sleep 10;

+ 1 - 1
L2_GameServer_It/dist/RegisterGameServer.bat

@@ -1,2 +1,2 @@
-@java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.jar;l2jserver.jar;mysql-connector-java-5.0.5-bin.jar net.sf.l2j.gsregistering.GameServerRegister
+@java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.1.jar;l2jserver.jar;mysql-connector-java-5.0.5-bin.jar net.sf.l2j.gsregistering.GameServerRegister
 @pause

+ 1 - 1
L2_GameServer_It/dist/RegisterGameServer.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.jar:l2jserver.jar:mysql-connector-java-5.0.5-bin.jar net.sf.l2j.gsregistering.GameServerRegister
+java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.1.jar:l2jserver.jar:mysql-connector-java-5.0.5-bin.jar net.sf.l2j.gsregistering.GameServerRegister

+ 1 - 1
L2_GameServer_It/dist/startGameServer.bat

@@ -4,7 +4,7 @@ echo Starting L2J Game Server.
 echo.
 REM -------------------------------------
 REM Default parameters for a basic server.
-java -Xmx512m -cp bsf.jar;bsh-2.0b4.jar;commons-logging-1.1.jar;mmocore.jar;javolution.jar;c3p0-0.9.1.jar;mysql-connector-java-5.0.5-bin.jar;l2jserver.jar;jython.jar net.sf.l2j.gameserver.GameServer
+java -Xmx512m -cp bsf.jar;bsh-2.0b4.jar;commons-logging-1.1.jar;mmocore.jar;javolution.jar;c3p0-0.9.1.1.jar;mysql-connector-java-5.0.5-bin.jar;l2jserver.jar;jython.jar net.sf.l2j.gameserver.GameServer
 REM
 REM If you have a big server and lots of memory, you could experiment for example with
 REM java -server -Xmx1536m -Xms1024m -Xmn512m -XX:PermSize=256m -XX:SurvivorRatio=8 -Xnoclassgc -XX:+AggressiveOpts

+ 1 - 1
L2_GameServer_It/dist/startLoginServer.bat

@@ -2,7 +2,7 @@
 :start
 echo Starting L2J Login Server.
 echo.
-java -Xmx128m -cp javolution.jar;mmocore.jar;c3p0-0.9.1.jar;mysql-connector-java-5.0.5-bin.jar;l2jserver.jar net.sf.l2j.loginserver.L2LoginServer
+java -Xmx128m -cp javolution.jar;mmocore.jar;c3p0-0.9.1.1.jar;mysql-connector-java-5.0.5-bin.jar;l2jserver.jar net.sf.l2j.loginserver.L2LoginServer
 if ERRORLEVEL 2 goto restart
 if ERRORLEVEL 1 goto error
 goto end

+ 1 - 1
L2_GameServer_It/dist/startSQLAccountManager.bat

@@ -1,2 +1,2 @@
-@java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.jar;l2jserver.jar;mysql-connector-java-5.0.5-bin.jar net.sf.l2j.accountmanager.SQLAccountManager
+@java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.1.jar;l2jserver.jar;mysql-connector-java-5.0.5-bin.jar net.sf.l2j.accountmanager.SQLAccountManager
 @pause

+ 1 - 1
L2_GameServer_It/dist/startSQLAccountManager.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.jar:l2jserver.jar:mysql-connector-java-5.0.5-bin.jar net.sf.l2j.accountmanager.SQLAccountManager
+java -Djava.util.logging.config.file=console.cfg -cp c3p0-0.9.1.1.jar:l2jserver.jar:mysql-connector-java-5.0.5-bin.jar net.sf.l2j.accountmanager.SQLAccountManager

BIN
L2_GameServer_It/lib/c3p0-0.9.1.jar → L2_GameServer_It/lib/c3p0-0.9.1.1.jar