summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BuildAll/nbproject/build-impl.xml28
-rw-r--r--BuildAll/nbproject/genfiles.properties6
-rw-r--r--BuildAll/nbproject/project.properties8
-rw-r--r--BuildAll/nbproject/project.xml16
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/User.java2
-rw-r--r--Register/src/com/essentials/register/payment/Method.java2
-rw-r--r--Register/src/com/essentials/register/payment/MethodBOSEconomy.java2
-rw-r--r--Register/src/com/essentials/register/payment/MethodEEco.java2
-rw-r--r--Register/src/com/essentials/register/payment/MethodiCo4.java2
-rw-r--r--Register/src/com/essentials/register/payment/MethodiCo5.java2
-rw-r--r--Register/src/com/essentials/register/payment/Methods.java2
12 files changed, 12 insertions, 62 deletions
diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml
index ee88b5f5d..2d4272990 100644
--- a/BuildAll/nbproject/build-impl.xml
+++ b/BuildAll/nbproject/build-impl.xml
@@ -650,20 +650,6 @@ 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.EssentialsiConomyBridge}" name="call.subproject"/>
- <param location="${project.EssentialsiConomyBridge}/build.xml" name="call.script"/>
- <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,20 +1135,6 @@ 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.EssentialsiConomyBridge}" name="call.subproject"/>
- <param location="${project.EssentialsiConomyBridge}/build.xml" name="call.script"/>
- <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 c22044da0..b2e08c5de 100644
--- a/BuildAll/nbproject/genfiles.properties
+++ b/BuildAll/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=80b9b3a4
+build.xml.data.CRC32=c4188209
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=80b9b3a4
-nbproject/build-impl.xml.script.CRC32=3170ac34
+nbproject/build-impl.xml.data.CRC32=c4188209
+nbproject/build-impl.xml.script.CRC32=73a4865f
nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties
index ddfc41bca..ca7ee69ad 100644
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@@ -35,9 +35,7 @@ javac.classpath=\
${reference.EssentialsGroupManager.jar}:\
${reference.EssentialsProtect.jar}:\
${reference.EssentialsSpawn.jar}:\
- ${reference.EssentialsGeoIP.jar}:\
- ${reference.EssentialsiConomyBridge.jar}:\
- ${reference.EssentialsiConomyBridge5.jar}
+ ${reference.EssentialsGeoIP.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
@@ -71,8 +69,6 @@ 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
@@ -80,8 +76,6 @@ 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=\
diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml
index ec38f6408..e00554632 100644
--- a/BuildAll/nbproject/project.xml
+++ b/BuildAll/nbproject/project.xml
@@ -71,22 +71,6 @@
<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/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 4af52b662..e9f0871ab 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -26,7 +26,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import com.earth2me.essentials.commands.IEssentialsCommand;
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
-import com.nijikokun.register.payment.Methods;
+import com.essentials.register.payment.Methods;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.bukkit.command.PluginCommand;
diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index c9ec16d2d..5613ffe49 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -1,7 +1,7 @@
package com.earth2me.essentials;
import com.earth2me.essentials.commands.IEssentialsCommand;
-import com.nijikokun.register.payment.Method;
+import com.essentials.register.payment.Method;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.logging.Logger;
diff --git a/Register/src/com/essentials/register/payment/Method.java b/Register/src/com/essentials/register/payment/Method.java
index 935a9bb00..cc0182877 100644
--- a/Register/src/com/essentials/register/payment/Method.java
+++ b/Register/src/com/essentials/register/payment/Method.java
@@ -1,4 +1,4 @@
-package com.nijikokun.register.payment;
+package com.essentials.register.payment;
public interface Method {
public Object getPlugin();
diff --git a/Register/src/com/essentials/register/payment/MethodBOSEconomy.java b/Register/src/com/essentials/register/payment/MethodBOSEconomy.java
index 7e0babe68..1e67156e6 100644
--- a/Register/src/com/essentials/register/payment/MethodBOSEconomy.java
+++ b/Register/src/com/essentials/register/payment/MethodBOSEconomy.java
@@ -1,4 +1,4 @@
-package com.nijikokun.register.payment;
+package com.essentials.register.payment;
import cosine.boseconomy.BOSEconomy;
diff --git a/Register/src/com/essentials/register/payment/MethodEEco.java b/Register/src/com/essentials/register/payment/MethodEEco.java
index e8e52a93d..47494e49c 100644
--- a/Register/src/com/essentials/register/payment/MethodEEco.java
+++ b/Register/src/com/essentials/register/payment/MethodEEco.java
@@ -1,4 +1,4 @@
-package com.nijikokun.register.payment;
+package com.essentials.register.payment;
import com.earth2me.essentials.Essentials;
import com.earth2me.essentials.api.Economy;
diff --git a/Register/src/com/essentials/register/payment/MethodiCo4.java b/Register/src/com/essentials/register/payment/MethodiCo4.java
index 47448deae..42c80c3bc 100644
--- a/Register/src/com/essentials/register/payment/MethodiCo4.java
+++ b/Register/src/com/essentials/register/payment/MethodiCo4.java
@@ -1,4 +1,4 @@
-package com.nijikokun.register.payment;
+package com.essentials.register.payment;
import com.nijiko.coelho.iConomy.iConomy;
import com.nijiko.coelho.iConomy.system.Account;
diff --git a/Register/src/com/essentials/register/payment/MethodiCo5.java b/Register/src/com/essentials/register/payment/MethodiCo5.java
index 1927d9fcf..c1634fcb5 100644
--- a/Register/src/com/essentials/register/payment/MethodiCo5.java
+++ b/Register/src/com/essentials/register/payment/MethodiCo5.java
@@ -1,4 +1,4 @@
-package com.nijikokun.register.payment;
+package com.essentials.register.payment;
import com.iConomy.iConomy;
import com.iConomy.system.Account;
diff --git a/Register/src/com/essentials/register/payment/Methods.java b/Register/src/com/essentials/register/payment/Methods.java
index 7cf340940..f7b3ef353 100644
--- a/Register/src/com/essentials/register/payment/Methods.java
+++ b/Register/src/com/essentials/register/payment/Methods.java
@@ -1,4 +1,4 @@
-package com.nijikokun.register.payment;
+package com.essentials.register.payment;
import com.iConomy.iConomy;
import cosine.boseconomy.BOSEconomy;