Use ivy for plugin dependencies.

Depends-On: I34d7849a75cd4c7a91e04a9dad6f8073aa5a8f61
Change-Id: I65d96f91e1eb5ed7afb43dd41cd00531d809878d
Reviewed-on: http://gerrit.dmdirc.com/2736
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

.gitignore

@@ -1,3 +1,4 @@
 /build
 /dist
+/lib
 *.iml

build-ivy.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="DMDirc-plugins-ivy" basedir="." xmlns:ivy="antlib:org.apache.ivy.ant">
+    <description>Ivy utilities for DMDirc plugins</description>
+
+    <property name="ivy.cache.ttl.default" value="7d"/>
+
+    <target name="-init-ivy" depends="-init-lib-directory">
+        <path id="ivy.classpath">
+           <fileset dir="etc/ivy" includes="ivy*.jar"/>
+        </path>
+
+        <available classname="org.apache.ivy.ant.IvyConfigure"
+              property="ivy.available" classpathref="ivy.classpath" />
+    </target>
+
+    <target name="init-dependencies" depends="-init-ivy" unless="ivy.done">
+        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.classpath"/>
+        <ivy:settings file="etc/ivy/ivysettings.xml"/>
+        <ivy:retrieve symlink="true" pattern="lib/[conf]/[artifact].[ext]" sync="true" />
+        <property name="ivy.done" value="true"/>
+    </target>
+</project>

build.xml

@@ -9,34 +9,46 @@
     <property name="plugins.dist" location="dist"/>
     <property name="plugins.lib" location="lib"/>
 
+    <import file="build-ivy.xml" />
     <import file="build-tests.xml"/>
 
-    <path id="plugins.classpath">
-       <pathelement path="${plugins.dmdirc.build.dir}"/>
-       <fileset dir="${plugins.lib}" includes="*.jar"/>
-    </path>
-
-    <condition property="plugins.dmdirc.exists">
-       <available classname="com.dmdirc.Main" classpathref="plugins.classpath"/>
-    </condition>
-
     <condition property="plugins.need.antlib">
        <not>
            <typefound name="foreach"/>
        </not>
     </condition>
 
-    <target name="-init-taskdefs" if="plugins.need.antlib">
+    <target name="-init-lib-directory">
+      <mkdir dir="${plugins.lib}"/>
+    </target>
+
+    <target name="-init-taskdefs" depends="init-dependencies,-init-paths,-init-antlib,-init-git-describe">
+    </target>
+
+    <target name="-init-antlib" if="plugins.need.antlib">
         <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="plugins.classpath"/>
     </target>
+    
+    <target name="-init-git-describe">
+        <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="plugins.classpath"/>
+    </target>
 
-    <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="plugins.classpath"/>
+    <target name="-init-paths">
+      <path id="plugins.classpath">
+         <pathelement path="${plugins.dmdirc.build.dir}"/>
+         <fileset dir="${plugins.lib}" includes="**/*.jar"/>
+      </path>
+
+      <condition property="plugins.dmdirc.exists">
+         <available classname="com.dmdirc.Main" classpathref="plugins.classpath"/>
+      </condition>
+    </target>
 
     <target name="-check-dmdirc-jar" unless="plugins.dmdirc.exists">
        <fail>DMDirc class files not found. Please put DMDirc on the classpath or specify the 'plugins.dmdirc.build.dir' property.</fail>
     </target>
 
-    <target name="-init-compile" depends="-check-dmdirc-jar">
+    <target name="-init-compile" depends="init-dependencies,-init-paths,-check-dmdirc-jar">
        <mkdir dir="${plugins.build}"/>
        <mkdir dir="${plugins.build.classes}"/>
        <mkdir dir="${plugins.build.metadata}"/>
@@ -57,7 +69,7 @@
 
     <target name="jar" depends="-package,-add-libs"/>
 
-    <target name="-package" depends="-init-taskdefs, compile">
+    <target name="-package" depends="-init-taskdefs,compile">
         <for param="configfile">
             <fileset dir="${plugins.src}" includes="**/plugin.config"/>
             <sequential>
@@ -106,18 +118,18 @@ version:
 
     <target name="-add-libs">
         <jar destfile="${plugins.dist}/ui_swing.jar" update="true">
-            <zipfileset src="${plugins.lib}/miglayout-4.0-swing.jar" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
-            <zipfileset src="${plugins.lib}/menuscroller.jar" includes="darrylbu/util/**"/>
-            <zipfileset src="${plugins.lib}/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
-            <zipfileset src="${plugins.lib}/cinch.jar" includes="*/**"/>
-            <zipfileset src="${plugins.lib}/cinchsupport.jar" includes="*/**"/>
+            <zipfileset src="${plugins.lib}/main/miglayout-swing.jar" includes="net/miginfocom/layout/**,net/miginfocom/swing/**"/>
+            <zipfileset src="${plugins.lib}/main/menuscroller.jar" includes="darrylbu/util/**"/>
+            <zipfileset src="${plugins.lib}/main/jxlayer.jar" includes="org/jdesktop/jxlayer/**"/>
+            <zipfileset src="${plugins.lib}/main/cinch.jar" includes="*/**"/>
+            <zipfileset src="${plugins.lib}/main/cinchsupport.jar" includes="*/**"/>
         </jar>
 
         <jar destfile="${plugins.dist}/ui_web.jar" update="true">
-            <zipfileset src="${plugins.lib}/commons-lang-2.4.jar" includes="org/apache/**" excludes="**/*.html"/>
-            <zipfileset src="${plugins.lib}/jetty-6.1.22.jar" includes="org/mortbay/**"/>
-            <zipfileset src="${plugins.lib}/jetty-util-6.1.22.jar" includes="org/mortbay/**"/>
-            <zipfileset src="${plugins.lib}/servlet-api-2.5-20081211.jar" includes="javax/servlet/**"/>
+            <zipfileset src="${plugins.lib}/main/commons-lang.jar" includes="org/apache/**" excludes="**/*.html"/>
+            <zipfileset src="${plugins.lib}/main/jetty.jar" includes="org/mortbay/**"/>
+            <zipfileset src="${plugins.lib}/main/jetty-util.jar" includes="org/mortbay/**"/>
+            <zipfileset src="${plugins.lib}/main/servlet-api.jar" includes="javax/servlet/**"/>
         </jar>
 
         <jar destfile="${plugins.dist}/parser_irc.jar" update="true">
@@ -128,32 +140,32 @@ version:
         </jar>
 
         <jar destfile="${plugins.dist}/parser_xmpp.jar" update="true">
-            <zipfileset src="${plugins.lib}/smack.jar" includes="org/**"/>
-            <zipfileset src="${plugins.lib}/smackx.jar" includes="org/** com/**"/>
+            <zipfileset src="${plugins.lib}/main/smack.jar" includes="org/**"/>
+            <zipfileset src="${plugins.lib}/main/smackx.jar" includes="org/** com/**"/>
         </jar>
 
        <jar destfile="${plugins.dist}/parser_msn.jar" update="true">
-            <zipfileset src="${plugins.lib}/jml-1.0b4-full.jar" includes="net/** org/**"/>
-            <zipfileset src="${plugins.lib}/httpcore.jar" includes="org/**"/>
+            <zipfileset src="${plugins.lib}/main/jml.jar" includes="net/** org/**"/>
+            <zipfileset src="${plugins.lib}/main/httpcore.jar" includes="org/**"/>
         </jar>
 
         <jar destfile="${plugins.dist}/windowflashing.jar" update="true">
-            <zipfileset src="${plugins.lib}/jna.jar" includes="com/**"/>
-            <zipfileset src="${plugins.lib}/platform.jar" includes="com/**"/>
+            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/**"/>
+            <zipfileset src="${plugins.lib}/main/platform.jar" includes="com/**"/>
         </jar>
 
         <jar destfile="${plugins.dist}/sessionlock.jar" update="true">
-            <zipfileset src="${plugins.lib}/jna.jar" includes="com/sun/jna/*"/>
-            <zipfileset src="${plugins.lib}/jna.jar" includes="com/sun/jna/ptr/*"/>
-            <zipfileset src="${plugins.lib}/jna.jar" includes="com/sun/jna/win32/**"/>
-            <zipfileset src="${plugins.lib}/jna.jar" includes="com/sun/jna/win32-amd64/**"/>
-            <zipfileset src="${plugins.lib}/jna.jar" includes="com/sun/jna/win32-x86/**"/>
-            <zipfileset src="${plugins.lib}/platform.jar" includes="com/sun/jna/platform/win32/**"/>
-            <zipfileset src="${plugins.lib}/JavaWindowsSessionLockSupport.jar" includes="com/greboid/**"/>
+            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/*"/>
+            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/ptr/*"/>
+            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/win32/**"/>
+            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/win32-amd64/**"/>
+            <zipfileset src="${plugins.lib}/main/jna.jar" includes="com/sun/jna/win32-x86/**"/>
+            <zipfileset src="${plugins.lib}/main/platform.jar" includes="com/sun/jna/platform/win32/**"/>
+            <zipfileset src="${plugins.lib}/main/locksupport.jar" includes="com/greboid/**"/>
         </jar>
 
         <jar destfile="${plugins.dist}/freedesktop_notifications.jar" update="true">
-            <zipfileset src="${plugins.lib}/commons-lang-2.4.jar" includes="org/apache/**" excludes="**/*.html"/>
+            <zipfileset src="${plugins.lib}/main/commons-lang.jar" includes="org/apache/**" excludes="**/*.html"/>
         </jar>
     </target>
 

etc/ivy/ivysettings.xml

@@ -0,0 +1,26 @@
+<ivysettings>
+    <settings defaultResolver="default"/>
+    <resolvers>
+        <ibiblio name="default" m2compatible="true"/>
+
+        <ibiblio name="jgit" root="http://download.eclipse.org/jgit/maven" m2compatible="true"/>
+        <ibiblio name="dmdirc-thirdparty" root="http://nexus.dmdirc.com/nexus/content/repositories/thirdparty/" m2compatible="true"/>
+        <ibiblio name="jml" root="http://java-jml.sourceforge.net/maven" m2compatible="true"/>
+
+        <url name="ant-nsis">
+            <artifact pattern="http://cloud.github.com/downloads/dreese/nsis-ant/nsisant-[revision].jar"/>
+        </url>
+
+        <url name="jgit-describe">
+            <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
+            <artifact pattern="http://shanemcc.github.com/jgit-describe/releases/jgit-describe-[revision].jar"/>
+        </url>
+    </resolvers>
+    <modules>
+        <module organisation="org.sourceforce.ant-nsis" name="ant-nsis" resolver="ant-nsis"/>
+        <module organisation="com.github.shanemcc" name="jgit-describe" resolver="jgit-describe"/>
+        <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
+        <module organisation="com.greboid.libraries" name="*" resolver="dmdirc-thirdparty"/>
+        <module organisation="net.sourceforge.java-jml" name="*" resolver="jml"/>
+    </modules>
+</ivysettings>

etc/ivy/jgit-describe/ivy.xml

@@ -0,0 +1,6 @@
+<ivy-module version="2.0">
+    <info organisation="com.github.shanemcc" module="jgit-describe"/>
+    <dependencies>
+        <dependency org="org.eclipse.jgit" name="org.eclipse.jgit" rev="latest.integration" conf="default" />
+    </dependencies>
+</ivy-module>

ivy.xml

@@ -0,0 +1,52 @@
+<ivy-module version="2.0">
+    <info organisation="com.dmdirc" module="plugins"/>
+
+    <configurations>
+        <conf name="build" description="Everything needed to support the build process"/>
+        <conf name="main" description="Everything needed to compile the project separately"/>
+        <conf name="test" description="Everything needed to test the project"/>
+    </configurations>
+
+    <dependencies>
+        <dependency org="ant-contrib" name="ant-contrib" rev="1.0b3" conf="build->default" />
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.3" conf="build->default" />
+
+        <dependency org="org.slf4j" name="slf4j-api" rev="1.+" conf="main->default" />
+        <dependency org="com.github.peichhorn" name="lombok-pg" rev="latest.release" conf="main->default" />
+        <dependency org="org.igniterealtime.smack" name="smack" rev="3.+" conf="main->default" />
+        <dependency org="org.igniterealtime.smack" name="smackx" rev="3.+" conf="main->default" />
+        <dependency org="com.miglayout" name="miglayout-swing" rev="4.+" conf="main->default" />
+        <dependency org="org.swinglabs" name="jxlayer" rev="3.+" conf="main->default" />
+        <dependency org="net.java.dev.jna" name="jna" rev="3.+" conf="main->default" />
+        <dependency org="net.java.dev.jna" name="platform" rev="3.+" conf="main->default" />
+        <dependency org="com.greboid.libraries" name="cinch" rev="latest.release" conf="main->default" />
+        <dependency org="com.greboid.libraries" name="cinchsupport" rev="latest.release" conf="main->default" />
+        <dependency org="com.greboid.libraries" name="locksupport" rev="latest.release" conf="main->default" />
+        <dependency org="com.greboid.libraries" name="menuscroller" rev="latest.release" conf="main->default" />
+        <dependency org="org.mortbay.jetty" name="jetty" rev="6.+" conf="main->default" />
+        <dependency org="net.sourceforge.java-jml" name="jml" rev="1.+" conf="main->default" />
+        <dependency org="commons-lang" name="commons-lang" rev="latest.release" conf="main->default" />
+
+<!--
+        <dependency org="org.sourceforce.ant-nsis" name="ant-nsis" rev="1.3" conf="build->default" />
+        <dependency org="com.github.shanemcc" name="jgit-describe" rev="0.3" conf="build->default" />
+        <dependency org="net.sourceforge.fikin-ant-tasks" name="ant-fikin" rev="1.7.3" conf="build->default" />
+
+        <dependency org="org.slf4j" name="slf4j-api" rev="1.+" conf="main->default" />
+        <dependency org="ch.qos.logback" name="logback-classic" rev="1.+" conf="test->default" />
+
+        <dependency org="com.squareup.dagger" name="dagger" rev="1.1.+" conf="main->default" />
+        <dependency org="com.squareup.dagger" name="dagger-compiler" rev="1.1.+" conf="main->default" />
+
+        <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
+        <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />
+        <dependency org="com.cenqua.clover" name="clover" rev="3.+" conf="test->default" />
+
+        <dependency org="pmd" name="pmd" rev="4.+" conf="analyse->default" />
+        <dependency org="com.puppycrawl.tools" name="checkstyle" rev="5.+" conf="analyse->default" />
+        <dependency org="net.sourceforge.findbugs" name="findbugs-ant" rev="1.+" conf="analyse->default" />
+
+        <exclude org="ant" module="ant"/>
+-->
+    </dependencies>
+</ivy-module>

src/com/dmdirc/addons/parser_xmpp/FixedXmppConnection.java

@@ -26,6 +26,7 @@ import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.jivesoftware.smack.Connection;
 import org.jivesoftware.smack.ConnectionConfiguration;
 import org.jivesoftware.smack.ConnectionCreationListener;
 import org.jivesoftware.smack.XMPPConnection;
@@ -82,7 +83,7 @@ public class FixedXmppConnection extends XMPPConnection
     /** {@inheritDoc} */
     @Override
     @SuppressWarnings("ResultOfObjectAllocationIgnored")
-    public void connectionCreated(final XMPPConnection xmppc) {
+    public void connectionCreated(final Connection xmppc) {
         // Creating this shoves itself into a static map. Other listeners
         // depend on this entry existing in the map before they're called.
         new ServiceDiscoveryManager(xmppc);