svn commit: r1588666 - /tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java

[rm...@apache.org]

Author: rmannibucau
Date: Sat Apr 19 15:55:23 2014
New Revision: 1588666

URL: http://svn.apache.org/r1588666
Log:
return files in addAdditionalLibraries

Modified:
    tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.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=1588666&r1=1588665&r2=1588666&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 Apr 19 15:55:23 2014
@@ -289,10 +289,10 @@ public class ProvisioningUtil {
         return defaultVersion;
     }
 
-    public static void addAdditionalLibraries() throws IOException {
+    public static Collection<File> addAdditionalLibraries() throws IOException {
         final File conf = SystemInstance.get().getConf(ADDITIONAL_LIB_CONFIG);
         if (conf == null || !conf.exists()) {
-            return;
+            return Collections.emptyList();
         }
 
         final Properties additionalLibProperties = IO.readProperties(conf);
@@ -321,17 +321,20 @@ public class ProvisioningUtil {
             Files.mkdirs(destination);
         }
 
+        final Collection<File> newFiles = new ArrayList<File>(libToCopy.size());
         for (final String lib : libToCopy) {
-            copy(new File(lib), destination);
+            newFiles.add(copy(new File(lib), destination));
         }
+        return newFiles;
     }
 
-    private static void copy(final File file, final File lib) throws IOException {
+    private static File copy(final File file, final File lib) throws IOException {
         final File dest = new File(lib, file.getName());
         if (dest.exists()) {
-            return;
+            return null;
         }
         IO.copy(file, dest);
+        return dest;
     }
 
     private static Collection<String> extract(final String zip) throws IOException {