[jboss-svn-commits] JBoss Common SVN: r4079 - 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-01 09:44:20 -0500 (Mon, 01 Mar 2010)
New Revision: 4079

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-142 Fixed MANIFEST.MF file name

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-01 09:38:59 UTC (rev 4078)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2010-03-01 14:44:20 UTC (rev 4079)
@@ -381,7 +381,7 @@
    public T setManifest(Asset resource) throws IllegalArgumentException
    {
       Validate.notNull(resource, "Resource should be specified");
-      return addManifestResource(resource, "MANIFEST.FM");
+      return addManifestResource(resource, "MANIFEST.MF");
    }
    
    /* (non-Javadoc)

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-01 09:38:59 UTC (rev 4078)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/test/DynamicContainerTestBase.java	2010-03-01 14:44:20 UTC (rev 4079)
@@ -53,6 +53,8 @@
    //-------------------------------------------------------------------------------------||
    // Class Members ----------------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
+   
+   public static String MANIFEST_FILE = "MANIFEST.MF";
 
    //-------------------------------------------------------------------------------------||
    // Contracts ----------------------------------------------------------------------||
@@ -83,45 +85,65 @@
    // Test Implementations - ManifestContainer -------------------------------------------||
    //-------------------------------------------------------------------------------------||
 
+   /** 
+    * https://jira.jboss.org/jira/browse/SHRINKWRAP-142
+    * 
+    * @throws Exception
+    */
    @Test
    @ArchiveType(ManifestContainer.class)
    public void testSetManifestResource() throws Exception {
       getManifestContainer().setManifest(NAME_TEST_PROPERTIES);
       
-      ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+      ArchivePath testPath = new BasicPath(getManifestPath(), MANIFEST_FILE);
       Assert.assertTrue(
             "Archive should contain " + testPath,
             getArchive().contains(testPath));
    }
    
+   /** 
+    * https://jira.jboss.org/jira/browse/SHRINKWRAP-142
+    * 
+    * @throws Exception
+    */
    @Test
    @ArchiveType(ManifestContainer.class)
    public void testSetManifestFile() throws Exception {
       getManifestContainer().setManifest(getFileForClassResource(NAME_TEST_PROPERTIES));
       
-      ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+      ArchivePath testPath = new BasicPath(getManifestPath(), MANIFEST_FILE);
       Assert.assertTrue(
             "Archive should contain " + testPath,
             getArchive().contains(testPath));
    }
 
+   /**
+    * https://jira.jboss.org/jira/browse/SHRINKWRAP-142
+    * 
+    * @throws Exception
+    */
    @Test
    @ArchiveType(ManifestContainer.class)
    public void testSetManifestURL() throws Exception {
       getManifestContainer().setManifest(getURLForClassResource(NAME_TEST_PROPERTIES));
       
-      ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+      ArchivePath testPath = new BasicPath(getManifestPath(), MANIFEST_FILE);
       Assert.assertTrue(
             "Archive should contain " + testPath,
             getArchive().contains(testPath));
    }
 
+   /**
+    * https://jira.jboss.org/jira/browse/SHRINKWRAP-142
+    * 
+    * @throws Exception
+    */
    @Test
    @ArchiveType(ManifestContainer.class)
    public void testSetManifestAsset() throws Exception {
       getManifestContainer().setManifest(getAssetForClassResource(NAME_TEST_PROPERTIES));
       
-      ArchivePath testPath = new BasicPath(getManifestPath(), "MANIFEST.FM");
+      ArchivePath testPath = new BasicPath(getManifestPath(), MANIFEST_FILE);
       Assert.assertTrue(
             "Archive should contain " + testPath,
             getArchive().contains(testPath));