summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-06-07 21:55:31 +0200
committersnowleo <schneeleo@gmail.com>2011-06-07 21:55:31 +0200
commitb1446154bfd65e91ea8f77d9078a3360d1a990a8 (patch)
treea96384f82f4c948f1f395d4d8258341f4a46ca89
parent640f51564a60d330ec47d4a1d376a3d308d15776 (diff)
downloadEssentials-b1446154bfd65e91ea8f77d9078a3360d1a990a8.tar
Essentials-b1446154bfd65e91ea8f77d9078a3360d1a990a8.tar.gz
Essentials-b1446154bfd65e91ea8f77d9078a3360d1a990a8.tar.lz
Essentials-b1446154bfd65e91ea8f77d9078a3360d1a990a8.tar.xz
Essentials-b1446154bfd65e91ea8f77d9078a3360d1a990a8.zip
Fix dependency
Loading from lib won't work, so back to the old method.
-rw-r--r--BuildAll/nbproject/project.properties2
-rw-r--r--EssentialsProtect/build.xml10
-rw-r--r--EssentialsProtect/nbproject/project.properties2
-rw-r--r--EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java1
4 files changed, 11 insertions, 4 deletions
diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties
index 552d04116..fa00f6f0c 100644
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@@ -83,7 +83,7 @@ reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/Esse
reference.EssentialsPermissionsCommands.jar=${project.EssentialsPermissionsCommands}/dist/EssentialsPermissionsCommands.jar
reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
-reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/original-EssentialsXMPP.jar
+reference.EssentialsXMPP.jar=${project.EssentialsXMPP}/dist/EssentialsXMPP.jar
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
diff --git a/EssentialsProtect/build.xml b/EssentialsProtect/build.xml
index f2341984f..a09cc7333 100644
--- a/EssentialsProtect/build.xml
+++ b/EssentialsProtect/build.xml
@@ -72,5 +72,13 @@
nbproject/build-impl.xml file.
-->
-
+ <target name="-post-jar">
+ <jar jarfile="${dist.dir}/EssentialsProtect.jar">
+ <zipfileset src="${dist.jar}" excludes="META-INF/*" />
+ <zipfileset src="../lib/c3p0-0.9.1.2.jar" excludes="META-INF/*" />
+ <manifest>
+ <attribute name="Classpath" value="EssentialsProtect.jar"/>
+ </manifest>
+ </jar>
+ </target>
</project>
diff --git a/EssentialsProtect/nbproject/project.properties b/EssentialsProtect/nbproject/project.properties
index 7658c2076..e5b38df2f 100644
--- a/EssentialsProtect/nbproject/project.properties
+++ b/EssentialsProtect/nbproject/project.properties
@@ -22,7 +22,7 @@ debug.test.classpath=\
${run.test.classpath}
# This directory is removed when the project is cleaned:
dist.dir=dist
-dist.jar=${dist.dir}/EssentialsProtect.jar
+dist.jar=${dist.dir}/original-EssentialsProtect.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index c8a8bcfc2..afa98b568 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -36,7 +36,6 @@ public class EssentialsProtect extends JavaPlugin implements IConf, IProtect
public void onEnable()
{
ess = Essentials.getStatic();
- ess.getDependancyChecker().checkProtectDependancies();
final PluginManager pm = this.getServer().getPluginManager();
final EssentialsProtectPlayerListener playerListener = new EssentialsProtectPlayerListener(this);