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

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

Author: ALRubinger
Date: 2010-05-29 19:16:55 -0400 (Sat, 29 May 2010)
New Revision: 4457

Modified:
   shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java
Log:
[SHRINKWRAP-180] Support Archive.add(Archive,String)

Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java	2010-05-29 23:09:34 UTC (rev 4456)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/Archive.java	2010-05-29 23:16:55 UTC (rev 4457)
@@ -193,6 +193,16 @@
     * @throws IllegalArgumentException If the path or archive are not specified 
     */
    T add(Archive<?> archive, ArchivePath path) throws IllegalArgumentException;
+   
+   /**
+    * Add an archive under a specific context and maintain the archive name as context path.
+    * 
+    * @param path to use 
+    * @param archive to add
+    * @return
+    * @throws IllegalArgumentException If the path or archive are not specified 
+    */
+   T add(Archive<?> archive, String path) throws IllegalArgumentException;
 
    /**
     * Merge the contents from an existing archive without 

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java	2010-05-29 23:09:34 UTC (rev 4456)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/MemoryMapArchiveBase.java	2010-05-29 23:16:55 UTC (rev 4457)
@@ -25,6 +25,7 @@
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.Filter;
 import org.jboss.shrinkwrap.api.IllegalArchivePathException;
 import org.jboss.shrinkwrap.api.Node;
@@ -134,6 +135,17 @@
 
       return covariantReturn();
    }
+   
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.api.Archive#add(org.jboss.shrinkwrap.api.Archive, java.lang.String)
+    */
+   @Override
+   public T add(Archive<?> archive, String path)
+   {
+      Validate.notNullOrEmpty(path, "Archive Path must be specified");
+      return this.add(archive, ArchivePaths.create(path));
+   }
 
    /**
     * {@inheritDoc}