Switch to embedded Infinispan 8.2

pom.xml

@@ -38,7 +38,7 @@
     <cdi.runtime>runtime</cdi.runtime>
     <cdi.compile>compile</cdi.compile>
     <picketlink.version>2.5.4.SP4</picketlink.version>
-    <infinispan.version>5.2.18.Final</infinispan.version>
+    <infinispan.version>8.2.2.Final</infinispan.version>
     <lombok.version>1.16.6</lombok.version>
     <weld.version>1.1.31.Final</weld.version>
     <weld.se.version>${weld.version}</weld.se.version>

zanata-war/pom.xml

@@ -1898,7 +1898,6 @@
       <groupId>org.infinispan</groupId>
       <artifactId>infinispan-core</artifactId>
       <version>${infinispan.version}</version>
-      <scope>provided</scope>
     </dependency>
 
     <!-- These two are being explicitly added as jboss-as-parent

zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java → zanata-war/src/main/java/org/zanata/cache/CacheManagerProducer.java

@@ -20,39 +20,33 @@
  */
 package org.zanata.cache;
 
-import lombok.extern.slf4j.Slf4j;
-import org.infinispan.manager.CacheContainer;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
+import java.io.IOException;
+
 import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
 import javax.enterprise.inject.Produces;
-import org.zanata.util.ServiceLocator;
+
+import org.infinispan.manager.DefaultCacheManager;
+import org.infinispan.manager.EmbeddedCacheManager;
 import org.zanata.util.Zanata;
 
-import javax.naming.NamingException;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * 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")
 @ApplicationScoped
 @Slf4j
-public class CacheContainerProducer {
-
-    private static final String CACHE_CONTAINER_NAME =
-            "java:jboss/infinispan/container/zanata";
-
-    @Resource(lookup = CACHE_CONTAINER_NAME)
-    private CacheContainer container;
+public class CacheManagerProducer {
+    private static final String CONFIG_PATH = System.getProperty("zanata.infinispan.cfg", "zanata-infinispan.xml");
 
     @Produces
     @ApplicationScoped
     @Zanata
-    public CacheContainer getCacheContainer() {
-        return container;
+    public EmbeddedCacheManager getCacheManager() throws IOException {
+        EmbeddedCacheManager manager = new DefaultCacheManager(CONFIG_PATH);
+        return manager;
     }
 }

zanata-war/src/main/resources/zanata-infinispan.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<infinispan
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="urn:infinispan:config:8.2 http://infinispan.org/schemas/infinispan-config-8.2.xsd"
+  xmlns="urn:infinispan:config:8.2">
+  <!--
+   Zanata multi-purpose caches.
+   -->
+  <cache-container name="zanata" default-cache="default" statistics="true" >
+    <local-cache name="default">
+      <transaction mode="NON_XA"/>
+      <eviction max-entries="10000" strategy="LRU"/>
+      <expiration max-idle="100000"/>
+    </local-cache>
+  </cache-container>
+
+</infinispan>

zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

@@ -17,7 +17,6 @@
     <dependencies>
 
       <!-- start of unsupported modules -->
-      <module name="org.infinispan" />
       <!-- needed by arquillian test -->
       <module name="com.h2database.h2" />
       <!-- end of unsupported modules -->
@@ -32,7 +31,6 @@
       <!-- end of deprecated modules -->
 
       <!-- other modules -->
-      <module name="org.infinispan.commons" optional="true" />
       <module name="javax.annotation.api" />
       <!-- not needed for wildfly: -->
       <module name="javax.ejb.api" />