TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-06 12:33:03 +00:00
Code Issues Projects Releases Wiki Activity

CB 731

Browse source 
Adding new craftbukkit because it fixes one of the bugs I reported.

Mysql and sqlite are included in craftbukkit, we don't need to add the libs to our jars.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1272 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-04-26 02:05:22 +00:00
parent 1c06e813b0
commit 983af7b476
4 changed files with 90 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Essentials.java
View file

@ -25,7 +25,7 @@ import org.yaml.snakeyaml.reader.UnicodeReader;
public class Essentials extends JavaPlugin public class Essentials extends JavaPlugin
{ {
public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo and ceulemans."; public static final String AUTHORS = "Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo and ceulemans.";
public static final int minBukkitBuildVersion = 711; public static final int minBukkitBuildVersion = 731;
private static final Logger logger = Logger.getLogger("Minecraft"); private static final Logger logger = Logger.getLogger("Minecraft");
private static final Yaml yaml = new Yaml(new SafeConstructor()); private static final Yaml yaml = new Yaml(new SafeConstructor());
private static Map<String, Object> users; private static Map<String, Object> users;

4
EssentialsProtect/build.xml
View file

@ -73,7 +73,7 @@
--> -->
<target name="-post-jar"> <!--target name="-post-jar">
<jar jarfile="${dist.dir}/EssentialsProtect.jar"> <jar jarfile="${dist.dir}/EssentialsProtect.jar">
<zipfileset src="${dist.jar}" excludes="META-INF/*" /> <zipfileset src="${dist.jar}" excludes="META-INF/*" />
<zipfileset src="../lib/mysql.jar" excludes="META-INF/*" /> <zipfileset src="../lib/mysql.jar" excludes="META-INF/*" />
@ -82,5 +82,5 @@
<attribute name="Classpath" value="Essentials.jar"/> <attribute name="Classpath" value="Essentials.jar"/>
</manifest> </manifest>
</jar> </jar>
</target> </target-->
</project> </project>

6
EssentialsProtect/nbproject/project.properties
View file

@ -22,22 +22,18 @@ debug.test.classpath=\
${run.test.classpath} ${run.test.classpath}
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
dist.dir=dist dist.dir=dist
dist.jar=${dist.dir}/original-EssentialsProtect.jar dist.jar=${dist.dir}/EssentialsProtect.jar
dist.javadoc.dir=${dist.dir}/javadoc dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath= endorsed.classpath=
excludes= excludes=
file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar file.reference.c3p0-0.9.1.2.jar=..\\lib\\c3p0-0.9.1.2.jar
file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar file.reference.craftbukkit-0.0.1-SNAPSHOT.jar=..\\lib\\craftbukkit-0.0.1-SNAPSHOT.jar
file.reference.mysql.jar=..\\lib\\mysql.jar
file.reference.sqlite.jar=..\\lib\\sqlite.jar
includes=** includes=**
jar.archive.disabled=${jnlp.enabled} jar.archive.disabled=${jnlp.enabled}
jar.compress=false jar.compress=false
jar.index=${jnlp.enabled} jar.index=${jnlp.enabled}
javac.classpath=\ javac.classpath=\
${reference.Essentials.jar}:\ ${reference.Essentials.jar}:\
${file.reference.mysql.jar}:\
${file.reference.sqlite.jar}:\
${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
${file.reference.c3p0-0.9.1.2.jar} ${file.reference.c3p0-0.9.1.2.jar}
# Space-separated list of extra javac options # Space-separated list of extra javac options

BIN
lib/craftbukkit-0.0.1-SNAPSHOT.jar
View file

Binary file not shown.