From f315bbe43cc490a6ee8f94c9321669bdfe5e8376 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 11 May 2011 22:30:34 +0000 Subject: [PATCH] Finally get rid of all dependency problems. git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1423 e251c2fe-e539-e718-e476-b85c1f46cddb --- BuildAll/build.xml | 148 ++++++------- BuildAll/nbproject/build-impl.xml | 14 ++ BuildAll/nbproject/genfiles.properties | 6 +- BuildAll/nbproject/project.properties | 195 +++++++++--------- BuildAll/nbproject/project.xml | 176 ++++++++-------- .../earth2me/essentials/IConfExternal.java | 8 - Essentials/src/plugin.yml | 1 + .../essentials/chat/EssentialsChat.java | 6 - EssentialsChat/src/plugin.yml | 3 +- .../essentials/geoip/EssentialsGeoIP.java | 8 - EssentialsGeoIP/src/plugin.yml | 3 +- EssentialsGroupBridge/src/plugin.yml | 3 +- .../essentials/protect/EssentialsProtect.java | 15 +- EssentialsProtect/src/plugin.yml | 3 +- .../essentials/spawn/EssentialsSpawn.java | 6 - EssentialsSpawn/src/plugin.yml | 1 + EssentialsiConomyBridge/src/plugin.yml | 3 +- .../nbproject/project.properties | 156 +++++++------- EssentialsiConomyBridge5/src/plugin.yml | 3 +- 19 files changed, 377 insertions(+), 381 deletions(-) delete mode 100644 Essentials/src/com/earth2me/essentials/IConfExternal.java 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 @@ - - - - - - - - - - - Builds, tests, and runs the project BuildAll. - - - + + + + + + + + + + + Builds, tests, and runs the project BuildAll. + + + 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: + + + + + + + @@ -1149,6 +1156,13 @@ is divided into following sections: + + + + + + + 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 @@ - - - org.netbeans.modules.java.j2seproject - - - BuildAll - - - - - - - - - ..\lib\nblibraries.properties - - - - Essentials - jar - - jar - clean - jar - - - EssentialsChat - jar - - jar - clean - jar - - - EssentialsGeoIP - jar - - jar - clean - jar - - - EssentialsGroupBridge - jar - - jar - clean - jar - - - EssentialsGroupManager - jar - - jar - clean - jar - - - EssentialsProtect - jar - - jar - clean - jar - - - EssentialsSpawn - jar - - jar - clean - jar - - - EssentialsiConomyBridge - jar - - jar - clean - jar - - - - + + + org.netbeans.modules.java.j2seproject + + + BuildAll + + + + + + + + + ..\lib\nblibraries.properties + + + + Essentials + jar + + jar + clean + jar + + + EssentialsChat + jar + + jar + clean + jar + + + EssentialsGeoIP + jar + + jar + clean + jar + + + EssentialsGroupBridge + jar + + jar + clean + jar + + + EssentialsGroupManager + jar + + jar + clean + jar + + + EssentialsProtect + jar + + jar + clean + jar + + + EssentialsSpawn + jar + + jar + clean + jar + + + EssentialsiConomyBridge + jar + + jar + clean + jar + + + EssentialsiConomyBridge5 + jar + + jar + clean + jar + + + + 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]