svn commit: r1075225 - /geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java

[ge...@apache.org]

Author: genspring
Date: Mon Feb 28 07:26:28 2011
New Revision: 1075225

URL: http://svn.apache.org/viewvc?rev=1075225&view=rev
Log:
svn merge --non-interactive -c 1074421 https://svn.apache.org/repos/asf/geronimo/server/trunk,  Fix OWB plugins compilation failure caused by openwebbeans api change

Modified:
    geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java

Modified: geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java?rev=1075225&r1=1075224&r2=1075225&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java (original)
+++ geronimo/server/branches/3.0-M2/plugins/openwebbeans/geronimo-openwebbeans/src/main/java/org/apache/geronimo/openwebbeans/OsgiMetaDataScannerService.java Mon Feb 28 07:26:28 2011
@@ -64,7 +64,7 @@ public class OsgiMetaDataScannerService 
     private final Set<Class<?>> beanClasses = new HashSet<Class<?>>();
 
     /** the URLs of all META-INF/beans.xml files */
-    private final Set<URL> beanXMLs = new HashSet<URL>();
+    private final Set<String> beanXMLs = new HashSet<String>();
 
     /**contains all the JARs we found with valid beans.xml in it */
     private final Set<String> beanArchiveJarNames = new HashSet<String>();
@@ -179,7 +179,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);
+                beanXMLs.add(url.toString());
                 return true;
             }
 
@@ -190,7 +190,7 @@ public class OsgiMetaDataScannerService 
 
                 logger.info("adding the following beans.xml URL: " + beansUrl);
 
-                beanXMLs.add(beansUrl);
+                beanXMLs.add(beansUrl.toString());
                 beanArchiveJarNames.add(jarName);
                 return true;
             }
@@ -216,7 +216,7 @@ public class OsgiMetaDataScannerService 
             }
 
             logger.info("adding the following WEB-INF/beans.xml URL: " + webBeansXml);
-            beanXMLs.add(webBeansXml);
+            beanXMLs.add(webBeansXml.toString());
             webBeansXmlFound = true;
 
         }
@@ -224,7 +224,7 @@ public class OsgiMetaDataScannerService 
     }
 
     @Override
-    public Set<URL> getBeanXmls()
+    public Set<String> getBeanXmls()
     {
         return beanXMLs;
     }