svn commit: r1152080 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java

[ge...@apache.org]

Author: genspring
Date: Fri Jul 29 02:52:49 2011
New Revision: 1152080

URL: http://svn.apache.org/viewvc?rev=1152080&view=rev
Log:
api changed in owb side.

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java?rev=1152080&r1=1152079&r2=1152080&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/cdi/OsgiMetaDataScannerService.java Fri Jul 29 02:52:49 2011
@@ -65,7 +65,7 @@ public class OsgiMetaDataScannerService 
     private Set<Class<?>> beanClasses = new HashSet<Class<?>>();
 
     /** the URLs of all META-INF/beans.xml files */
-    private Set<String> beanXMLs = new HashSet<String>();
+    private Set<URL> beanXMLs = new HashSet<URL>();
 
     /**contains all the JARs we found with valid beans.xml in it */
     private Set<String> beanArchiveJarNames = new HashSet<String>();
@@ -97,7 +97,7 @@ public class OsgiMetaDataScannerService 
     public void release()
     {
         beanClasses = new HashSet<Class<?>>();
-        beanXMLs = new HashSet<String>();
+        beanXMLs = new HashSet<URL>();
         beanArchiveJarNames = new HashSet<String>();
     }    
     
@@ -193,7 +193,7 @@ public class OsgiMetaDataScannerService 
             public boolean foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception
             {
                 logger.info("adding the following beans.xml URL: " + url);
-                beanXMLs.add(url.toString());
+                beanXMLs.add(url);
                 return true;
             }
 
@@ -204,7 +204,7 @@ public class OsgiMetaDataScannerService 
 
                 logger.info("adding the following beans.xml URL: " + beansUrl);
 
-                beanXMLs.add(beansUrl.toString());
+                beanXMLs.add(beansUrl);
                 beanArchiveJarNames.add(jarName);
                 return true;
             }
@@ -230,7 +230,7 @@ public class OsgiMetaDataScannerService 
             }
 
             logger.info("adding the following WEB-INF/beans.xml URL: " + webBeansXml);
-            beanXMLs.add(webBeansXml.toString());
+            beanXMLs.add(webBeansXml);
             webBeansXmlFound = true;
 
         }
@@ -238,7 +238,7 @@ public class OsgiMetaDataScannerService 
     }
 
     @Override
-    public Set<String> getBeanXmls()
+    public Set<URL> getBeanXmls()
     {
         return beanXMLs;
     }