[jboss-cvs] JBossAS SVN: r102065 - in projects/jboss-deployers/trunk/deployers-vfs/src/test: java/org/jboss/test/deployers/vfs/classloader/test and 2 other directories.

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

Author: adrian at jboss.org
Date: 2010-03-08 10:25:05 -0500 (Mon, 08 Mar 2010)
New Revision: 102065

Modified:
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/support/TestLevelClassLoaderSystemDeployer.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment3/META-INF/jboss-classloading.xml
   projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment5/META-INF/jboss-classloading.xml
Log:
Some more List->Set and fix up confused export-all usage.

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/support/TestLevelClassLoaderSystemDeployer.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/support/TestLevelClassLoaderSystemDeployer.java	2010-03-08 15:17:59 UTC (rev 102064)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/support/TestLevelClassLoaderSystemDeployer.java	2010-03-08 15:25:05 UTC (rev 102065)
@@ -21,8 +21,8 @@
  */
 package org.jboss.test.deployers.vfs.classloader.support;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer;
 import org.jboss.deployers.spi.DeploymentException;
@@ -36,8 +36,8 @@
  */
 public class TestLevelClassLoaderSystemDeployer extends AbstractLevelClassLoaderSystemDeployer
 {
-   public List<String> deployed = new ArrayList<String>();
-   public List<String> undeployed = new ArrayList<String>();
+   public Set<String> deployed = new HashSet<String>();
+   public Set<String> undeployed = new HashSet<String>();
 
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java	2010-03-08 15:17:59 UTC (rev 102064)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/java/org/jboss/test/deployers/vfs/classloader/test/VFSClassLoaderDependenciesTest.java	2010-03-08 15:25:05 UTC (rev 102065)
@@ -22,9 +22,9 @@
 package org.jboss.test.deployers.vfs.classloader.test;
 
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.jboss.classloader.plugins.jdk.AbstractJDKChecker;
 import org.jboss.classloader.plugins.system.DefaultClassLoaderSystem;
@@ -69,17 +69,17 @@
    public static final String NameA = "A";
    public static final String NameB = "B";
 
-   public static final List<String> NONE = Collections.emptyList();
-   public static final List<String> XA = makeList(NameA);
-   public static final List<String> XB = makeList(NameB);
-   public static final List<String> XAB = makeList(NameA, NameB);
-   public static final List<String> XBA = makeList(NameB, NameA);
-   public static final List<String> XBAA = makeList(NameB, NameA, NameA);
-   public static final List<String> XBABA = makeList(NameB, NameA, NameB, NameA);
+   public static final Set<String> NONE = Collections.emptySet();
+   public static final Set<String> XA = makeSet(NameA);
+   public static final Set<String> XB = makeSet(NameB);
+   public static final Set<String> XAB = makeSet(NameA, NameB);
+   public static final Set<String> XBA = makeSet(NameB, NameA);
+   public static final Set<String> XBAA = makeSet(NameB, NameA, NameA);
+   public static final Set<String> XBABA = makeSet(NameB, NameA, NameB, NameA);
 
-   protected static <T> List<T> makeList(T... objects)
+   protected static <T> Set<T> makeSet(T... objects)
    {
-      List<T> result = new ArrayList<T>();
+      Set<T> result = new HashSet<T>();
       for (T object : objects)
          result.add(object);
       return result;

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment3/META-INF/jboss-classloading.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment3/META-INF/jboss-classloading.xml	2010-03-08 15:17:59 UTC (rev 102064)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment3/META-INF/jboss-classloading.xml	2010-03-08 15:25:05 UTC (rev 102065)
@@ -1,6 +1,7 @@
-<classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY">
+<classloading xmlns="urn:jboss:classloading:1.0">
    <capabilities>
       <module name="test3"/>
+      <package name="a.b.c"/>
    </capabilities>
 </classloading>
       

Modified: projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment5/META-INF/jboss-classloading.xml
===================================================================
--- projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment5/META-INF/jboss-classloading.xml	2010-03-08 15:17:59 UTC (rev 102064)
+++ projects/jboss-deployers/trunk/deployers-vfs/src/test/resources/classloader/deployment5/META-INF/jboss-classloading.xml	2010-03-08 15:25:05 UTC (rev 102065)
@@ -1,6 +1,7 @@
-<classloading xmlns="urn:jboss:classloading:1.0" export-all="NON_EMPTY">
+<classloading xmlns="urn:jboss:classloading:1.0">
    <capabilities>
       <module name="test5"/>
+      <package name="a.b.c"/>
    </capabilities>
 </classloading>