From a2619a6e2b2ab89834a9b6d4ba7ee07be0c78573 Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Sat, 29 Oct 2011 02:50:57 +0100
Subject: More teamcity fixes.

---
 EssentialsChat/nbproject/build-impl.xml       | 14 --------------
 EssentialsChat/nbproject/genfiles.properties  |  4 ++--
 EssentialsChat/nbproject/project.properties   |  5 +----
 EssentialsChat/nbproject/project.xml          |  8 --------
 EssentialsGeoIP/nbproject/build-impl.xml      | 14 --------------
 EssentialsGeoIP/nbproject/genfiles.properties |  6 +++---
 EssentialsGeoIP/nbproject/project.properties  |  5 +----
 EssentialsGeoIP/nbproject/project.xml         |  8 --------
 8 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/EssentialsChat/nbproject/build-impl.xml b/EssentialsChat/nbproject/build-impl.xml
index 6f55e790e..4dc2d2659 100644
--- a/EssentialsChat/nbproject/build-impl.xml
+++ b/EssentialsChat/nbproject/build-impl.xml
@@ -608,13 +608,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.EssentialsGroupManager}" name="call.subproject"/>
-            <param location="${project.EssentialsGroupManager}/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">
@@ -1059,13 +1052,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.EssentialsGroupManager}" name="call.subproject"/>
-            <param location="${project.EssentialsGroupManager}/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/EssentialsChat/nbproject/genfiles.properties b/EssentialsChat/nbproject/genfiles.properties
index 4925e0e01..95704bf4b 100644
--- a/EssentialsChat/nbproject/genfiles.properties
+++ b/EssentialsChat/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=71afd555
 build.xml.stylesheet.CRC32=28e38971@1.38.2.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=5177d978
-nbproject/build-impl.xml.script.CRC32=8fa72f48
+nbproject/build-impl.xml.data.CRC32=7c7f517b
+nbproject/build-impl.xml.script.CRC32=2447bdf5
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties
index e5f2dddbc..867228a92 100644
--- a/EssentialsChat/nbproject/project.properties
+++ b/EssentialsChat/nbproject/project.properties
@@ -66,8 +66,7 @@ includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
-    ${reference.EssentialsGroupManager.jar}
+    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -97,9 +96,7 @@ meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
-project.EssentialsGroupManager=../EssentialsGroupManager
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/EssentialsChat/nbproject/project.xml b/EssentialsChat/nbproject/project.xml
index c768e6eeb..993881f29 100644
--- a/EssentialsChat/nbproject/project.xml
+++ b/EssentialsChat/nbproject/project.xml
@@ -23,14 +23,6 @@
                 <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>
         </references>
     </configuration>
 </project>
diff --git a/EssentialsGeoIP/nbproject/build-impl.xml b/EssentialsGeoIP/nbproject/build-impl.xml
index 43f7d1cbb..41af95ec2 100644
--- a/EssentialsGeoIP/nbproject/build-impl.xml
+++ b/EssentialsGeoIP/nbproject/build-impl.xml
@@ -608,13 +608,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.EssentialsGroupManager}" name="call.subproject"/>
-            <param location="${project.EssentialsGroupManager}/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">
@@ -1059,13 +1052,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.EssentialsGroupManager}" name="call.subproject"/>
-            <param location="${project.EssentialsGroupManager}/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/EssentialsGeoIP/nbproject/genfiles.properties b/EssentialsGeoIP/nbproject/genfiles.properties
index 12c45d323..397a15928 100644
--- a/EssentialsGeoIP/nbproject/genfiles.properties
+++ b/EssentialsGeoIP/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=8721034b
+build.xml.data.CRC32=cbf94f59
 build.xml.script.CRC32=c4b1bb0e
 build.xml.stylesheet.CRC32=28e38971@1.44.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=8721034b
-nbproject/build-impl.xml.script.CRC32=6c6018d2
+nbproject/build-impl.xml.data.CRC32=cbf94f59
+nbproject/build-impl.xml.script.CRC32=e7684555
 nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index ec50ee1d2..80cd8778f 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -66,8 +66,7 @@ includes=**
 jar.compress=true
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\
-    ${reference.EssentialsGroupManager.jar}
+    ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -99,9 +98,7 @@ meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
 project.Essentials=../Essentials
-project.EssentialsGroupManager=../EssentialsGroupManager
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-reference.EssentialsGroupManager.jar=${project.EssentialsGroupManager}/dist/EssentialsGroupManager.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/EssentialsGeoIP/nbproject/project.xml b/EssentialsGeoIP/nbproject/project.xml
index ee84bc43b..2c6cc9d84 100644
--- a/EssentialsGeoIP/nbproject/project.xml
+++ b/EssentialsGeoIP/nbproject/project.xml
@@ -23,14 +23,6 @@
                 <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>
         </references>
     </configuration>
 </project>
-- 
cgit v1.2.3