Finally get rid of all dependency problems.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1423 e251c2fe-e539-e718-e476-b85c1f46cddb

19 files changed, 377 insertions, 381 deletions

diff --git a/BuildAll/build.xml b/BuildAll/build.xml
index 496f85c34..d41b561fd 100644
--- a/BuildAll/build.xml
+++ b/BuildAll/build.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- You may freely edit this file. See commented blocks below for -->

-<!-- some examples of how to customize the build. -->

-<!-- (If you delete it and reopen the project it will be recreated.) -->

-<!-- By default, only the Clean and Build commands use this build script. -->

-<!-- Commands such as Run, Debug, and Test only use this build script if -->

-<!-- the Compile on Save feature is turned off for the project. -->

-<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->

-<!-- in the project's Project Properties dialog box.-->

-<project name="BuildAll" default="default" basedir=".">

-    <description>Builds, tests, and runs the project BuildAll.</description>

-    <import file="nbproject/build-impl.xml"/>

-    <!--

-

-    There exist several targets which are by default empty and which can be 

-    used for execution of your tasks. These targets are usually executed 

-    before and after some main targets. They are: 

-

-      -pre-init:                 called before initialization of project properties

-      -post-init:                called after initialization of project properties

-      -pre-compile:              called before javac compilation

-      -post-compile:             called after javac compilation

-      -pre-compile-single:       called before javac compilation of single file

-      -post-compile-single:      called after javac compilation of single file

-      -pre-compile-test:         called before javac compilation of JUnit tests

-      -post-compile-test:        called after javac compilation of JUnit tests

-      -pre-compile-test-single:  called before javac compilation of single JUnit test

-      -post-compile-test-single: called after javac compilation of single JUunit test

-      -pre-jar:                  called before JAR building

-      -post-jar:                 called after JAR building

-      -post-clean:               called after cleaning build products

-

-    (Targets beginning with '-' are not intended to be called on their own.)

-

-    Example of inserting an obfuscator after compilation could look like this:

-

-        <target name="-post-compile">

-            <obfuscate>

-                <fileset dir="${build.classes.dir}"/>

-            </obfuscate>

-        </target>

-

-    For list of available properties check the imported 

-    nbproject/build-impl.xml file. 

-

-

-    Another way to customize the build is by overriding existing main targets.

-    The targets of interest are: 

-

-      -init-macrodef-javac:     defines macro for javac compilation

-      -init-macrodef-junit:     defines macro for junit execution

-      -init-macrodef-debug:     defines macro for class debugging

-      -init-macrodef-java:      defines macro for class execution

-      -do-jar-with-manifest:    JAR building (if you are using a manifest)

-      -do-jar-without-manifest: JAR building (if you are not using a manifest)

-      run:                      execution of project 

-      -javadoc-build:           Javadoc generation

-      test-report:              JUnit report generation

-

-    An example of overriding the target for project execution could look like this:

-

-        <target name="run" depends="BuildAll-impl.jar">

-            <exec dir="bin" executable="launcher.exe">

-                <arg file="${dist.jar}"/>

-            </exec>

-        </target>

-

-    Notice that the overridden target depends on the jar target and not only on 

-    the compile target as the regular run target does. Again, for a list of available 

-    properties which you can use, check the target you are overriding in the

-    nbproject/build-impl.xml file. 

-

-    -->

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="BuildAll" default="default" basedir=".">
+    <description>Builds, tests, and runs the project BuildAll.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar-with-manifest:    JAR building (if you are using a manifest)
+      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="BuildAll-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>
diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml
index bb58a3de4..ee88b5f5d 100644
--- a/BuildAll/nbproject/build-impl.xml
+++ b/BuildAll/nbproject/build-impl.xml
@@ -657,6 +657,13 @@ is divided into following sections:
             <param name="call.target" value="jar"/>
             <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
         </antcall>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.EssentialsiConomyBridge5}" name="call.subproject"/>
+            <param location="${project.EssentialsiConomyBridge5}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1149,6 +1156,13 @@ is divided into following sections:
             <param name="call.target" value="clean"/>
             <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
         </antcall>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.EssentialsiConomyBridge5}" name="call.subproject"/>
+            <param location="${project.EssentialsiConomyBridge5}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties
index 7ff7a7694..c22044da0 100644
--- a/BuildAll/nbproject/genfiles.properties
+++ b/BuildAll/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=ce72f3c5
+build.xml.data.CRC32=80b9b3a4
 build.xml.script.CRC32=7a797370
 build.xml.stylesheet.CRC32=28e38971@1.43.1.45
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=ce72f3c5
-nbproject/build-impl.xml.script.CRC32=79b2da51
+nbproject/build-impl.xml.data.CRC32=80b9b3a4
+nbproject/build-impl.xml.script.CRC32=3170ac34
 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties
index 9cd71952c..ddfc41bca 100644
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@@ -1,96 +1,99 @@
-annotation.processing.enabled=true

-annotation.processing.enabled.in.editor=false

-annotation.processing.run.all.processors=true

-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output

-application.title=BuildAll

-application.vendor=Paul

-build.classes.dir=${build.dir}/classes

-build.classes.excludes=**/*.java,**/*.form

-# This directory is removed when the project is cleaned:

-build.dir=build

-build.generated.dir=${build.dir}/generated

-build.generated.sources.dir=${build.dir}/generated-sources

-# Only compile against the classpath explicitly listed here:

-build.sysclasspath=ignore

-build.test.classes.dir=${build.dir}/test/classes

-build.test.results.dir=${build.dir}/test/results

-# Uncomment to specify the preferred debugger connection transport:

-#debug.transport=dt_socket

-debug.classpath=\

-    ${run.classpath}

-debug.test.classpath=\

-    ${run.test.classpath}

-# This directory is removed when the project is cleaned:

-dist.dir=dist

-dist.jar=${dist.dir}/BuildAll.jar

-dist.javadoc.dir=${dist.dir}/javadoc

-endorsed.classpath=

-excludes=

-includes=**

-jar.compress=false

-javac.classpath=\

-    ${reference.Essentials.jar}:\

-    ${reference.EssentialsChat.jar}:\

-    ${reference.EssentialsGroupBridge.jar}:\

-    ${reference.EssentialsGroupManager.jar}:\

-    ${reference.EssentialsProtect.jar}:\

-    ${reference.EssentialsSpawn.jar}:\

-    ${reference.EssentialsGeoIP.jar}:\

-    ${reference.EssentialsiConomyBridge.jar}

-# Space-separated list of extra javac options

-javac.compilerargs=

-javac.deprecation=false

-javac.processorpath=\

-    ${javac.classpath}

-javac.source=1.5

-javac.target=1.5

-javac.test.classpath=\

-    ${javac.classpath}:\

-    ${build.classes.dir}:\

-    ${libs.junit.classpath}:\

-    ${libs.junit_4.classpath}

-javac.test.processorpath=\

-    ${javac.test.classpath}

-javadoc.additionalparam=

-javadoc.author=false

-javadoc.encoding=${source.encoding}

-javadoc.noindex=false

-javadoc.nonavbar=false

-javadoc.notree=false

-javadoc.private=false

-javadoc.splitindex=true

-javadoc.use=true

-javadoc.version=false

-javadoc.windowtitle=

-meta.inf.dir=${src.dir}/META-INF

-mkdist.disabled=false

-platform.active=default_platform

-project.Essentials=../Essentials

-project.EssentialsChat=../EssentialsChat

-project.EssentialsGeoIP=../EssentialsGeoIP

-project.EssentialsGroupBridge=../EssentialsGroupBridge

-project.EssentialsGroupManager=../EssentialsGroupManager

-project.EssentialsiConomyBridge=../EssentialsiConomyBridge

-project.EssentialsProtect=../EssentialsProtect

-project.EssentialsSpawn=../EssentialsSpawn

-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

-reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar

-reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar

-reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar

-reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar

-reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar

-reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar

-reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar

-run.classpath=\

-    ${javac.classpath}:\

-    ${build.classes.dir}

-# Space-separated list of JVM arguments used when running the project

-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value

-# or test-sys-prop.name=value to set system properties for unit tests):

-run.jvmargs=

-run.test.classpath=\

-    ${javac.test.classpath}:\

-    ${build.test.classes.dir}

-source.encoding=UTF-8

-src.dir=src

-test.src.dir=test

+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=BuildAll
+application.vendor=Paul
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/BuildAll.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${reference.Essentials.jar}:\
+    ${reference.EssentialsChat.jar}:\
+    ${reference.EssentialsGroupBridge.jar}:\
+    ${reference.EssentialsGroupManager.jar}:\
+    ${reference.EssentialsProtect.jar}:\
+    ${reference.EssentialsSpawn.jar}:\
+    ${reference.EssentialsGeoIP.jar}:\
+    ${reference.EssentialsiConomyBridge.jar}:\
+    ${reference.EssentialsiConomyBridge5.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.5
+javac.target=1.5
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+project.Essentials=../Essentials
+project.EssentialsChat=../EssentialsChat
+project.EssentialsGeoIP=../EssentialsGeoIP
+project.EssentialsGroupBridge=../EssentialsGroupBridge
+project.EssentialsGroupManager=../EssentialsGroupManager
+project.EssentialsiConomyBridge=../EssentialsiConomyBridge
+project.EssentialsiConomyBridge5=../EssentialsiConomyBridge5
+project.EssentialsProtect=../EssentialsProtect
+project.EssentialsSpawn=../EssentialsSpawn
+reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
+reference.EssentialsChat.jar=${project.EssentialsChat}/dist/EssentialsChat.jar
+reference.EssentialsGeoIP.jar=${project.EssentialsGeoIP}/dist/EssentialsGeoIP.jar
+reference.EssentialsGroupBridge.jar=${project.EssentialsGroupBridge}/dist/EssentialsGroupBridge.jar
+reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
+reference.EssentialsiConomyBridge.jar=${project.EssentialsiConomyBridge}/dist/EssentialsiConomyBridge.jar
+reference.EssentialsiConomyBridge5.jar=${project.EssentialsiConomyBridge5}/dist/EssentialsiConomyBridge5.jar
+reference.EssentialsProtect.jar=${project.EssentialsProtect}/dist/EssentialsProtect.jar
+reference.EssentialsSpawn.jar=${project.EssentialsSpawn}/dist/EssentialsSpawn.jar
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml
index 1d2c75eef..ec38f6408 100644
--- a/BuildAll/nbproject/project.xml
+++ b/BuildAll/nbproject/project.xml
@@ -1,84 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<project xmlns="http://www.netbeans.org/ns/project/1">

-    <type>org.netbeans.modules.java.j2seproject</type>

-    <configuration>

-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">

-            <name>BuildAll</name>

-            <source-roots>

-                <root id="src.dir"/>

-            </source-roots>

-            <test-roots>

-                <root id="test.src.dir"/>

-            </test-roots>

-        </data>

-        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">

-            <definitions>..\lib\nblibraries.properties</definitions>

-        </libraries>

-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">

-            <reference>

-                <foreign-project>Essentials</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsChat</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsGeoIP</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsGroupBridge</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsGroupManager</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsProtect</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsSpawn</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-            <reference>

-                <foreign-project>EssentialsiConomyBridge</foreign-project>

-                <artifact-type>jar</artifact-type>

-                <script>build.xml</script>

-                <target>jar</target>

-                <clean-target>clean</clean-target>

-                <id>jar</id>

-            </reference>

-        </references>

-    </configuration>

-</project>

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>BuildAll</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+            <definitions>..\lib\nblibraries.properties</definitions>
+        </libraries>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>Essentials</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsChat</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsGeoIP</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsGroupBridge</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsGroupManager</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsProtect</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsSpawn</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsiConomyBridge</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+            <reference>
+                <foreign-project>EssentialsiConomyBridge5</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
+</project>
diff --git a/Essentials/src/com/earth2me/essentials/IConfExternal.java b/Essentials/src/com/earth2me/essentials/IConfExternal.java
deleted file mode 100644
index e8e5dfbd2..000000000
--- a/Essentials/src/com/earth2me/essentials/IConfExternal.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.earth2me.essentials;
-
-
-public abstract class IConfExternal implements IConf
-{
-
-	public abstract void reloadConfig();	
-}
diff --git a/Essentials/src/plugin.yml b/Essentials/src/plugin.yml
index 468540769..dae336151 100644
--- a/Essentials/src/plugin.yml
+++ b/Essentials/src/plugin.yml
@@ -6,6 +6,7 @@ version: TeamCity
 website: http://www.earth2me.net:8001/

 description: Provides an essential, core set of commands for Bukkit.

 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]

+softdepend: [Permissions]

 commands:

   afk:

     description: Marks you as away-from-keyboard.

diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
index 2e89e9ee3..0271fff6f 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
@@ -22,12 +22,6 @@ public class EssentialsChat extends JavaPlugin
 
 	public void onEnable()
 	{
-		Plugin p = this.getServer().getPluginManager().getPlugin("Essentials");
-            if (p != null) {
-                if (!this.getServer().getPluginManager().isPluginEnabled(p)) {
-                    this.getServer().getPluginManager().enablePlugin(p);
-                }
-		}
 		PluginManager pm = getServer().getPluginManager();
 		EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer());
 		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml
index d0cc4616d..0be4e1c75 100644
--- a/EssentialsChat/src/plugin.yml
+++ b/EssentialsChat/src/plugin.yml
@@ -5,4 +5,5 @@ main: com.earth2me.essentials.chat.EssentialsChat
 version: TeamCity

 website: http://www.earth2me.net:8001/

 description: Provides chat control features for Essentials.  Requires Permissions.

-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
\ No newline at end of file
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]

+depend: [Essentials]
\ No newline at end of file
diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
index 612fa7030..3051e4151 100644
--- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
+++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java
@@ -28,14 +28,6 @@ public class EssentialsGeoIP extends JavaPlugin
 	public void onEnable()
 	{
 		PluginManager pm = getServer().getPluginManager();
-		Plugin ess = pm.getPlugin("Essentials");
-		if (ess != null)
-		{
-			if (!pm.isPluginEnabled(ess))
-			{
-				pm.enablePlugin(ess);
-			}
-		}
 		EssentialsGeoIPPlayerListener playerListener = new EssentialsGeoIPPlayerListener(getDataFolder());
 		pm.registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Monitor, this);
 
diff --git a/EssentialsGeoIP/src/plugin.yml b/EssentialsGeoIP/src/plugin.yml
index 3ca12eb93..92fdc9963 100644
--- a/EssentialsGeoIP/src/plugin.yml
+++ b/EssentialsGeoIP/src/plugin.yml
@@ -5,4 +5,5 @@ main: com.earth2me.essentials.geoip.EssentialsGeoIP
 version: TeamCity
 website: http://www.earth2me.net:8001/
 description: Shows the country or city of a user on login and /whois.
-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
\ No newline at end of file
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
+depend: [Essentials]
\ No newline at end of file
diff --git a/EssentialsGroupBridge/src/plugin.yml b/EssentialsGroupBridge/src/plugin.yml
index af93ee4a0..513beb372 100644
--- a/EssentialsGroupBridge/src/plugin.yml
+++ b/EssentialsGroupBridge/src/plugin.yml
@@ -1,3 +1,4 @@
 name: Permissions
-version: 2.5.1
+version: 2.7.2
 main: com.nijikokun.bukkit.Permissions.Permissions
+depend: [GroupManager]
\ No newline at end of file
diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
index e026ffd4f..ceb668d83 100644
--- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
+++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
@@ -1,7 +1,7 @@
 package com.earth2me.essentials.protect;
 
 import com.earth2me.essentials.Essentials;
-import com.earth2me.essentials.IConfExternal;
+import com.earth2me.essentials.IConf;
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.Util;
 import java.util.ArrayList;
@@ -16,7 +16,7 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 
 
-public class EssentialsProtect extends JavaPlugin
+public class EssentialsProtect extends JavaPlugin implements IConf
 {
 	private EssentialsProtectBlockListener blockListener = null;
 	private EssentialsProtectPlayerListener playerListener = null;
@@ -43,9 +43,6 @@ public class EssentialsProtect extends JavaPlugin
 	public void onEnable()
 	{
 		PluginManager pm = this.getServer().getPluginManager();
-		Essentials ess = (Essentials)pm.getPlugin("Essentials");
-		if (!ess.isEnabled())
-			pm.enablePlugin(ess);
 
 		playerListener = new EssentialsProtectPlayerListener(this);
 		blockListener = new EssentialsProtectBlockListener(this);
@@ -77,13 +74,7 @@ public class EssentialsProtect extends JavaPlugin
 		pm.registerEvent(Type.PLUGIN_ENABLE, serverListener, Priority.Highest, this);
 	
 		reloadConfig();
-		Essentials.getStatic().addReloadListener(new IConfExternal() {
-
-			public void reloadConfig()
-			{
-				EssentialsProtect.this.reloadConfig();
-			}
-		});
+		Essentials.getStatic().addReloadListener(this);
 		if (!this.getDescription().getVersion().equals(Essentials.getStatic().getDescription().getVersion())) {
 			logger.log(Level.WARNING, Util.i18n("versionMismatchAll"));
 		}
diff --git a/EssentialsProtect/src/plugin.yml b/EssentialsProtect/src/plugin.yml
index c8b77dbd9..e5212599d 100644
--- a/EssentialsProtect/src/plugin.yml
+++ b/EssentialsProtect/src/plugin.yml
@@ -5,4 +5,5 @@ main: com.earth2me.essentials.protect.EssentialsProtect
 version: TeamCity

 website: http://www.earth2me.net:8001/

 description: Provides protection for various parts of the world.

-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]
\ No newline at end of file
+authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]

+depend: [Essentials]
\ No newline at end of file
diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
index 1f6fea4af..d6b638d03 100644
--- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
+++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawn.java
@@ -22,12 +22,6 @@ public class EssentialsSpawn extends JavaPlugin
 
 	public void onEnable()
 	{
-		Plugin p = this.getServer().getPluginManager().getPlugin("Essentials");
-		if (p != null) {
-			if (!this.getServer().getPluginManager().isPluginEnabled(p)) {
-				this.getServer().getPluginManager().enablePlugin(p);
-			}
-		}
 		EssentialsSpawnPlayerListener playerListener = new EssentialsSpawnPlayerListener();
 		getServer().getPluginManager().registerEvent(Type.PLAYER_RESPAWN, playerListener, Priority.Low, this);
 		getServer().getPluginManager().registerEvent(Type.PLAYER_JOIN, playerListener, Priority.Low, this);
diff --git a/EssentialsSpawn/src/plugin.yml b/EssentialsSpawn/src/plugin.yml
index 35f8172dd..a9e2895d0 100644
--- a/EssentialsSpawn/src/plugin.yml
+++ b/EssentialsSpawn/src/plugin.yml
@@ -6,6 +6,7 @@ version: TeamCity
 website: http://www.earth2me.net:8001/

 description: Provides spawn control commands, utilizing Essentials.

 authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]

+depend: [Essentials]

 commands:

   setspawn:

     description: Set the spawnpoint to your current position.

diff --git a/EssentialsiConomyBridge/src/plugin.yml b/EssentialsiConomyBridge/src/plugin.yml
index 9e088681b..5e7192bad 100644
--- a/EssentialsiConomyBridge/src/plugin.yml
+++ b/EssentialsiConomyBridge/src/plugin.yml
@@ -3,4 +3,5 @@ version: 4.65
 main: com.nijiko.coelho.iConomy.iConomy

 website: http://www.earth2me.net:8001/

 description: "Essentials iConomy Bridge version: TeamCity"

-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]

+authors: [Xeology]

+depend: [Essentials]
\ No newline at end of file
diff --git a/EssentialsiConomyBridge5/nbproject/project.properties b/EssentialsiConomyBridge5/nbproject/project.properties
index 48b1aa8e1..e44641af1 100644
--- a/EssentialsiConomyBridge5/nbproject/project.properties
+++ b/EssentialsiConomyBridge5/nbproject/project.properties
@@ -1,78 +1,78 @@
-annotation.processing.enabled=true

-annotation.processing.enabled.in.editor=false

-annotation.processing.run.all.processors=true

-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output

-application.title=EssentialsiConomyBridge5

-application.vendor=schlex

-build.classes.dir=${build.dir}/classes

-build.classes.excludes=**/*.java,**/*.form

-# This directory is removed when the project is cleaned:

-build.dir=build

-build.generated.dir=${build.dir}/generated

-build.generated.sources.dir=${build.dir}/generated-sources

-# Only compile against the classpath explicitly listed here:

-build.sysclasspath=ignore

-build.test.classes.dir=${build.dir}/test/classes

-build.test.results.dir=${build.dir}/test/results

-# Uncomment to specify the preferred debugger connection transport:

-#debug.transport=dt_socket

-debug.classpath=\

-    ${run.classpath}

-debug.test.classpath=\

-    ${run.test.classpath}

-# This directory is removed when the project is cleaned:

-dist.dir=dist

-dist.jar=${dist.dir}/EssentialsiConomyBridge5.jar

-dist.javadoc.dir=${dist.dir}/javadoc

-endorsed.classpath=

-excludes=

-file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar

-file.reference.Essentials.jar=..\\Essentials\\dist\\Essentials.jar

-file.reference.Essentials.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar

-includes=**

-jar.compress=false

-javac.classpath=\

-    ${reference.Essentials.jar}:\

-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}

-javac.compilerargs=

-javac.deprecation=false

-javac.processorpath=\

-    ${javac.classpath}

-javac.source=1.6

-javac.target=1.6

-javac.test.classpath=\

-    ${javac.classpath}:\

-    ${build.classes.dir}

-javac.test.processorpath=\

-    ${javac.test.classpath}

-javadoc.additionalparam=

-javadoc.author=false

-javadoc.encoding=${source.encoding}

-javadoc.noindex=false

-javadoc.nonavbar=false

-javadoc.notree=false

-javadoc.private=false

-javadoc.splitindex=true

-javadoc.use=true

-javadoc.version=false

-javadoc.windowtitle=

-main.class=

-manifest.file=manifest.mf

-meta.inf.dir=${src.dir}/META-INF

-mkdist.disabled=false

-platform.active=default_platform

-project.Essentials=../Essentials

-reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar

-run.classpath=\

-    ${javac.classpath}:\

-    ${build.classes.dir}

-# Space-separated list of JVM arguments used when running the project

-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value

-# or test-sys-prop.name=value to set system properties for unit tests):

-run.jvmargs=

-run.test.classpath=\

-    ${javac.test.classpath}:\

-    ${build.test.classes.dir}

-source.encoding=UTF-8

-src.dir=src

-test.src.dir=test

+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=EssentialsiConomyBridge5
+application.vendor=schlex
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/EssentialsiConomyBridge5.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+file.reference.Essentials.jar=..\\Essentials\\dist\\Essentials.jar
+file.reference.Essentials.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${reference.Essentials.jar}:\
+    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.6
+javac.target=1.6
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=default_platform
+project.Essentials=../Essentials
+reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project
+# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
+# or test-sys-prop.name=value to set system properties for unit tests):
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test
diff --git a/EssentialsiConomyBridge5/src/plugin.yml b/EssentialsiConomyBridge5/src/plugin.yml
index 7ee898468..7da8336ad 100644
--- a/EssentialsiConomyBridge5/src/plugin.yml
+++ b/EssentialsiConomyBridge5/src/plugin.yml
@@ -3,4 +3,5 @@ version: 5.0
 main: com.iConomy.iConomy

 website: http://www.earth2me.net:8001/

 description: "Essentials iConomy Bridge version: TeamCity"

-authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology]

+authors: [Xeology]

+depend: [Essentials]