[jboss-cvs] JBossAS SVN: r84195 - in branches/Branch_5_0: tomcat/src/main/org/jboss/web/tomcat/service/deployers and 1 other directory.

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

Author: alesj
Date: 2009-02-13 17:13:50 -0500 (Fri, 13 Feb 2009)
New Revision: 84195

Modified:
   branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
   branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
Log:
Work on interfaces.

Modified: branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java
===================================================================
--- branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-13 22:05:06 UTC (rev 84194)
+++ branches/Branch_5_0/server/src/main/org/jboss/web/deployers/AbstractWarDeployer.java	2009-02-13 22:13:50 UTC (rev 84195)
@@ -364,7 +364,7 @@
                List<VirtualFile> classpathVFs = vfsUnit.getClassPath();
                if (classpathVFs != null)
                {
-                  ArrayList<URL> classpath = new ArrayList<URL>();
+                  List<URL> classpath = new ArrayList<URL>();
                   for (VirtualFile vf : classpathVFs)
                   {
                      try

Modified: branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2009-02-13 22:05:06 UTC (rev 84194)
+++ branches/Branch_5_0/tomcat/src/main/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2009-02-13 22:13:50 UTC (rev 84195)
@@ -22,9 +22,7 @@
 package org.jboss.web.tomcat.service.deployers;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLDecoder;
@@ -37,7 +35,6 @@
 import java.util.List;
 import java.util.Set;
 import java.util.zip.ZipFile;
-
 import javax.management.Attribute;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -501,14 +498,14 @@
 
    public Loader getWebLoader(DeploymentUnit unit, JBossWebMetaData metaData, ClassLoader loader, URL rl) throws MalformedURLException
    {
-      Loader webLoader = null;
-
+      Loader webLoader;
+      
       /*
        * If we are using the jboss class loader we need to augment its path to include the WEB-INF/{lib,classes} dirs or
        * else scoped class loading does not see the war level overrides. The call to setWarURL adds these paths to the
        * deployment UCL.
        */
-      ArrayList<URL> classpath = (ArrayList<URL>)unit.getAttachment("org.jboss.web.expandedWarClasspath");
+      List<URL> classpath = unit.getAttachment("org.jboss.web.expandedWarClasspath", List.class);
       if (classpath == null && unit instanceof VFSDeploymentUnit)
       {
          VFSDeploymentUnit vfsUnit = (VFSDeploymentUnit)unit;
@@ -523,9 +520,8 @@
             classpath = new ArrayList<URL>();
             classpath.add(vfsURL);
          }
-         catch (Exception e)
+         catch (Exception ignored)
          {
-
          }
       }