split up services between filtered

Author: lprimak

appserver/web/weld-integration/src/main/java/org/glassfish/weld/BeanDeploymentArchiveImpl.java

@@ -217,7 +217,7 @@ void initializeFromOriginal() {
             this.weldBootstrap = context.getTransientAppMetaData(WELD_BOOTSTRAP, WeldBootstrap.class);
             this.moduleClasses = getOriginal().moduleClasses;
             this.beanClasses = getOriginal().beanClasses;
-            this.simpleServiceRegistry = getOriginal().simpleServiceRegistry;
+            getServices().addAll(getOriginal().getServices().entrySet());
             this.moduleClassLoaderForBDA = getOriginal().moduleClassLoaderForBDA;
             this.ejbDescImpls = new LinkedHashSet<>(getOriginal().ejbDescImpls);
             if (this.itMap == null) {

appserver/web/weld-integration/src/main/java/org/glassfish/weld/DeploymentImpl.java

@@ -190,7 +190,7 @@ public DeploymentImpl(ReadableArchive archive,
 
         this.context = currentDeploymentContext.get();
         this.archiveFactory = currentDeployment.get().archiveFactory;
-        this.simpleServiceRegistry = currentDeployment.get().simpleServiceRegistry;
+        getServices().addAll(currentDeployment.get().getServices().entrySet());
         this.injectionManager = currentDeployment.get().injectionManager;
         this.logger = currentDeployment.get().logger;
         this.deployedEjbs = currentDeployment.get().deployedEjbs;