/*
 * Copyright 2014, Red Hat, Inc. and individual contributors as indicated by the
 * @author tags. See the copyright.txt file in the distribution for a full
 * listing of individual contributors.
 *
 * This is free software; you can redistribute it and/or modify it under the
 * terms of the GNU Lesser General Public License as published by the Free
 * Software Foundation; either version 2.1 of the License, or (at your option)
 * any later version.
 *
 * This software is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
 * details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this software; if not, write to the Free Software Foundation,
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF
 * site: http://www.fsf.org.
 */
package org.zanata.cache;

import lombok.extern.slf4j.Slf4j;
import org.infinispan.manager.CacheContainer;
import javax.annotation.PostConstruct;
import javax.inject.Named;
import javax.enterprise.inject.Produces;
import org.zanata.util.ServiceLocator;
import org.zanata.util.Zanata;

import javax.naming.NamingException;

/**
 * Produces a cache container for injection.
 * @author Carlos Munoz <a
 *         href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
 * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
 */
@Named("cacheContainer")
@javax.enterprise.context.ApplicationScoped
@Slf4j
public class CacheContainerProducer {

    private static final String CACHE_CONTAINER_NAME =
            "java:jboss/infinispan/container/zanata";

    private CacheContainer container;

    @PostConstruct
    public void initialize() {
        try {
            container =
                    ServiceLocator.instance().getJndiComponent(
                            CACHE_CONTAINER_NAME,
                            CacheContainer.class);
        } catch (NamingException e) {
            String msg = "A cache container with name " +
                    "'" + CACHE_CONTAINER_NAME + "' " +
                    "has not been configured.";
            log.warn(msg);
            throw new RuntimeException(msg, e);
        }
    }

    @Produces
    @Zanata
    public CacheContainer getCacheContainer() {
        return container;
    }
}

@@ -1117,16 +1117,101 @@
 struct;%0A
+import javax.annotation.Resource;%0Aimport javax.enterprise.context.ApplicationScoped;%0A
 import j
@@ -1642,33 +1642,8 @@
 %22)%0A@
-javax.enterprise.context.
 Appl
@@ -1820,222 +1820,26 @@
     
-private CacheContainer container;%0A%0A    @PostConstruct%0A    public void initialize() %7B%0A        try %7B%0A            container =%0A                    ServiceLocator.instance().getJndiComponent(%0A                           
+@Resource(lookup =
  CAC
@@ -1859,366 +1859,85 @@
 NAME
-,
+)
 %0A    
-                        CacheContainer.class);%0A        %7D catch (NamingException e) %7B%0A            String msg = %22A cache container with name %22 +%0A                    %22'%22 + CACHE_CONTAINER_NAME + %22' %22 +%0A                    %22has not been configured.%22;%0A            log.warn(msg);%0A            throw new RuntimeException(msg, e);%0A        %7D%0A    %7D%0A%0A    @Produces
+private CacheContainer container;%0A%0A    @Produces%0A    @ApplicationScoped
 %0A   

Use @Resource injection in CacheContainerProducer