[jboss-cvs] JBossAS SVN: r96002 - projects/demos/microcontainer/trunk/classloader/src/main/java/org/jboss/demos/classloader/deployers.

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

Author: alesj
Date: 2009-11-04 10:23:38 -0500 (Wed, 04 Nov 2009)
New Revision: 96002

Modified:
   projects/demos/microcontainer/trunk/classloader/src/main/java/org/jboss/demos/classloader/deployers/DecrypterClassLoaderPolicyModule.java
Log:
Reuse new getters.

Modified: projects/demos/microcontainer/trunk/classloader/src/main/java/org/jboss/demos/classloader/deployers/DecrypterClassLoaderPolicyModule.java
===================================================================
--- projects/demos/microcontainer/trunk/classloader/src/main/java/org/jboss/demos/classloader/deployers/DecrypterClassLoaderPolicyModule.java	2009-11-04 15:15:07 UTC (rev 96001)
+++ projects/demos/microcontainer/trunk/classloader/src/main/java/org/jboss/demos/classloader/deployers/DecrypterClassLoaderPolicyModule.java	2009-11-04 15:23:38 UTC (rev 96002)
@@ -21,16 +21,11 @@
  */
 package org.jboss.demos.classloader.deployers;
 
-import java.util.List;
-import java.util.Set;
-
 import org.jboss.classloading.spi.vfs.policy.VFSClassLoaderPolicy;
 import org.jboss.demos.classloader.crypt.Decrypter;
 import org.jboss.demos.classloader.policy.CrypterClassLoaderPolicy;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer;
 import org.jboss.deployers.vfs.plugins.classloader.VFSDeploymentClassLoaderPolicyModule;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * @author <a href="mailto:ales.justin at jboss.org">Ales Justin</a>
@@ -39,36 +34,17 @@
 {
    private Decrypter decrypter;
 
-   /** No roots */
-   private static final VirtualFile[] NO_ROOTS = new VirtualFile[0];
-
-   /** The cached roots */
-   private VirtualFile[] vfsRoots;
-
-   /** The excluded roots */
-   private VirtualFile[] excludedRoots;
-
    @SuppressWarnings("unchecked")
    public DecrypterClassLoaderPolicyModule(DeploymentUnit unit, Decrypter decrypter)
    {
       super(unit);
-
       this.decrypter = decrypter;
-
-      List<VirtualFile> vfsClassPath = unit.getAttachment(VFSClassLoaderClassPathDeployer.VFS_CLASS_PATH, List.class);
-      if (vfsClassPath == null)
-         vfsRoots = NO_ROOTS;
-      else
-         vfsRoots = vfsClassPath.toArray(new VirtualFile[vfsClassPath.size()]);
-      Set<VirtualFile> vfsExcludes = unit.getAttachment(VFSClassLoaderClassPathDeployer.VFS_EXCLUDES, Set.class);
-      if (vfsExcludes != null)
-         excludedRoots = vfsExcludes.toArray(new VirtualFile[vfsExcludes.size()]);
    }
 
    @Override
    protected VFSClassLoaderPolicy determinePolicy()
    {
-      CrypterClassLoaderPolicy policy = new CrypterClassLoaderPolicy(getContextName(), vfsRoots, excludedRoots, decrypter);
+      CrypterClassLoaderPolicy policy = new CrypterClassLoaderPolicy(getContextName(), getRoots(), getExcludedRoots(), decrypter);
       String[] packageNames = getPackageNames();
       policy.setExportedPackages(packageNames);
       policy.setIncluded(getIncluded());