svn commit: r738266 - /incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java

[ge...@apache.org]

Author: gerdogdu
Date: Tue Jan 27 22:07:40 2009
New Revision: 738266

URL: http://svn.apache.org/viewvc?rev=738266&view=rev
Log:
OWB-62 web-beans.xml to beans.xml

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java?rev=738266&r1=738265&r2=738266&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java Tue Jan 27 22:07:40 2009
@@ -45,7 +45,7 @@
 {
     private WebBeansLogger logger = WebBeansLogger.getLogger(WebBeansScanner.class);
 
-    /** Location of the web-beans.xml files. */
+    /** Location of the beans.xml files. */
     private Map<String, InputStream> WEBBEANS_XML_LOCATIONS = new HashMap<String, InputStream>();
 
     /** Location of the ejb-jar.xml files */
@@ -66,7 +66,7 @@
 
     /**
      * Configure the Web Beans Container with deployment information and fills
-     * annotation database and web-beans.xml stream database.
+     * annotation database and beans.xml stream database.
      * 
      * @throws WebBeansConfigurationException if any run time exception occurs
      */
@@ -131,8 +131,8 @@
         Set<URL> listURL = new HashSet<URL>();
         URL[] urls = null;
 
-        // Root with web-beans.xml marker.
-        urls = ClasspathUrlFinder.findResourceBases("META-INF/web-beans.xml", WebBeansUtil.getCurrentClassLoader());
+        // Root with beans.xml marker.
+        urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml", WebBeansUtil.getCurrentClassLoader());
 
         if (urls != null)
         {
@@ -144,12 +144,12 @@
                 String fileDir = url.getFile();
                 if (fileDir.endsWith(".jar!/"))
                 {
-                    fileDir = fileDir.substring(0, fileDir.lastIndexOf("/")) + "/META-INF/web-beans.xml";
+                    fileDir = fileDir.substring(0, fileDir.lastIndexOf("/")) + "/META-INF/beans.xml";
                     addPath = new URL("jar:" + fileDir);
                 }
                 else
                 {
-                    addPath = new URL("file:" + url.getFile() + "META-INF/web-beans.xml");
+                    addPath = new URL("file:" + url.getFile() + "META-INF/beans.xml");
                 }
 
                 listURL.add(url);
@@ -164,7 +164,7 @@
         {
             for (URL ejbUrl : ejbUrls)
             {
-                // ok, web-beans.xml and ejb-jar.xml is in the same root
+                // ok, beans.xml and ejb-jar.xml is in the same root
                 if (listURL.contains(ejbUrl))
                 {
                     URL addPath = null;
@@ -191,7 +191,7 @@
 
     private URL createURLFromWARFile() throws Exception
     {
-        URL url = this.servletContext.getResource("/WEB-INF/web-beans.xml");
+        URL url = this.servletContext.getResource("/WEB-INF/beans.xml");
 
         if (url != null)
         {
@@ -204,7 +204,7 @@
     }
 
     /**
-     * Gets list of stream that points to the web-beans.xml file in the specific
+     * Gets list of stream that points to the beans.xml file in the specific
      * locations.
      * 
      * @return list of stream