Revert to 1013

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

4 files changed, 28 insertions, 3 deletions

diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml
index 09a0e0d9d..dd0e3d5e1 100644
--- a/BuildAll/nbproject/build-impl.xml
+++ b/BuildAll/nbproject/build-impl.xml
@@ -630,6 +630,13 @@ is divided into following sections:
         </antcall>

         <antcall target="-maybe-call-dep">

             <param name="call.built.properties" value="${built-jar.properties}"/>

+            <param location="${project.EssentialsServerlist}" name="call.subproject"/>

+            <param location="${project.EssentialsServerlist}/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.EssentialsSpawn}" name="call.subproject"/>

             <param location="${project.EssentialsSpawn}/build.xml" name="call.script"/>

             <param name="call.target" value="jar"/>

@@ -1108,6 +1115,13 @@ is divided into following sections:
         </antcall>

         <antcall target="-maybe-call-dep">

             <param name="call.built.properties" value="${built-clean.properties}"/>

+            <param location="${project.EssentialsServerlist}" name="call.subproject"/>

+            <param location="${project.EssentialsServerlist}/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.EssentialsSpawn}" name="call.subproject"/>

             <param location="${project.EssentialsSpawn}/build.xml" name="call.script"/>

             <param name="call.target" value="clean"/>

diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties
index 55c9a217a..7775180ad 100644
--- a/BuildAll/nbproject/genfiles.properties
+++ b/BuildAll/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=60061751

+build.xml.data.CRC32=36e85771

 build.xml.script.CRC32=7a797370

 build.xml.stylesheet.CRC32=28e38971@1.42.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=60061751

-nbproject/build-impl.xml.script.CRC32=5fce336c

+nbproject/build-impl.xml.data.CRC32=36e85771

+nbproject/build-impl.xml.script.CRC32=eaedfa13

 nbproject/build-impl.xml.stylesheet.CRC32=19debb58@1.42.1.45

diff --git a/BuildAll/nbproject/project.properties b/BuildAll/nbproject/project.properties
index 6b8e235e1..e598ad76c 100644
--- a/BuildAll/nbproject/project.properties
+++ b/BuildAll/nbproject/project.properties
@@ -34,6 +34,7 @@ javac.classpath=\
     ${reference.EssentialsGroupBridge.jar}:\

     ${reference.EssentialsGroupManager.jar}:\

     ${reference.EssentialsProtect.jar}:\

+    ${reference.EssentialsServerlist.jar}:\

     ${reference.EssentialsSpawn.jar}

 # Space-separated list of extra javac options

 javac.compilerargs=

@@ -68,12 +69,14 @@ project.EssentialsChat=../EssentialsChat
 project.EssentialsGroupBridge=../EssentialsGroupBridge

 project.EssentialsGroupManager=../EssentialsGroupManager

 project.EssentialsProtect=../EssentialsProtect

+project.EssentialsServerlist=../EssentialsServerlist

 project.EssentialsSpawn=../EssentialsSpawn

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

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

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

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

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

+reference.EssentialsServerlist.jar=${project.EssentialsServerlist}/dist/EssentialsServerlist.jar

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

 run.classpath=\

     ${javac.classpath}:\

diff --git a/BuildAll/nbproject/project.xml b/BuildAll/nbproject/project.xml
index 86e1cc4a7..8f87bed74 100644
--- a/BuildAll/nbproject/project.xml
+++ b/BuildAll/nbproject/project.xml
@@ -56,6 +56,14 @@
                 <id>jar</id>

             </reference>

             <reference>

+                <foreign-project>EssentialsServerlist</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>