svn commit: r1302814 - in /openejb/trunk/openejb/arquillian-tomee: arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java ziplock/src/main/java/org/apache/ziplock/WebModule.java

[rm...@apache.org]

Author: rmannibucau
Date: Tue Mar 20 09:40:54 2012
New Revision: 1302814

URL: http://svn.apache.org/viewvc?rev=1302814&view=rev
Log:
fixing packaging issue with ziploack when the test class shouldn't be shipped with the deployed archive

Modified:
    openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java
    openejb/trunk/openejb/arquillian-tomee/ziplock/src/main/java/org/apache/ziplock/WebModule.java

Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java?rev=1302814&r1=1302813&r2=1302814&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java Tue Mar 20 09:40:54 2012
@@ -49,7 +49,8 @@ public class ServletDisposeRequestScopeT
 
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
-        return new WebModule(ServletDisposeRequestScopeTest.class).getArchive()
+        return new WebModule(ServletDisposeRequestScopeTest.class, ServletDisposeRequestScopeTest.class)
+                .getArchive()
                 .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
                         .version("3.0").exportAsString()))
                 .addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));

Modified: openejb/trunk/openejb/arquillian-tomee/ziplock/src/main/java/org/apache/ziplock/WebModule.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/ziplock/src/main/java/org/apache/ziplock/WebModule.java?rev=1302814&r1=1302813&r2=1302814&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/ziplock/src/main/java/org/apache/ziplock/WebModule.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/ziplock/src/main/java/org/apache/ziplock/WebModule.java Tue Mar 20 09:40:54 2012
@@ -49,11 +49,15 @@ public class WebModule {
         this(ShrinkWrap.create(WebArchive.class, name));
     }
 
-    public WebModule(Class<?> clazz) {
-        this(clazz, clazz.getSimpleName() + ".war");
+    /**
+     * @param clazz class used to extract the package to include in the webarchive
+     * @param excluded list of excluded files (will not be in the webarchive) contained in the selected package
+     */
+    public WebModule(final Class<?> clazz, final Class<?>... excluded) {
+        this(clazz, clazz.getSimpleName() + ".war", excluded);
     }
 
-    public WebModule(Class<?> clazz, String appName) {
+    public WebModule(Class<?> clazz, String appName, final Class<?>... excluded) {
         this(appName);
 
         final URL archiveURL;
@@ -78,9 +82,20 @@ public class WebModule {
                 if (name.endsWith(".xml")) {
                     this.archive.add(new Named("WEB-INF/" + name, new UrlAsset(url)));
                 } else {
-                    final String path = url.getPath();
-                    final String relativePath = path.substring(path.indexOf(packageName));
-                    this.archive.add(new Named("WEB-INF/classes/" + relativePath, new UrlAsset(url)));
+                    boolean keep = true;
+                    if (excluded != null) {
+                        for (Class<?> excludedClazz : excluded) {
+                            if (name.equals(excludedClazz.getSimpleName().concat(".class"))) {
+                                keep = false;
+                            }
+                        }
+                    }
+
+                    if (keep) {
+                        final String path = url.getPath();
+                        final String relativePath = path.substring(path.indexOf(packageName));
+                        this.archive.add(new Named("WEB-INF/classes/" + relativePath, new UrlAsset(url)));
+                    }
                 }
             }
         } catch (IOException e) {