/*
 * Copyright 2017 Hammock and its contributors
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 * implied.
 *
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package ws.ament.hammock.bootstrap.weld3;

import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;
import org.jboss.weld.environment.se.Weld;
import org.jboss.weld.environment.se.WeldContainer;
import org.jboss.weld.environment.servlet.Listener;
import org.jboss.weld.environment.servlet.WeldServletLifecycle;
import org.jboss.weld.manager.BeanManagerImpl;
import ws.ament.hammock.bootstrap.Bootstrapper;
import ws.ament.hammock.web.api.WebServer;

import javax.enterprise.inject.spi.CDI;

import static org.jboss.weld.environment.servlet.Container.CONTEXT_PARAM_CONTAINER_CLASS;

public class Weld3Bootstrapper implements Bootstrapper{
    private Weld weld;
    private WeldContainer container;

    public Weld3Bootstrapper() {
        weld = new Weld(RegistrySingletonProvider.STATIC_INSTANCE);
    }

    @Override
    public void start() {
        container = weld.initialize();
    }

    @Override
    public void stop() {
        container.close();
    }

    @Override
    public void configure(WebServer webServer) {
        BeanManagerImpl beanManager = CDI.current().select(BeanManagerImpl.class).get();
        webServer.addServletContextAttribute(WeldServletLifecycle.BEAN_MANAGER_ATTRIBUTE_NAME, beanManager);
        webServer.addServletContextAttribute(org.jboss.weld.Container.CONTEXT_ID_KEY, beanManager.getContextId());
        webServer.addInitParameter(CONTEXT_PARAM_CONTAINER_CLASS, HammockContainer.class.getName());
        webServer.addListener(Listener.class);
    }
}

@@ -655,174 +655,8 @@
 3;%0A%0A
-import org.jboss.weld.bootstrap.api.helpers.RegistrySingletonProvider;%0Aimport org.jboss.weld.environment.se.Weld;%0Aimport org.jboss.weld.environment.se.WeldContainer;%0A
 impo
@@ -906,16 +906,121 @@
 erver;%0A%0A
+import javax.enterprise.inject.se.SeContainer;%0Aimport javax.enterprise.inject.se.SeContainerInitializer;%0A
 import j
@@ -1215,17 +1215,31 @@
 ate 
-Weld weld
+SeContainer seContainer
 ;%0A  
@@ -1248,20 +1248,18 @@
 private 
-Weld
+Se
 Containe
@@ -1259,24 +1259,48 @@
 ontainer
- contain
+Initializer seContainerInitializ
 er;%0A%0A   
@@ -1341,65 +1341,68 @@
     
-weld = new Weld(RegistrySingletonProvider.STATIC_INSTANCE
+seContainerInitializer = SeContainerInitializer.newInstance(
 );%0A 
@@ -1447,33 +1447,35 @@
 art() %7B%0A        
-c
+seC
 ontainer = weld.
@@ -1469,20 +1469,38 @@
 ainer = 
-weld
+seContainerInitializer
 .initial
@@ -1560,17 +1560,19 @@
         
-c
+seC
 ontainer

Fix for #77 swap out native Weld calls for CDI based calls.