[jboss-svn-commits] JBoss Common SVN: r3985 - in shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api: spec and 1 other directory.

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

Author: ALRubinger
Date: 2010-02-05 11:06:02 -0500 (Fri, 05 Feb 2010)
New Revision: 3985

Modified:
   shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ClassContainer.java
   shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/JavaArchive.java
   shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/WebArchive.java
Log:
[SHRINKWRAP-127] Apply patch by community contributor German Escobar to have ClassContainer become a type of ResourceContainer

Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ClassContainer.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ClassContainer.java	2010-02-04 23:49:46 UTC (rev 3984)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/container/ClassContainer.java	2010-02-05 16:06:02 UTC (rev 3985)
@@ -31,7 +31,7 @@
  * @author <a href="mailto:aslak at conduct.no">Aslak Knutsen</a>
  * @version $Revision: $
  */
-public interface ClassContainer<T extends Archive<T>>
+public interface ClassContainer<T extends Archive<T>> extends ResourceContainer<T>
 {
    //-------------------------------------------------------------------------------------||
    // Contracts --------------------------------------------------------------------------||

Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/JavaArchive.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/JavaArchive.java	2010-02-04 23:49:46 UTC (rev 3984)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/JavaArchive.java	2010-02-05 16:06:02 UTC (rev 3985)
@@ -19,7 +19,6 @@
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.container.ClassContainer;
 import org.jboss.shrinkwrap.api.container.ManifestContainer;
-import org.jboss.shrinkwrap.api.container.ResourceContainer;
 
 /**
  * JavaArchive
@@ -35,7 +34,6 @@
 public interface JavaArchive
       extends
          Archive<JavaArchive>,
-         ResourceContainer<JavaArchive>,
          ManifestContainer<JavaArchive>,
          ClassContainer<JavaArchive>
 {

Modified: shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/WebArchive.java
===================================================================
--- shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/WebArchive.java	2010-02-04 23:49:46 UTC (rev 3984)
+++ shrinkwrap/trunk/api/src/main/java/org/jboss/shrinkwrap/api/spec/WebArchive.java	2010-02-05 16:06:02 UTC (rev 3985)
@@ -20,7 +20,6 @@
 import org.jboss.shrinkwrap.api.container.ClassContainer;
 import org.jboss.shrinkwrap.api.container.LibraryContainer;
 import org.jboss.shrinkwrap.api.container.ManifestContainer;
-import org.jboss.shrinkwrap.api.container.ResourceContainer;
 import org.jboss.shrinkwrap.api.container.WebContainer;
 
 /**
@@ -39,7 +38,6 @@
          ManifestContainer<WebArchive>,
          ClassContainer<WebArchive>,
          LibraryContainer<WebArchive>,
-         ResourceContainer<WebArchive>,
          WebContainer<WebArchive>
 {
 }