7 files changed, 18 insertions, 7 deletions

@@ -18,10 +18,19 @@ dist.dir=dist
 dist.jar=${dist.dir}/InstaDiscUpdateSVN.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
+file.reference.commons-logging-1.1.jar=lib/commons-logging-1.1.jar
+file.reference.ws-commons-util-1.0.2.jar=lib/ws-commons-util-1.0.2.jar
+file.reference.xmlrpc-client-3.1.jar=lib/xmlrpc-client-3.1.jar
+file.reference.xmlrpc-common-3.1.jar=lib/xmlrpc-common-3.1.jar
+file.reference.xmlrpc-server-3.1.jar=lib/xmlrpc-server-3.1.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${libs.XML-RPC2.classpath}
+    ${file.reference.commons-logging-1.1.jar}:\
+    ${file.reference.ws-commons-util-1.0.2.jar}:\
+    ${file.reference.xmlrpc-client-3.1.jar}:\
+    ${file.reference.xmlrpc-common-3.1.jar}:\
+    ${file.reference.xmlrpc-server-3.1.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -44,13 +53,10 @@ javadoc.use=true
 javadoc.version=false
 javadoc.windowtitle=
 jnlp.codebase.type=local
-jnlp.codebase.url=file:/home/hatkirby/NetBeansProjects/InstaDiscUpdateSVN/dist/
+jnlp.codebase.url=file:/home/hatkirby/NetBeansProjects/InstaDiscUpdateSVN/dist
 jnlp.enabled=false
 jnlp.offline-allowed=false
 jnlp.signed=false
-# Property libs.XML-RPC2.classpath is set here just to make sharing of project simpler.
-# The library definition has always preference over this property.
-libs.XML-RPC2.classpath=lib/commons-logging-1.1.jar:lib/ws-commons-util-1.0.2.jar:lib/xmlrpc-client-3.1.jar:lib/xmlrpc-common-3.1.jar:lib/xmlrpc-server-3.1.jar
 main.class=com.fourisland.instadisc.update.svn.Main
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
@@ -53,7 +53,7 @@ public class Main {
             config.setServerURL(new URL(centralServer));
             XmlRpcClient client = new XmlRpcClient();
             client.setConfig(config);
-            client.execute("InstaDisc.sendFromUpdate", new Object[]{username,
+            Integer resp = (Integer) client.execute("InstaDisc.sendFromUpdate", new Object[]{username,
                 (new MD5(username + ":" + (new MD5(password)).hash() + ":" + verID)).hash(),
                 verID,
                 subscription,
@@ -62,6 +62,11 @@ public class Main {
                 path,
                 "a:0:{}"
             });
+
+            if (resp == 2)
+            {
+                main(args);
+            }
         } catch (XmlRpcException ex)
         {
             Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
@@ -72,7 +77,7 @@ public class Main {
     }
 
     public static String getArg(int arg, String[] args) {
-        if (args.length < (arg+1))
+        if (args.length < (arg + 1))
         {
             System.out.println("Program requires 7 arguments and you only provided " + arg);
             System.exit(1);