svn commit: r1074191 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/config/ webbeans-spi/src/main/java/org/apache/webbeans/spi/ webbeans-web/src/main/java/org/apache/webbeans/web/scanner/

[struberg]

Author: struberg
Date: Thu Feb 24 15:46:38 2011
New Revision: 1074191

URL: http://svn.apache.org/viewvc?rev=1074191&view=rev
Log:
OWB-526 fix WebScannerService and improve docs

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
    
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ScannerService.java
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1074191&r1=1074190&r2=1074191&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
 Thu Feb 24 15:46:38 2011
@@ -544,12 +544,11 @@ public class BeansDeployer
     }
     
     /**
-     * Discovers and deploys classes from XML.
-     * 
-     * NOTE : Currently XML file is just used for configuring.
+     * Discovers and deploys alternatives, interceptors and decorators from 
XML.
      * 
      * @param scanner discovery scanner
-     * @throws WebBeansDeploymentException if exception
+     *
+     * @throws WebBeansDeploymentException if a problem occurs
      */
     protected void deployFromXML(ScannerService scanner) throws 
WebBeansDeploymentException
     {

Modified: 
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ScannerService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ScannerService.java?rev=1074191&r1=1074190&r2=1074191&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ScannerService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/ScannerService.java
 Thu Feb 24 15:46:38 2011
@@ -22,14 +22,16 @@ import java.util.Set;
 
 
 /**
- * This SPI is for abstracting the class scanning.  
+ * <p>This SPI is for abstracting the class scanning.</p>
  *
- * In a production environment Many different modules need to perform 
+ * <p>In a production environment Many different modules need to perform
  * class scanning (EJB, JSF, JPA, ...). This SPI allows us to only have one 
  * central class scanner for the whole application server
- * which only performs the scanning once at startup of each WebApp.
- * 
- * @version $Rev$ $Date$
+ * which only performs the scanning once at startup of each WebApp.</p>
+ *
+ * <p>All URL path Strings in this interface contain the the protocol,
+ * e.g. 'file:/...' we get directly from {@link 
java.net.URL#toExternalForm()}</p>
+ *
  */
 public interface ScannerService
 {

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java?rev=1074191&r1=1074190&r2=1074191&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/scanner/WebScannerService.java
 Thu Feb 24 15:46:38 2011
@@ -147,8 +147,6 @@ public class WebScannerService extends A
                 }
 
                 listURL.add(url);
-
-                addWebBeansXmlLocation(addPath);
             }
         }