svn commit: r1619996 - in /tomee/tomee/trunk/container/openejb-loader/src: main/java/org/apache/openejb/loader/ProvisioningUtil.java test/java/org/apache/openejb/loader/ProvisioningUtilTest.java

[rmannibucau]

Author: rmannibucau
Date: Sat Aug 23 09:50:21 2014
New Revision: 1619996

URL: http://svn.apache.org/r1619996
Log:
TOMEE-1328 ensure provisioning util fails when not finding the lib

Modified:
    
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
    
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java

Modified: 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java?rev=1619996&r1=1619995&r2=1619996&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
 Sat Aug 23 09:50:21 2014
@@ -158,11 +158,15 @@ public final class ProvisioningUtil {
                     is = new BufferedInputStream(url.openStream());
                     IO.copy(is, file);
                     return file.getAbsolutePath();
+                } catch (final IOException ioe) {
+                    throw new IllegalArgumentException(ioe);
                 } finally {
                     IO.close(is);
                 }
+            } catch (final IllegalArgumentException iae) {
+                throw iae;
             } catch (final Exception e1) {
-                // no-op
+                throw new IllegalArgumentException(e1);
             }
         }
 

Modified: 
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java?rev=1619996&r1=1619995&r2=1619996&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-loader/src/test/java/org/apache/openejb/loader/ProvisioningUtilTest.java
 Sat Aug 23 09:50:21 2014
@@ -28,4 +28,13 @@ public class ProvisioningUtilTest {
         final String url = 
ProvisioningUtil.quickMvnUrl("org.apache.openejb/apache-tomee/x.y.z-SNAPSHOT");
         
assertEquals("https://repository.apache.org/snapshots/org/apache/openejb/apache-tomee/x.y.z-SNAPSHOT/apache-tomee-x.y.z-SNAPSHOT.jar";,
 url);
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void missingShouldFail() throws Exception {
+        ProvisioningUtil.realLocation("mvn:missing:artifact:c56dfhrvfjc");
+    }
+    @Test(expected = IllegalArgumentException.class)
+    public void missingShouldFailEvenWhenResolvedLocally() throws Exception {
+        ProvisioningUtil.realLocation("file:///target/cigcrdyicexbeoeoc is not 
here.jar");
+    }
 }