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

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

Author: aslak
Date: 2010-03-17 08:43:18 -0400 (Wed, 17 Mar 2010)
New Revision: 4181

Modified:
   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-145 Wrong argument order


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	2010-03-15 21:43:37 UTC (rev 4180)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2010-03-17 12:43:18 UTC (rev 4181)
@@ -28,6 +28,7 @@
 import org.jboss.shrinkwrap.api.Asset;
 import org.jboss.shrinkwrap.api.Filter;
 import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.Listener;
 import org.jboss.shrinkwrap.api.Node;
 import org.jboss.shrinkwrap.api.container.ClassContainer;
 import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -288,6 +289,16 @@
    {
       return archive.getName();
    }
+
+   /* (non-Javadoc)
+    * @see org.jboss.shrinkwrap.api.Archive#addListener(org.jboss.shrinkwrap.api.Filter, org.jboss.shrinkwrap.api.Listener)
+    */
+   @Override
+   public T addListener(Filter<ArchivePath> filter, Listener listener)
+   {
+      archive.addListener(filter, listener);
+      return covarientReturn();
+   }
    
    /**
     * {@inheritDoc}
@@ -548,10 +559,10 @@
     * @see org.jboss.shrinkwrap.api.container.ResourceContainer#addResource(java.lang.String, java.lang.String)
     */
    @Override
-   public final T addResource(String target, String resourceName) throws IllegalArgumentException 
+   public final T addResource(String resourceName, String target) throws IllegalArgumentException 
    {
+      Validate.notNull(resourceName, "ResourceName should be specified");
       Validate.notNull(target, "Target should be specified");
-      Validate.notNull(resourceName, "ResourceName should be specified");
       
       return addResource(new ClassLoaderAsset(resourceName), target);
    }

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	2010-03-15 21:43:37 UTC (rev 4180)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java	2010-03-17 12:43:18 UTC (rev 4181)
@@ -314,10 +314,13 @@
       Assert.assertTrue("Archive should contain " + testPath, getArchive().contains(testPath));
    }
 
+   /*
+    * https://jira.jboss.org/jira/browse/SHRINKWRAP-145 - Should be Resource, Target
+    */
    @Test
    @ArchiveType(ResourceContainer.class)
    public void testAddResourceStringTargetResource() throws Exception {
-      getResourceContainer().addResource("Test.txt", NAME_TEST_PROPERTIES);
+      getResourceContainer().addResource(NAME_TEST_PROPERTIES, "Test.txt");
       
       ArchivePath testPath = new BasicPath(getResourcePath(), "Test.txt");
       Assert.assertTrue(