OWB-1448 rework following feedback

Author: jgallimore

webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java

@@ -108,16 +108,13 @@
 import javax.enterprise.inject.spi.ObserverMethod;
 import javax.enterprise.inject.spi.Producer;
 
-import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLStreamHandler;
 import java.security.PrivilegedActionException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -1710,34 +1707,6 @@ protected void deployFromXML(ScannerService scanner)
         }
 
         logger.fine("Deploying configurations from XML has ended successfully.");
-
-        try
-        {
-            final URL url = new URL("openwebbeans", null, 0, "cdi-standalone", new URLStreamHandler()
-            {
-                @Override
-                protected URLConnection openConnection(URL u) throws IOException
-                {
-                    return null;
-                }
-            });
-
-            final BeanArchiveInformation beanArchiveInformation = beanArchiveService.getBeanArchiveInformation(url);
-            if (beanArchiveInformation != null)
-            {
-                configureDecorators(url, beanArchiveInformation.getDecorators());
-                configureInterceptors(url, beanArchiveInformation.getInterceptors());
-                configureAlternatives(url, beanArchiveInformation.getAlternativeClasses(), false);
-                configureAlternatives(url, beanArchiveInformation.getAlternativeStereotypes(), true);
-                configureAllowProxying(url, beanArchiveInformation.getAllowProxyingClasses());
-            }
-
-            logger.fine("Deploying embedded configurations has ended successfully.");
-        }
-        catch (Exception e)
-        {
-            logger.info("Error occurred: " + e.getMessage());
-        }
     }
 
     private void configureAlternatives(URL bdaLocation, List<String> alternatives, boolean isStereotype)

webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java

@@ -90,7 +90,7 @@ public abstract class AbstractMetaDataDiscovery implements BdaScannerService
      * We store this information since not all containers and storages do support
      * new URL(...).
      */
-    private final Map<String, URL> beanDeploymentUrls = new HashMap<>();
+    protected final Map<String, URL> beanDeploymentUrls = new HashMap<>();
 
     /**
      * for having proper scan mode 'SCOPED' support we need to know which bean class

webbeans-se/src/main/java/org/apache/openwebbeans/se/CDISeScannerService.java

@@ -34,9 +34,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
+import java.util.*;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -217,4 +215,17 @@ public boolean accept(String name)
             return accepts;
         }
     }
+
+    @Override
+    public Set<URL> getBeanXmls()
+    {
+        final Set<URL> result = new HashSet<>(super.getBeanXmls());
+        final URL embeddedUrl = beanDeploymentUrls.get(CDISeBeanArchiveService.EMBEDDED_URL);
+        if (embeddedUrl != null)
+        {
+            result.add(embeddedUrl);
+        }
+
+        return result;
+    }
 }