TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-05 12:02:53 +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>

178
EssentialsProtect/nbproject/project.properties
View file

@ -1,91 +1,87 @@
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=EssentialsProtect application.title=EssentialsProtect
application.vendor=devhome application.vendor=devhome
build.classes.dir=${build.dir}/classes build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned: # This directory is removed when the project is cleaned:
build.dir=build build.dir=build
build.generated.dir=${build.dir}/generated build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here: # Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport: # Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket #debug.transport=dt_socket
debug.classpath=\ debug.classpath=\
${run.classpath} ${run.classpath}
debug.test.classpath=\ 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 includes=**
file.reference.sqlite.jar=..\\lib\\sqlite.jar jar.archive.disabled=${jnlp.enabled}
includes=** jar.compress=false
jar.archive.disabled=${jnlp.enabled} jar.index=${jnlp.enabled}
jar.compress=false javac.classpath=\
jar.index=${jnlp.enabled} ${reference.Essentials.jar}:\
javac.classpath=\ ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
${reference.Essentials.jar}:\ ${file.reference.c3p0-0.9.1.2.jar}
${file.reference.mysql.jar}:\ # Space-separated list of extra javac options
${file.reference.sqlite.jar}:\ javac.compilerargs=
${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\ javac.deprecation=false
${file.reference.c3p0-0.9.1.2.jar} javac.processorpath=\
# Space-separated list of extra javac options ${javac.classpath}
javac.compilerargs= javac.source=1.5
javac.deprecation=false javac.target=1.5
javac.processorpath=\ javac.test.classpath=\
${javac.classpath} ${javac.classpath}:\
javac.source=1.5 ${build.classes.dir}:\
javac.target=1.5 ${libs.junit.classpath}:\
javac.test.classpath=\ ${libs.junit_4.classpath}
${javac.classpath}:\ javac.test.processorpath=\
${build.classes.dir}:\ ${javac.test.classpath}
${libs.junit.classpath}:\ javadoc.additionalparam=
${libs.junit_4.classpath} javadoc.author=false
javac.test.processorpath=\ javadoc.encoding=${source.encoding}
${javac.test.classpath} javadoc.noindex=false
javadoc.additionalparam= javadoc.nonavbar=false
javadoc.author=false javadoc.notree=false
javadoc.encoding=${source.encoding} javadoc.private=false
javadoc.noindex=false javadoc.splitindex=true
javadoc.nonavbar=false javadoc.use=true
javadoc.notree=false javadoc.version=false
javadoc.private=false javadoc.windowtitle=
javadoc.splitindex=true jnlp.codebase.type=no.codebase
javadoc.use=true jnlp.descriptor=application
javadoc.version=false jnlp.enabled=false
javadoc.windowtitle= jnlp.mixed.code=defaut
jnlp.codebase.type=no.codebase jnlp.offline-allowed=false
jnlp.descriptor=application jnlp.signed=false
jnlp.enabled=false manifest.file=manifest.mf
jnlp.mixed.code=defaut meta.inf.dir=${src.dir}/META-INF
jnlp.offline-allowed=false platform.active=default_platform
jnlp.signed=false project.Essentials=../Essentials
manifest.file=manifest.mf reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
meta.inf.dir=${src.dir}/META-INF run.classpath=\
platform.active=default_platform ${javac.classpath}:\
project.Essentials=../Essentials ${build.classes.dir}
reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar # Space-separated list of JVM arguments used when running the project
run.classpath=\ # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
${javac.classpath}:\ # or test-sys-prop.name=value to set system properties for unit tests):
${build.classes.dir} run.jvmargs=
# Space-separated list of JVM arguments used when running the project run.test.classpath=\
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value ${javac.test.classpath}:\
# or test-sys-prop.name=value to set system properties for unit tests): ${build.test.classes.dir}
run.jvmargs= source.encoding=UTF-8
run.test.classpath=\ src.dir=src
${javac.test.classpath}:\ test.src.dir=test
${build.test.classes.dir}
source.encoding=UTF-8
src.dir=src
test.src.dir=test

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

Binary file not shown.