[jboss-svn-commits] JBoss Common SVN: r3663 - in shrinkwrap/trunk: impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2009-11-11 06:05:39 -0500 (Wed, 11 Nov 2009)
New Revision: 3663

Modified:
   shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
   shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
Log:
SHRINKWRAP-62 Added addLibaries overloading

Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java	2009-11-11 10:23:26 UTC (rev 3662)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/LibraryContainer.java	2009-11-11 11:05:39 UTC (rev 3663)
@@ -65,7 +65,6 @@
    T addLibrary(String target, URL resource) throws IllegalArgumentException;
    T addLibrary(String target, Asset resource) throws IllegalArgumentException;
 
-
    /**
     * Adds the resource with the specified name
     * as a library to the container under the target path, returning the container itself.
@@ -100,4 +99,8 @@
     * @throws IllegalArgumentException if {@link Archive} is null
     */
    T addLibrary(Archive<?> archive) throws IllegalArgumentException;
+   
+   T addLibraries(String... resourceNames) throws IllegalArgumentException;
+   T addLibraries(File... resources) throws IllegalArgumentException;
+   T addLibraries(Archive<?>... archives) throws IllegalArgumentException;
 }

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2009-11-11 10:23:26 UTC (rev 3662)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2009-11-11 11:05:39 UTC (rev 3663)
@@ -741,6 +741,48 @@
       return add(location, resource);
    }
    
+   /* (non-Javadoc)
+    * @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibraries(java.lang.String[])
+    */
+   @Override
+   public T addLibraries(String... resourceNames) throws IllegalArgumentException
+   {
+      Validate.notNull(resourceNames, "ResourceNames must be specified");
+      for(String resourceName : resourceNames) 
+      {
+         addLibrary(resourceName);
+      }
+      return covarientReturn();
+   }
+
+   /* (non-Javadoc)
+    * @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibraries(java.io.File[])
+    */
+   @Override
+   public T addLibraries(File... resources) throws IllegalArgumentException
+   {
+      Validate.notNull(resources, "Resources must be specified");
+      for(File resource : resources) 
+      {
+         addLibrary(resource);
+      }
+      return covarientReturn();
+   }
+   
+   /* (non-Javadoc)
+    * @see org.jboss.shrinkwrap.api.container.LibraryContainer#addLibraries(org.jboss.shrinkwrap.api.Archive<?>[])
+    */
+   @Override
+   public T addLibraries(Archive<?>... archives) throws IllegalArgumentException 
+   {
+      Validate.notNull(archives, "Archives must be specified");
+      for(Archive<?> archive : archives) 
+      {
+         addLibrary(archive);
+      }
+      return covarientReturn();
+   }
+   
    //-------------------------------------------------------------------------------------||
    // Internal Helper Methods ------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||

Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java	2009-11-11 10:23:26 UTC (rev 3662)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java	2009-11-11 11:05:39 UTC (rev 3663)
@@ -573,5 +573,55 @@
             getArchive().contains(testPath));
    }
 
+   @Test
+   @ArchiveType(LibraryContainer.class)
+   public void testAddLibriesResource() throws Exception {
+      getLibraryContainer().addLibraries(NAME_TEST_PROPERTIES, NAME_TEST_PROPERTIES_2);
+      
+      Path testPath = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES);
+      Path testPath2 = new BasicPath(getLibraryPath(), NAME_TEST_PROPERTIES_2);
+      Assert.assertTrue(
+            "Archive should contain " + testPath,
+            getArchive().contains(testPath));
+      Assert.assertTrue(
+            "Archive should contain " + testPath2,
+            getArchive().contains(testPath2));
+   }
 
+   @Test
+   @ArchiveType(LibraryContainer.class)
+   public void testAddLibriesFile() throws Exception {
+      getLibraryContainer().addLibraries(
+            getFileForClassResource(NAME_TEST_PROPERTIES), 
+            getFileForClassResource(NAME_TEST_PROPERTIES_2));
+      
+      Path testPath = new BasicPath(getLibraryPath(), "Test.properties");
+      Path testPath2 = new BasicPath(getLibraryPath(), "Test2.properties");
+      Assert.assertTrue(
+            "Archive should contain " + testPath,
+            getArchive().contains(testPath));
+      Assert.assertTrue(
+            "Archive should contain " + testPath2,
+            getArchive().contains(testPath2));
+   }
+
+   @Test
+   @ArchiveType(LibraryContainer.class)
+   public void testAddLibrariesArchive() throws Exception {
+      Archive<?> archive = createNewArchive();
+      Archive<?> archive2 = createNewArchive();
+
+      getLibraryContainer().addLibraries(archive, archive2);
+      
+      Path testPath = new BasicPath(getLibraryPath(), archive.getName());
+      Path testPath2 = new BasicPath(getLibraryPath(), archive.getName());
+      Assert.assertTrue(
+            "Archive should contain " + testPath,
+            getArchive().contains(testPath));
+      Assert.assertTrue(
+            "Archive should contain " + testPath2,
+            getArchive().contains(testPath2));
+   }
+
+
 }