Move Register stuff inside Essentials

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

4 files changed, 4 insertions, 29 deletions

diff --git a/EssentialsGeoIP/nbproject/build-impl.xml b/EssentialsGeoIP/nbproject/build-impl.xml
index a381fd143..b32699fc0 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.Register}" name="call.subproject"/>
-            <param location="${project.Register}/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">
@@ -1058,13 +1051,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.Register}" name="call.subproject"/>
-            <param location="${project.Register}/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 eecf3b548..3bb0e69c6 100644
--- a/EssentialsGeoIP/nbproject/genfiles.properties
+++ b/EssentialsGeoIP/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=51dc0823
+build.xml.data.CRC32=cbf94f59
 build.xml.script.CRC32=c4b1bb0e
 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=51dc0823
-nbproject/build-impl.xml.script.CRC32=ebe82412
+nbproject/build-impl.xml.data.CRC32=cbf94f59
+nbproject/build-impl.xml.script.CRC32=a87d6c0a
 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45
diff --git a/EssentialsGeoIP/nbproject/project.properties b/EssentialsGeoIP/nbproject/project.properties
index 5a3bd1294..ed96af206 100644
--- a/EssentialsGeoIP/nbproject/project.properties
+++ b/EssentialsGeoIP/nbproject/project.properties
@@ -30,8 +30,7 @@ includes=**
 jar.compress=false
 javac.classpath=\
     ${reference.Essentials.jar}:\
-    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}:\
-    ${reference.Register.jar}
+    ${file.reference.craftbukkit-0.0.1-SNAPSHOT.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -63,9 +62,7 @@ meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 platform.active=default_platform
 project.Essentials=../Essentials
-project.Register=../Register
 reference.Essentials.jar=${project.Essentials}/dist/Essentials.jar
-reference.Register.jar=${project.Register}/dist/Register.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
diff --git a/EssentialsGeoIP/nbproject/project.xml b/EssentialsGeoIP/nbproject/project.xml
index fd1a5628b..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>Register</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>