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

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

Author: ALRubinger
Date: 2010-06-02 17:29:42 -0400 (Wed, 02 Jun 2010)
New Revision: 4471

Modified:
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java
   shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java
Log:
[SHRINKWRAP-186] Set Manifest location of Web Archives to WEB-INF/classes/META-INF

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java	2010-06-02 11:54:21 UTC (rev 4470)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImpl.java	2010-06-02 21:29:42 UTC (rev 4471)
@@ -20,9 +20,9 @@
 
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.impl.base.container.WebContainerBase;
-import org.jboss.shrinkwrap.impl.base.path.BasicPath;
 
 /**
  * WebArchiveImpl
@@ -43,28 +43,28 @@
    /**
     * Path to the web inside of the Archive.
     */
-   private static final ArchivePath PATH_WEB = new BasicPath("WEB-INF");
+   private static final ArchivePath PATH_WEB = ArchivePaths.create("WEB-INF");
 
    /**
-    * Path to the manifests inside of the Archive.
-    */
-   private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
-
-   /**
     * Path to the resources inside of the Archive.
     */
-   private static final ArchivePath PATH_RESOURCE = new BasicPath("/");
+   private static final ArchivePath PATH_RESOURCE = ArchivePaths.create("/");
 
    /**
     * Path to the libraries inside of the Archive.
     */
-   private static final ArchivePath PATH_LIBRARY = new BasicPath(PATH_WEB, "lib");
+   private static final ArchivePath PATH_LIBRARY = ArchivePaths.create(PATH_WEB, "lib");
 
    /**
     * Path to the classes inside of the Archive.
     */
-   private static final ArchivePath PATH_CLASSES = new BasicPath(PATH_WEB, "classes");
+   private static final ArchivePath PATH_CLASSES = ArchivePaths.create(PATH_WEB, "classes");
 
+   /**
+    * Path to the manifests inside of the Archive.
+    */
+   private static final ArchivePath PATH_MANIFEST = ArchivePaths.create(PATH_CLASSES, "META-INF");
+
    //-------------------------------------------------------------------------------------||
    // Instance Members -------------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
@@ -86,9 +86,10 @@
    //-------------------------------------------------------------------------------------||
    // Required Implementations -----------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
-
-   /* (non-Javadoc)
-    * @see org.jboss.declarchive.impl.base.ContainerBase#getManinfestPath()
+   
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.impl.base.container.ContainerBase#getManinfestPath()
     */
    @Override
    protected ArchivePath getManinfestPath()
@@ -96,8 +97,9 @@
       return PATH_MANIFEST;
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.declarchive.impl.base.ContainerBase#getClassesPath()
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.impl.base.container.ContainerBase#getClassesPath()
     */
    @Override
    protected ArchivePath getClassesPath()
@@ -105,8 +107,9 @@
       return PATH_CLASSES;
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.declarchive.impl.base.ContainerBase#getResourcePath()
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.impl.base.container.ContainerBase#getResourcePath()
     */
    @Override
    protected ArchivePath getResourcePath()
@@ -114,8 +117,9 @@
       return PATH_RESOURCE;
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.declarchive.impl.base.ContainerBase#getLibraryPath()
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.impl.base.container.ContainerBase#getLibraryPath()
     */
    @Override
    protected ArchivePath getLibraryPath()
@@ -123,8 +127,9 @@
       return PATH_LIBRARY;
    }
    
-   /* (non-Javadoc)
-    * @see org.jboss.declarchive.impl.base.WebContainerBase#getWebPath()
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.shrinkwrap.impl.base.container.WebContainerBase#getWebPath()
     */
    @Override
    protected ArchivePath getWebPath()

Modified: shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java	2010-06-02 11:54:21 UTC (rev 4470)
+++ shrinkwrap/trunk/impl-base/src/test/java/org/jboss/shrinkwrap/impl/base/spec/WebArchiveImplTestCase.java	2010-06-02 21:29:42 UTC (rev 4471)
@@ -19,6 +19,7 @@
 import java.util.UUID;
 
 import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.container.ClassContainer;
 import org.jboss.shrinkwrap.api.container.LibraryContainer;
@@ -48,15 +49,15 @@
    // Class Members ----------------------------------------------------------------------||
    //-------------------------------------------------------------------------------------||
 
-   private static final ArchivePath PATH_WEBINF = new BasicPath("WEB-INF");
+   private static final ArchivePath PATH_WEBINF = ArchivePaths.create("WEB-INF");
 
-   private static final ArchivePath PATH_LIBRARY = new BasicPath(PATH_WEBINF, "lib");
+   private static final ArchivePath PATH_LIBRARY = ArchivePaths.create(PATH_WEBINF, "lib");
 
-   private static final ArchivePath PATH_CLASSES = new BasicPath(PATH_WEBINF, "classes");
+   private static final ArchivePath PATH_CLASSES = ArchivePaths.create(PATH_WEBINF, "classes");
 
-   private static final ArchivePath PATH_MANIFEST = new BasicPath("META-INF");
+   private static final ArchivePath PATH_MANIFEST = ArchivePaths.create(PATH_CLASSES, "META-INF");
 
-   private static final ArchivePath PATH_RESOURCE = new BasicPath();
+   private static final ArchivePath PATH_RESOURCE = ArchivePaths.root();;
 
    //-------------------------------------------------------------------------------------||
    // Instance Members -------------------------------------------------------------------||