Merge pull request #1313 from JaroslavTulach/DownloadBinariesIsBroken

Download binaries task is broken

Author: Jaroslav Tulach

harness/apisupport.harness/build.xml

@@ -32,6 +32,20 @@
             <zipfileset src="${nbantext.jar}" includes="${bundled.tasks}"/>
             <zipfileset file="taskdefs.properties" fullpath="org/netbeans/nbbuild/taskdefs.properties"/>
         </nb-ext-jar>
+        
+        <!-- verify that the DownloadBinaries task is properly functional -->
+        <taskdef name="TestDownload" classname="org.netbeans.nbbuild.extlibs.DownloadBinaries">
+            <classpath>
+                <pathelement location="${cluster}/tasks.jar"></pathelement>
+            </classpath>
+        </taskdef>
+        <echo file="build/binaries-list">2F7553F50B0D14ED811B849C282DA8C1FFC32AAE org.ow2.asm:asm-all:5.0.1</echo>
+        <TestDownload>
+            <manifest dir="build">
+                <include name="binaries-list"/>
+            </manifest>
+        </TestDownload>
+        <delete file="build/asm-all-5.0.1.jar"/>
     </target>
 
     <target name="compile-jnlp-launcher" depends="init,compile">

harness/apisupport.harness/nbproject/project.properties

@@ -89,7 +89,8 @@ bundled.tasks=\
     org/netbeans/nbbuild/VerifyClassLinkage*.class,\
     org/netbeans/nbbuild/VerifyJNLP*.class,\
     org/netbeans/nbbuild/XMLUtil*.class,\
-    org/netbeans/nbbuild/extlibs/DownloadBinaries*.class
+    org/netbeans/nbbuild/extlibs/DownloadBinaries*.class,\
+    org/netbeans/nbbuild/extlibs/ConfigureProxy*.class
 
 test.unit.cp.extra=${netbeans.dest.dir}/harness/jnlp/jnlp-launcher.jar
 javadoc.arch=${basedir}/arch.xml

nbbuild/antsrc/org/netbeans/nbbuild/extlibs/DownloadBinaries.java

@@ -31,20 +31,12 @@
 import java.io.OutputStream;
 import java.math.BigInteger;
 import java.net.HttpURLConnection;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.Project;