Classpath changes, move the classpath definitions to the bottom of the file and all next to each other rather than scatter about the file.

Put ${toString:plugins.libs} into the properties file rather than build-impl.xml

Unfortunately netbeans sucks and doesn't understand ${toString:plugins.libs} so refuses to acknowledge the libs at all (even tho compiling will work just fine), to counter this the user is now able to define private.classpath to (re-)include the jars that netbeans otherwise misses. Unfortunately I can't get netbeans to work any other way and neither ant or netbeans understand wildcards in the classpath.

Change-Id: I1aa6b7ba5eeeffaa2e7e8d43834af4082e0d9d04
Reviewed-on: http://gerrit.dmdirc.com/275
Tested-by: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

nbproject/build-impl.xml

@@ -48,6 +48,9 @@ is divided into following sections:
     <target depends="-pre-init,-init-private,-init-user" name="-init-project">
         <property file="nbproject/configs/${config}.properties"/>
         <property file="nbproject/project.properties"/>
+        <!-- Echo this here to make it easy for people to copy/paste into
+             private.properties. -->
+        <echo message="Found Libraries: ${toString:plugins.libs}" />
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
         <available file="${manifest.file}" property="manifest.available"/>
@@ -148,7 +151,7 @@ is divided into following sections:
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${toString:plugins.libs}:${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
             <attribute default="${excludes}" name="excludes"/>
             <attribute default="${javac.debug}" name="debug"/>
@@ -168,7 +171,7 @@ is divided into following sections:
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
             <attribute default="${plugins.src.dir}:${parser.src.dir}:${main.src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${toString:plugins.libs}:${javac.classpath}" name="classpath"/>
+            <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
                 <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
                     <classpath>
@@ -533,7 +536,7 @@ is divided into following sections:
         <mkdir dir="${dist.javadoc.dir}"/>
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="${javadoc.encoding.used}" destdir="${dist.javadoc.dir}" docencoding="${javadoc.encoding.used}" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
-                <path path="${toString:plugins.libs}:${javac.classpath}"/>
+                <path path="${javac.classpath}"/>
             </classpath>
             <fileset dir="${main.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
@@ -561,7 +564,7 @@ is divided into following sections:
         <mkdir dir="${doccheck.dir}"/>
         <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}:${plugins.src.dir}" useexternalfile="true" version="${javadoc.version}">
             <classpath>
-                <path path="${toString:plugins.libs}:${javac.classpath}"/>
+                <path path="${javac.classpath}"/>
             </classpath>
         </javadoc>
     </target>
@@ -594,10 +597,10 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${toString:plugins.libs}:${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${toString:plugins.libs}:${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -616,7 +619,7 @@ is divided into following sections:
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${toString:plugins.libs}:${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}:${plugins.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${main.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>

nbproject/project.properties

@@ -18,10 +18,6 @@ build.generated.dir=${build.dir}/generated
 build.sysclasspath=ignore
 build.test.classes.dir=${build.dir}/test/classes
 build.test.results.dir=${build.dir}/test/results
-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}/DMDirc.jar
@@ -30,16 +26,11 @@ dist.jar.excludes=com/dmdirc/addons/**
 excludes=
 includes=**
 jar.compress=false
-javac.classpath=
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:all -Xmaxerrs 1000
 javac.deprecation=true
 javac.source=1.6
 javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${file.reference.junit-4.jar}
 javadoc.additionalparam=-overview ${main.src.dir}/overview.html
 javadoc.author=false
 javadoc.encoding=
@@ -55,20 +46,39 @@ main.class=com.dmdirc.Main
 manifest.file=manifest.mf
 meta.inf.dir=${main.src.dir}/META-INF
 platform.active=default_platform
-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}:\
-    ${file.reference.junit-4.jar}
 main.src.dir=src
 parser.src.dir=modules/parser/src
 plugins.src.dir=modules/plugins/src
 main.test.dir=test
 parser.test.dir=modules/parser/test
 plugins.test.dir=modules/plugins/test
+
+# Classpaths
+# ${toString:plugins.libs} generates at compile-time a string containing all
+# the plugin jars.
+# However netbeans fails miserably at understanding this in  the IDE, so we
+# have the private.classpath variable that can be defined by the user in
+# private.properties that contains any jars they need to satisfy netbeans
+# suckiness.
+# Without this parameter, everything will still compile, but netbeans won't
+# know about any files it isn't explicitly told about.
+javac.classpath=${toString:plugins.libs}
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${file.reference.junit-4.jar}
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}:\
+    ${file.reference.junit-4.jar}
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}