svn commit: r1243659 - in /openejb/trunk/openejb: arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/ container/openejb-loader/src/main/java/org/apache/openejb/loader/

[rm...@apache.org]

Author: rmannibucau
Date: Mon Feb 13 19:13:52 2012
New Revision: 1243659

URL: http://svn.apache.org/viewvc?rev=1243659&view=rev
Log:
managing proxy in MavenCache

Modified:
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todo.java
    openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java?rev=1243659&r1=1243658&r2=1243659&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/MavenCache.java Mon Feb 13 19:13:52 2012
@@ -16,13 +16,14 @@
  */
 package org.apache.openejb.arquillian.common;
 
+import org.apache.openejb.loader.ProvisioningUtil;
 import org.apache.openejb.resolver.Resolver;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
+import java.net.URI;
 
 public class MavenCache {
 	public File getArtifact(String artifactInfo, String altUrl) {
@@ -49,7 +50,7 @@ public class MavenCache {
 		InputStream is = null;
 		OutputStream os = null;
 		try {
-			is = new URL(source).openStream();
+			is = ProvisioningUtil.inputStreamTryingProxies(new URI(source));
 			file = File.createTempFile("dload", ".fil");
 			file.deleteOnExit();
 			os = new FileOutputStream(file);

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todo.java?rev=1243659&r1=1243658&r2=1243659&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todo.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Todo.java Mon Feb 13 19:13:52 2012
@@ -16,8 +16,6 @@
  */
 package org.apache.openejb.arquillian.common;
 
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;

Modified: openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java?rev=1243659&r1=1243658&r2=1243659&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java (original)
+++ openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java Mon Feb 13 19:13:52 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.openejb.loader;
 
+import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -45,22 +46,26 @@ public class ProvisioningUtil {
     }
 
     public static String copyTryingProxies(final URI source, final File destination) throws Exception {
+        final InputStream is = inputStreamTryingProxies(source);
+        if (is == null) {
+            return null;
+        }
+
+        FileUtils.copy(new FileOutputStream(destination), is);
+        return destination.getAbsolutePath();
+    }
+
+    public static InputStream inputStreamTryingProxies(final URI source) throws Exception {
         final URL url = source.toURL();
         for (Proxy proxy : ProxySelector.getDefault().select(source)) {
-            InputStream is;
-
             // try to connect
             try {
                 URLConnection urlConnection = url.openConnection(proxy);
                 urlConnection.setConnectTimeout(CONNECT_TIMEOUT);
-                is = urlConnection.getInputStream();
+                return new BufferedInputStream(urlConnection.getInputStream());
             } catch (IOException e) {
                 continue;
             }
-
-            // parse
-            FileUtils.copy(new FileOutputStream(destination), is);
-            return destination.getAbsolutePath();
         }
         return null;
     }