Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/ExtensionErrorsTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/ExtensionErrorsTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/ExtensionErrorsTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/ExtensionErrorsTest.java Wed Feb 23 18:55:55 2011 @@ -35,7 +35,7 @@ public class ExtensionErrorsTest extends @Test(expected=WebBeansConfigurationException.class) public void testAfterBeanDiscoveryError() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -55,7 +55,7 @@ public class ExtensionErrorsTest extends @Test(expected=WebBeansConfigurationException.class) public void testAfterBeanDeploymentValidationError() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class);
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddBeanTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddBeanTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddBeanTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddBeanTest.java Wed Feb 23 18:55:55 2011 @@ -34,7 +34,7 @@ public class PortableAddBeanTest extends @Test public void testAddBeanExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddObserverMethodTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddObserverMethodTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddObserverMethodTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableAddObserverMethodTest.java Wed Feb 23 18:55:55 2011 @@ -34,7 +34,7 @@ public class PortableAddObserverMethodTe @Test public void testAddBeanExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableEventTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableEventTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableEventTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/portable/events/PortableEventTest.java Wed Feb 23 18:55:55 2011 @@ -18,7 +18,6 @@ */ package org.apache.webbeans.newtests.portable.events; -import java.net.URL; import java.util.ArrayList; import java.util.Collection; @@ -41,7 +40,7 @@ public class PortableEventTest extends A @Test public void testAppleExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -58,7 +57,7 @@ public class PortableEventTest extends A public void testNotAppleExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -76,7 +75,7 @@ public class PortableEventTest extends A public void testRawTypeExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -94,7 +93,7 @@ public class PortableEventTest extends A public void testTypeVariableExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -112,7 +111,7 @@ public class PortableEventTest extends A public void testwildcardExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -130,7 +129,7 @@ public class PortableEventTest extends A public void testWrongTypeVariableExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); @@ -148,7 +147,7 @@ public class PortableEventTest extends A public void testWrongWildcardTypeExtension() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Apple.class); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/specializes/SpecializesProducer1Test.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/specializes/SpecializesProducer1Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/specializes/SpecializesProducer1Test.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/producer/specializes/SpecializesProducer1Test.java Wed Feb 23 18:55:55 2011 @@ -42,7 +42,7 @@ public class SpecializesProducer1Test ex @Test public void testSpecializedProducer1() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(SpecializesProducer1SuperClazz.class); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/GetterStringInjectorTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/GetterStringInjectorTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/GetterStringInjectorTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/GetterStringInjectorTest.java Wed Feb 23 18:55:55 2011 @@ -41,7 +41,7 @@ public class GetterStringInjectorTest ex @SuppressWarnings("unchecked") public void testGetterStringInjector() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(GetterStringProducerBean.class); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/InnerClassInjectStringProducerTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/InnerClassInjectStringProducerTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/InnerClassInjectStringProducerTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/profields/InnerClassInjectStringProducerTest.java Wed Feb 23 18:55:55 2011 @@ -43,7 +43,7 @@ public class InnerClassInjectStringProdu @SuppressWarnings("unchecked") public void testInnerClassProducerInjection() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(StringProducerBean.class); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/MethodProducer1Test.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/MethodProducer1Test.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/MethodProducer1Test.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/MethodProducer1Test.java Wed Feb 23 18:55:55 2011 @@ -48,7 +48,7 @@ public class MethodProducer1Test extends @SuppressWarnings("unchecked") public void testPersonProducer() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(MethodTypeProduces1.class); @@ -80,7 +80,7 @@ public class MethodProducer1Test extends */ public void testProducerAddedByWebBeansAnnotatedTypeUtil() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/promethods/PersonProducerTest.java Wed Feb 23 18:55:55 2011 @@ -45,7 +45,7 @@ public class PersonProducerTest extends @SuppressWarnings("unchecked") public void testPersonProducer() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Person.class); @@ -73,7 +73,7 @@ public class PersonProducerTest extends @SuppressWarnings("unchecked") public void testNullPersonProducer() { - Collection<URL> beanXmls = new ArrayList<URL>(); + Collection<String> beanXmls = new ArrayList<String>(); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Person.class); Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/AlternativeSpecializesProducerTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/AlternativeSpecializesProducerTest.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/AlternativeSpecializesProducerTest.java (original) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/AlternativeSpecializesProducerTest.java Wed Feb 23 18:55:55 2011 @@ -42,8 +42,8 @@ public class AlternativeSpecializesProdu public void testAlternativeSpecializeBean() { - Collection<URL> beanXmls = new ArrayList<URL>(); - beanXmls.add(getXMLUrl(PACKAGE_NAME, "AlternativeSpecializesProducer")); + Collection<String> beanXmls = new ArrayList<String>(); + beanXmls.add(getXmlPath(PACKAGE_NAME, "AlternativeSpecializesProducer")); Collection<Class<?>> beanClasses = new ArrayList<Class<?>>(); beanClasses.add(Pen.class); Modified: openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java (original) +++ openwebbeans/trunk/webbeans-osgi/src/main/java/org/apache/webbeans/osgi/scanner/OsgiMetaDataScannerService.java Wed Feb 23 18:55:55 2011 @@ -60,8 +60,8 @@ public class OsgiMetaDataScannerService /** All classes which have to be scanned for Bean information */ private Set<Class<?>> beanClasses = new HashSet<Class<?>>(); - /** the URLs of all META-INF/beans.xml files */ - private Set<URL> beanXMLs = new HashSet<URL>(); + /** the paths of all META-INF/beans.xml files */ + private Set<String> beanXMLs = new HashSet<String>(); /**contains all the JARs we found with valid beans.xml in it */ private Set<String> beanArchiveJarNames = new HashSet<String>(); @@ -164,17 +164,17 @@ public class OsgiMetaDataScannerService public void foundInDirectory(Bundle bundle, String basePath, URL url) throws Exception { logger.info("adding the following beans.xml URL: " + url); - beanXMLs.add(url); + beanXMLs.add(url.toExternalForm()); } public void foundInJar(Bundle bundle, String jarName, ZipEntry entry, InputStream in) throws Exception { URL jarURL = bundle.getEntry(jarName); - URL beansUrl = new URL("jar:" + jarURL.toString() + "!/" + entry.getName()); + String beansUrlPath = "jar:" + jarURL.toString() + "!/" + entry.getName(); - logger.info("adding the following beans.xml URL: " + beansUrl); + logger.info("adding the following beans.xml URL: " + beansUrlPath); - beanXMLs.add(beansUrl); + beanXMLs.add(beansUrlPath); beanArchiveJarNames.add(jarName); } @@ -199,15 +199,13 @@ public class OsgiMetaDataScannerService } logger.info("adding the following WEB-INF/beans.xml URL: " + webBeansXml); - beanXMLs.add(webBeansXml); + beanXMLs.add(webBeansXml.toExternalForm()); webBeansXmlFound = true; - } - } @Override - public Set<URL> getBeanXmls() + public Set<String> getBeanXmls() { return beanXMLs; } Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java (original) +++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java Wed Feb 23 18:55:55 2011 @@ -19,6 +19,7 @@ package org.apache.webbeans.test.tck; import java.net.URL; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.Properties; @@ -96,7 +97,7 @@ public class StandaloneContainersImpl im } - public boolean deployInternal(Iterable<Class<?>> classes, Iterable<URL> beansXmls) + public boolean deployInternal(Iterable<Class<?>> classes, Iterable<String> beansXmls) { try { @@ -134,7 +135,7 @@ public class StandaloneContainersImpl im discovery.addBeanClass(it.next()); } - Iterator<URL> itUrl = beansXmls.iterator(); + Iterator<String> itUrl = beansXmls.iterator(); while (itUrl.hasNext()) { discovery.addBeanXml(itUrl.next()); @@ -211,7 +212,16 @@ public class StandaloneContainersImpl im return false; } - return deployInternal(classes, xmls); + Collection<String> xmlPaths = new ArrayList<String>(); + if (xmls != null) + { + for(URL url : xmls) + { + xmlPaths.add(url.toExternalForm()); + } + } + + return deployInternal(classes, xmlPaths); } /** Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java?rev=1073881&r1=1073880&r2=1073881&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java (original) +++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/mock/TCKMetaDataDiscoveryImpl.java Wed Feb 23 18:55:55 2011 @@ -56,7 +56,7 @@ public class TCKMetaDataDiscoveryImpl ex } } - public void addBeanXml(URL url) + public void addBeanXml(String url) { Asserts.assertNotNull(url); addWebBeansXmlLocation(url); 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=1073881&r1=1073880&r2=1073881&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 Wed Feb 23 18:55:55 2011 @@ -18,7 +18,6 @@ */ package org.apache.webbeans.spi; -import java.net.URL; import java.util.Set; @@ -52,7 +51,7 @@ public interface ScannerService * in the deployment archives. * @return the locations of the beans.xml files. */ - public Set<URL> getBeanXmls(); + public Set<String> getBeanXmls(); /** * Gets beans classes that are found in the 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=1073881&r1=1073880&r2=1073881&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 Wed Feb 23 18:55:55 2011 @@ -26,11 +26,10 @@ import javax.servlet.ServletContext; import org.apache.webbeans.config.OWBLogConst; import org.apache.webbeans.corespi.scanner.AbstractMetaDataDiscovery; +import org.apache.webbeans.corespi.scanner.AnnotationDB; import org.apache.webbeans.corespi.se.BeansXmlAnnotationDB; import org.apache.webbeans.logger.WebBeansLogger; import org.apache.webbeans.util.WebBeansUtil; -import org.scannotation.AnnotationDB; -import org.scannotation.ClasspathUrlFinder; import org.scannotation.WarUrlFinder; /** @@ -61,9 +60,9 @@ public class WebScannerService extends A { if (!configure) { - Set<URL> arcs = getArchieves(); - URL[] urls = new URL[arcs.size()]; - arcs.toArray(urls); + Set<String> arcs = getArchives(); + String[] urls = new String[arcs.size()]; + urls = arcs.toArray(urls); getAnnotationDB().scanArchives(urls); @@ -79,34 +78,36 @@ public class WebScannerService extends A } - /* Collects all URLs */ - private Set<URL> getArchieves() throws Exception + /** + * @return all beans.xml paths + */ + private Set<String> getArchives() throws Exception { - Set<URL> lists = createURLFromMarkerFile(); - URL warUrl = createURLFromWARFile(); + Set<String> lists = createURLFromMarkerFile(); + String warUrlPath = createURLFromWARFile(); - if (warUrl != null) + if (warUrlPath != null) { - lists.add(warUrl); + lists.add(warUrlPath); } return lists; } /* Creates URLs from the marker file */ - protected Set<URL> createURLFromMarkerFile() throws Exception + protected Set<String> createURLFromMarkerFile() throws Exception { - Set<URL> listURL = new HashSet<URL>(); + Set<String> listURL = new HashSet<String>(); // Root with beans.xml marker. - URL[] urls = ClasspathUrlFinder.findResourceBases("META-INF/beans.xml", WebBeansUtil.getCurrentClassLoader()); + String[] urls = findBeansXmlBases("META-INF/beans.xml", WebBeansUtil.getCurrentClassLoader()); if (urls != null) { - URL addPath; - for (URL url : urls) + String addPath; + for (String url : urls) { - String fileDir = url.getFile(); + String fileDir = new URL(url).getFile(); if (fileDir.endsWith(".jar!/")) { fileDir = fileDir.substring(0, fileDir.lastIndexOf("/")) + "/META-INF/beans.xml"; @@ -124,17 +125,18 @@ public class WebScannerService extends A logger.debug("OpenWebBeans found the following url while doing web scanning: " + fileDir); } - addPath = new URL("jar:" + fileDir); + addPath = "jar:" + fileDir; if (logger.wblWillLogDebug()) { logger.debug("OpenWebBeans added the following jar based path while doing web scanning: " + - addPath.toString()); + addPath); } } else { - addPath = new URL("file:" + url.getFile() + "META-INF/beans.xml"); + //X TODO check! + addPath = "file:" + url + "META-INF/beans.xml"; if (logger.wblWillLogDebug()) { @@ -154,12 +156,13 @@ public class WebScannerService extends A } /** - * Returns <code>URL</code> of the web application class path. + * Returns the web application class path if it contains + * a beans.xml marker file. * - * @return <code>URL</code> of the web application class path + * @return the web application class path * @throws Exception if any exception occurs */ - protected URL createURLFromWARFile() throws Exception + protected String createURLFromWARFile() throws Exception { if (servletContext == null) { @@ -171,16 +174,22 @@ public class WebScannerService extends A if (url != null) { - addWebBeansXmlLocation(url); - URL resourceuUrl = WarUrlFinder.findWebInfClassesPath(this.servletContext); + addWebBeansXmlLocation(url.toExternalForm()); + URL resourceUrl = WarUrlFinder.findWebInfClassesPath(this.servletContext); + + if (resourceUrl == null) + { + return null; + } + //set resource to beans.xml mapping AnnotationDB annotationDB = getAnnotationDB(); if(annotationDB instanceof BeansXmlAnnotationDB) { - ((BeansXmlAnnotationDB)annotationDB).setResourceBeansXml(resourceuUrl, url); + ((BeansXmlAnnotationDB)annotationDB).setResourceBeansXml(resourceUrl.toExternalForm(), url.toExternalForm()); } - return resourceuUrl; + return resourceUrl.toExternalForm(); } return null;
