[jboss-cvs] jboss-seam/src/main/org/jboss/seam/deployment ...

[Gavin King]

  User: gavin   
  Date: 06/11/20 18:44:02

  Modified:    src/main/org/jboss/seam/deployment  Scanner.java
  Log:
  fix for directories
  
  Revision  Changes    Path
  1.19      +8 -2      jboss-seam/src/main/org/jboss/seam/deployment/Scanner.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Scanner.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/deployment/Scanner.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- Scanner.java	16 Nov 2006 17:25:05 -0000	1.18
  +++ Scanner.java	20 Nov 2006 23:44:02 -0000	1.19
  @@ -1,4 +1,4 @@
  -//$Id: Scanner.java,v 1.18 2006/11/16 17:25:05 gavin Exp $
  +//$Id: Scanner.java,v 1.19 2006/11/20 23:44:02 gavin Exp $
   package org.jboss.seam.deployment;
   
   import java.io.DataInputStream;
  @@ -73,7 +73,13 @@
               }
               else
               {
  -               urlPath = new File(urlPath).getParent();
  +               File dirOrArchive = new File(urlPath);
  +               if ( resourceName.lastIndexOf('/')>0 )
  +               {
  +                  //for META-INF/components.xml
  +                  dirOrArchive = dirOrArchive.getParentFile();
  +               }
  +               urlPath = dirOrArchive.getParent();
               }
               log.info("scanning: " + urlPath);
               File file = new File(urlPath);