From 77bacd6659e7364d70b28d30e7f22f25d6f2c57a Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Wed, 17 Sep 2014 16:07:25 +1000
Subject: [PATCH] Split arquillian config into two profiles: jbosseap6 &
 wildfly81

---
 functional-test/pom.xml                       |   5 +-
 pom.xml                                       |  14 +-
 zanata-war/pom.xml                            | 324 ++++++++----
 zanata-war/src/test/resources/arquillian.xml  |  15 +-
 .../standalone-arquillian-wildfly.xml         | 472 ++++++++++++++++++
 ...andalone.xml => standalone-arquillian.xml} |   3 +-
 6 files changed, 728 insertions(+), 105 deletions(-)
 create mode 100644 zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
 rename zanata-war/src/test/resources/arquillian/{standalone.xml => standalone-arquillian.xml} (99%)

diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index ddb120b315..204548e3a9 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -308,14 +308,13 @@
 
   <profiles>
     <profile>
-      <id>wildfly</id>
+      <id>wildfly81</id>
       <activation>
         <property>
-          <name>wildfly</name>
+          <name>wildfly81</name>
         </property>
       </activation>
       <properties>
-        <wildfly.version>8.1.0.Final</wildfly.version>
         <cargo.container>wildfly8x</cargo.container>
         <cargo.installation>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</cargo.installation>
         <standalone.xml.file>standalone_wildfly.xml</standalone.xml.file>
diff --git a/pom.xml b/pom.xml
index e2fd705cea..140298b88f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
       <dependency>
         <groupId>org.jboss.arquillian</groupId>
         <artifactId>arquillian-bom</artifactId>
-        <version>1.1.1.Final</version>
+        <version>1.1.5.Final</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -1056,6 +1056,18 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>wildfly81</id>
+      <activation>
+        <property>
+          <name>wildfly81</name>
+        </property>
+      </activation>
+      <properties>
+        <wildfly.version>8.1.0.Final</wildfly.version>
+      </properties>
+    </profile>
   </profiles>
 
   <distributionManagement>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 06c30d59fd..b0688e4266 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -19,7 +19,6 @@
 
   <properties>
     <war.config.dir>${basedir}/src/etc</war.config.dir>
-    <containerId>jboss71x</containerId>
     <allow.deploy.skip>true</allow.deploy.skip>
 
     <!-- application properties -->
@@ -165,27 +164,6 @@
           </usedDependencies>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-arquillian-jboss-home</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <phase>pre-integration-test</phase>
-            <configuration>
-              <rules combine.self="override">
-                <requireProperty>
-                  <property>arquillian.jboss.home</property>
-                  <message xml:space="preserve">You must set the arquillian.jboss.home property to run integration tests</message>
-                </requireProperty>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
 
       <plugin>
         <groupId>com.ning.maven.plugins</groupId>
@@ -253,19 +231,6 @@
               <goal>run</goal>
             </goals>
           </execution>
-          <execution>
-            <id>prepare-arquillian-container</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <target>
-                <copy file="${project.basedir}/src/test/resources/arquillian/standalone.xml"
-                  tofile="${arquillian.jboss.home}/standalone/configuration/standalone.xml" />
-              </target>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -482,28 +447,6 @@
         </configuration>
       </plugin>
 
-      <!-- Configure Failsafe to run in integration-test/verify phase -->
-      <plugin>
-        <artifactId>maven-failsafe-plugin</artifactId>
-        <executions>
-          <!-- Container (Arquillian tests) -->
-          <execution>
-            <id>container-tests</id>
-            <goals>
-              <goal>integration-test</goal>
-              <goal>verify</goal>
-            </goals>
-            <configuration>
-              <includes>
-                <include>**/*ITCase.java</include>
-              </includes>
-              <testNGArtifactName>none:none</testNGArtifactName>
-              <runOrder>alphabetical</runOrder>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>l10n-maven-plugin</artifactId>
@@ -1032,6 +975,231 @@
       </build>
     </profile>
 
+    <profile>
+      <id>jbosseap6</id>
+      <activation>
+        <property>
+          <name>jbosseap6</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>prepare-arquillian-container</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <fail message="'arquillian.jboss.home' property must be set to run integration tests in this profile"
+                      unless="arquillian.jboss.home"/>
+                    <copy overwrite="true"
+                      file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian.xml"
+                      tofile="${arquillian.jboss.home}/standalone/configuration/standalone-arquillian.xml" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- Configure Failsafe to run in integration-test/verify phase -->
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+              <!-- Container (Arquillian tests) -->
+              <execution>
+                <id>container-tests</id>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <includes>
+                    <include>**/*ITCase.java</include>
+                  </includes>
+                  <testNGArtifactName>none:none</testNGArtifactName>
+                  <runOrder>alphabetical</runOrder>
+                  <forkCount>1</forkCount>
+                  <reuseForks>true</reuseForks>
+                  <systemPropertyVariables>
+                    <arquillian.launch>jbossas-managed</arquillian.launch>
+                  </systemPropertyVariables>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.jboss.as</groupId>
+          <artifactId>jboss-as-arquillian-container-managed</artifactId>
+          <version>${jboss.as.version}</version>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.jboss.logmanager</groupId>
+              <artifactId>jboss-logmanager</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>org.jboss.logmanager</groupId>
+              <artifactId>log4j-jboss-logmanager</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss.as</groupId>
+          <artifactId>jboss-as-arquillian-common</artifactId>
+          <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>org.jboss.logmanager</groupId>
+              <artifactId>log4j-jboss-logmanager</artifactId>
+            </exclusion>
+          </exclusions>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss.as</groupId>
+          <artifactId>jboss-as-controller-client</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.jboss.as</groupId>
+          <artifactId>jboss-as-controller</artifactId>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>wildfly81</id>
+      <!-- Why do I need to repeat this? -->
+      <activation>
+        <property>
+          <name>wildfly81</name>
+        </property>
+      </activation>
+      <properties>
+        <wildfly.home>${project.build.directory}/wildfly/wildfly-${wildfly.version}</wildfly.home>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <!-- NB: This plugin needs to be before antrun, because it
+                 creates the wildfly directory for the unzip tasks. -->
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.wildfly</groupId>
+                      <artifactId>wildfly-dist</artifactId>
+                      <version>${wildfly.version}</version>
+                      <type>zip</type>
+                      <overWrite>false</overWrite>
+                      <outputDirectory>${project.build.directory}/wildfly</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>prepare-arquillian-container</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <copy
+                      overwrite="true"
+                      file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian-wildfly.xml"
+                      tofile="${wildfly.home}/standalone/configuration/standalone.xml" />
+                    <mkdir dir="${project.build.directory}/downloads/" />
+                    <get
+                      src="http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip/download"
+                      dest="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip"
+                      usetimestamp="true" />
+                    <get
+                      src="http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip/download"
+                      dest="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip"
+                      usetimestamp="true" />
+                    <unzip
+                      src="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip"
+                      dest="${wildfly.home}" />
+                    <unzip
+                      src="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip"
+                      dest="${wildfly.home}" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- Configure Failsafe to run in integration-test/verify phase -->
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <executions>
+              <!-- Container (Arquillian tests) -->
+              <execution>
+                <id>container-tests</id>
+                <goals>
+                  <goal>integration-test</goal>
+                  <goal>verify</goal>
+                </goals>
+                <configuration>
+                  <includes>
+                    <include>**/*ITCase.java</include>
+                  </includes>
+                  <testNGArtifactName>none:none</testNGArtifactName>
+                  <runOrder>alphabetical</runOrder>
+                  <forkCount>1</forkCount>
+                  <reuseForks>true</reuseForks>
+                  <systemPropertyVariables>
+                    <arquillian.launch>wildfly81</arquillian.launch>
+                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                    <!-- the maven dependency plugin will have already downloaded the server on /target -->
+                    <jboss.home>${wildfly.home}</jboss.home>
+                  </systemPropertyVariables>
+                  <redirectTestOutputToFile>false</redirectTestOutputToFile>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+        <dependency>
+          <groupId>org.wildfly</groupId>
+          <artifactId>wildfly-arquillian-container-embedded</artifactId>
+          <version>${wildfly.version}</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.wildfly</groupId>
+          <artifactId>wildfly-embedded</artifactId>
+          <version>${wildfly.version}</version>
+          <scope>test</scope>
+        </dependency>
+      </dependencies>
+    </profile>
+
   </profiles>
 
   <dependencies>
@@ -1749,47 +1917,7 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>org.jboss.as</groupId>
-      <artifactId>jboss-as-arquillian-container-managed</artifactId>
-      <version>${jboss.as.version}</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>jboss-logmanager</artifactId>
-          <groupId>org.jboss.logmanager</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>log4j-jboss-logmanager</artifactId>
-          <groupId>org.jboss.logmanager</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.as</groupId>
-      <artifactId>jboss-as-arquillian-common</artifactId>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>
-            log4j-jboss-logmanager
-          </artifactId>
-          <groupId>
-            org.jboss.logmanager
-          </groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.as</groupId>
-      <artifactId>jboss-as-controller-client</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.as</groupId>
-      <artifactId>jboss-as-controller</artifactId>
-      <scope>test</scope>
-    </dependency>
+
     <!-- Currently only needed for our override of Arquillian's
     ManagementClient -->
     <dependency>
diff --git a/zanata-war/src/test/resources/arquillian.xml b/zanata-war/src/test/resources/arquillian.xml
index d396d5561e..92dfe6a9ee 100644
--- a/zanata-war/src/test/resources/arquillian.xml
+++ b/zanata-war/src/test/resources/arquillian.xml
@@ -9,7 +9,7 @@
     <!--<property name="deploymentExportPath">/home/camunoz/temp/</property>-->
   </engine>
 
-  <container qualifier="jbossas-managed" default="true">
+  <container qualifier="jbossas-managed">
     <configuration>
       <!-- We can use the JBOSS_HOME env variable instead of this -->
       <property name="jbossHome">${arquillian.jboss.home}</property>
@@ -22,6 +22,8 @@
         name="javaVmArguments">-Xms1536m -Xmx1536m -XX:MaxPermSize=256m -Dorg.jboss.as.logging.per-deployment=false
       </property>
 
+      <!-- From JBOSS_HOME/standalone/configuration -->
+      <property name="serverConfig">standalone-arquillian.xml</property>
       <!--<property name="allowConnectingToRunningServer">true</property>-->
       <!-- This needs to be here if -Djboss.socket.binding.port-offset is used in javaVmArguments.
            It must match the exact management port to be used-->
@@ -29,6 +31,17 @@
       <property name="managementPort">${jboss.management.native.port,env.JBOSS_MANAGEMENT_NATIVE_PORT:10099}</property>
     </configuration>
   </container>
+  <container qualifier="wildfly81">
+    <configuration>
+      <!--<property name="jbossHome">${wildfly.home}</property>-->
+      <!--<property-->
+        <!--name="javaVmArguments">-Xms1536m -Xmx1536m -XX:MaxPermSize=256m -Dorg.jboss.as.logging.per-deployment=false-->
+      <!--</property>-->
+
+      <!-- NB: don't put whitespace around the number -->
+      <property name="managementPort">${jboss.management.native.port,env.JBOSS_MANAGEMENT_NATIVE_PORT:10099}</property>
+    </configuration>
+  </container>
   <extension qualifier="seam2">
     <property name="seamVersion">2.3.1.Final</property>
     <property name="autoPackage">false</property>
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
new file mode 100644
index 0000000000..7cd844ce12
--- /dev/null
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -0,0 +1,472 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<server xmlns="urn:jboss:domain:2.1">
+  <extensions>
+    <extension module="org.jboss.as.clustering.infinispan"/>
+    <extension module="org.jboss.as.connector"/>
+    <extension module="org.jboss.as.deployment-scanner"/>
+    <extension module="org.jboss.as.ee"/>
+    <extension module="org.jboss.as.ejb3"/>
+    <extension module="org.jboss.as.jaxrs"/>
+    <extension module="org.jboss.as.jdr"/>
+    <extension module="org.jboss.as.jmx"/>
+    <extension module="org.jboss.as.jpa"/>
+    <extension module="org.jboss.as.jsf"/>
+    <extension module="org.jboss.as.logging"/>
+    <extension module="org.jboss.as.mail"/>
+    <extension module="org.jboss.as.naming"/>
+    <extension module="org.jboss.as.pojo"/>
+    <extension module="org.jboss.as.remoting"/>
+    <extension module="org.jboss.as.sar"/>
+    <extension module="org.jboss.as.security"/>
+    <extension module="org.jboss.as.transactions"/>
+    <extension module="org.jboss.as.webservices"/>
+    <extension module="org.wildfly.extension.batch"/>
+    <extension module="org.wildfly.extension.io"/>
+    <extension module="org.wildfly.extension.undertow"/>
+  </extensions>
+  <system-properties>
+    <property name="hibernate.search.default.indexBase"
+      value="./target/zanatasearchindex" />
+    <!--javamelody.storage-directory=/var/lib/zanata/stats-->
+  </system-properties>
+  <management>
+    <security-realms>
+      <security-realm name="ManagementRealm">
+        <authentication>
+          <local default-user="$local" skip-group-loading="true"/>
+          <properties path="mgmt-users.properties" relative-to="jboss.server.config.dir"/>
+        </authentication>
+        <authorization map-groups-to-roles="false">
+          <properties path="mgmt-groups.properties" relative-to="jboss.server.config.dir"/>
+        </authorization>
+      </security-realm>
+      <security-realm name="ApplicationRealm">
+        <authentication>
+          <local default-user="$local" allowed-users="*" skip-group-loading="true"/>
+          <properties path="application-users.properties" relative-to="jboss.server.config.dir"/>
+        </authentication>
+        <authorization>
+          <properties path="application-roles.properties" relative-to="jboss.server.config.dir"/>
+        </authorization>
+      </security-realm>
+    </security-realms>
+    <audit-log>
+      <formatters>
+        <json-formatter name="json-formatter"/>
+      </formatters>
+      <handlers>
+        <file-handler name="file" formatter="json-formatter" path="audit-log.log" relative-to="jboss.server.data.dir"/>
+      </handlers>
+      <logger log-boot="true" log-read-only="false" enabled="false">
+        <handlers>
+          <handler name="file"/>
+        </handlers>
+      </logger>
+    </audit-log>
+    <management-interfaces>
+      <http-interface security-realm="ManagementRealm" http-upgrade-enabled="true">
+        <socket-binding http="management-http"/>
+      </http-interface>
+    </management-interfaces>
+    <access-control provider="simple">
+      <role-mapping>
+        <role name="SuperUser">
+          <include>
+            <user name="$local"/>
+          </include>
+        </role>
+      </role-mapping>
+    </access-control>
+  </management>
+
+  <profile>
+    <subsystem xmlns="urn:jboss:domain:logging:2.0">
+      <console-handler name="CONSOLE">
+        <level name="INFO"/>
+        <formatter>
+          <named-formatter name="COLOR-PATTERN"/>
+        </formatter>
+      </console-handler>
+      <periodic-rotating-file-handler name="FILE" autoflush="true">
+        <formatter>
+          <named-formatter name="PATTERN"/>
+        </formatter>
+        <file relative-to="jboss.server.log.dir" path="server.log"/>
+        <suffix value=".yyyy-MM-dd"/>
+        <append value="true"/>
+      </periodic-rotating-file-handler>
+      <logger category="com.arjuna">
+        <level name="WARN"/>
+      </logger>
+      <logger category="org.apache.tomcat.util.modeler">
+        <level name="WARN"/>
+      </logger>
+      <logger category="org.jboss.as.config">
+        <level name="DEBUG"/>
+      </logger>
+      <logger category="sun.rmi">
+        <level name="WARN"/>
+      </logger>
+      <logger category="jacorb">
+        <level name="WARN"/>
+      </logger>
+      <logger category="jacorb.config">
+        <level name="ERROR"/>
+      </logger>
+      <root-logger>
+        <level name="INFO"/>
+        <handlers>
+          <handler name="CONSOLE"/>
+          <handler name="FILE"/>
+        </handlers>
+      </root-logger>
+      <formatter name="PATTERN">
+        <pattern-formatter pattern="%d{HH:mm:ss,SSS}Z %-5p [%c] (%t) %s%E%n"/>
+      </formatter>
+      <formatter name="COLOR-PATTERN">
+        <pattern-formatter pattern="%K{level}%z{utc}%d{yyyy-MM-dd}T%d{HH:mm:ss,SSS}Z %-5p [%c] (%t) %s%E%n"/>
+      </formatter>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:batch:1.0">
+      <job-repository>
+        <in-memory/>
+      </job-repository>
+      <thread-pool>
+        <max-threads count="10"/>
+        <keepalive-time time="30" unit="seconds"/>
+      </thread-pool>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:datasources:2.0">
+      <datasources>
+        <datasource jndi-name="java:jboss/datasources/zanataTestDatasource"
+          pool-name="zanataTestDatasourcePool" enabled="true"
+          use-ccm="true"
+          use-java-context="true">
+          <connection-url>jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1</connection-url>
+          <driver>h2</driver>
+          <security>
+            <user-name>sa</user-name>
+            <password>sa</password>
+          </security>
+        </datasource>
+        <datasource jndi-name="java:jboss/datasources/ExampleDS" pool-name="ExampleDS" enabled="false" use-java-context="true">
+          <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</connection-url>
+          <driver>h2</driver>
+          <security>
+            <user-name>sa</user-name>
+            <password>sa</password>
+          </security>
+        </datasource>
+        <drivers>
+          <driver name="h2" module="com.h2database.h2">
+            <xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
+          </driver>
+        </drivers>
+      </datasources>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:deployment-scanner:2.0">
+      <deployment-scanner path="deployments" relative-to="jboss.server.base.dir" scan-interval="5000"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:ee:2.0">
+      <spec-descriptor-property-replacement>false</spec-descriptor-property-replacement>
+      <concurrent>
+        <context-services>
+          <context-service name="default" jndi-name="java:jboss/ee/concurrency/context/default" use-transaction-setup-provider="true"/>
+        </context-services>
+        <managed-thread-factories>
+          <managed-thread-factory name="default" jndi-name="java:jboss/ee/concurrency/factory/default" context-service="default"/>
+        </managed-thread-factories>
+        <managed-executor-services>
+          <managed-executor-service name="default" jndi-name="java:jboss/ee/concurrency/executor/default" context-service="default" hung-task-threshold="60000" core-threads="5" max-threads="25" keepalive-time="5000"/>
+        </managed-executor-services>
+        <managed-scheduled-executor-services>
+          <managed-scheduled-executor-service name="default" jndi-name="java:jboss/ee/concurrency/scheduler/default" context-service="default" hung-task-threshold="60000" core-threads="2" keepalive-time="3000"/>
+        </managed-scheduled-executor-services>
+      </concurrent>
+      <default-bindings context-service="java:jboss/ee/concurrency/context/default" datasource="java:jboss/datasources/ExampleDS" jms-connection-factory="java:jboss/DefaultJMSConnectionFactory" managed-executor-service="java:jboss/ee/concurrency/executor/default" managed-scheduled-executor-service="java:jboss/ee/concurrency/scheduler/default" managed-thread-factory="java:jboss/ee/concurrency/factory/default"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:ejb3:2.0">
+      <session-bean>
+        <stateful default-access-timeout="5000" cache-ref="simple" passivation-disabled-cache-ref="simple"/>
+        <singleton default-access-timeout="5000"/>
+      </session-bean>
+      <pools>
+        <bean-instance-pools>
+          <strict-max-pool name="slsb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+          <strict-max-pool name="mdb-strict-max-pool" max-pool-size="20" instance-acquisition-timeout="5" instance-acquisition-timeout-unit="MINUTES"/>
+        </bean-instance-pools>
+      </pools>
+      <caches>
+        <cache name="simple"/>
+        <cache name="distributable" passivation-store-ref="infinispan" aliases="passivating clustered"/>
+      </caches>
+      <passivation-stores>
+        <passivation-store name="infinispan" cache-container="ejb" max-size="10000"/>
+      </passivation-stores>
+      <async thread-pool-name="default"/>
+      <timer-service thread-pool-name="default" default-data-store="default-file-store">
+        <data-stores>
+          <file-data-store name="default-file-store" path="timer-service-data" relative-to="jboss.server.data.dir"/>
+        </data-stores>
+      </timer-service>
+      <remote connector-ref="http-remoting-connector" thread-pool-name="default"/>
+      <thread-pools>
+        <thread-pool name="default">
+          <max-threads count="10"/>
+          <keepalive-time time="100" unit="milliseconds"/>
+        </thread-pool>
+      </thread-pools>
+      <default-security-domain value="other"/>
+      <default-missing-method-permissions-deny-access value="true"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:io:1.1">
+      <worker name="default"/>
+      <buffer-pool name="default"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:infinispan:2.0">
+      <cache-container name="web" default-cache="passivation" module="org.wildfly.clustering.web.infinispan">
+        <local-cache name="passivation" batching="true">
+          <file-store passivation="true" purge="false"/>
+        </local-cache>
+        <local-cache name="persistent" batching="true">
+          <file-store passivation="false" purge="false"/>
+        </local-cache>
+      </cache-container>
+      <cache-container name="ejb" default-cache="passivation" module="org.wildfly.clustering.ejb.infinispan" aliases="sfsb">
+        <local-cache name="passivation" batching="true">
+          <file-store passivation="true" purge="false"/>
+        </local-cache>
+        <local-cache name="persistent" batching="true">
+          <file-store passivation="false" purge="false"/>
+        </local-cache>
+      </cache-container>
+      <cache-container name="hibernate" default-cache="local-query" module="org.hibernate">
+        <local-cache name="entity">
+          <transaction mode="NON_XA"/>
+          <eviction strategy="LRU" max-entries="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="local-query">
+          <transaction mode="NONE"/>
+          <eviction strategy="LRU" max-entries="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+        <local-cache name="timestamps">
+          <transaction mode="NONE"/>
+          <eviction strategy="NONE"/>
+        </local-cache>
+      </cache-container>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:jaxrs:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:jca:2.0">
+      <archive-validation enabled="true" fail-on-error="true" fail-on-warn="false"/>
+      <bean-validation enabled="true"/>
+      <default-workmanager>
+        <short-running-threads>
+          <core-threads count="50"/>
+          <queue-length count="50"/>
+          <max-threads count="50"/>
+          <keepalive-time time="10" unit="seconds"/>
+        </short-running-threads>
+        <long-running-threads>
+          <core-threads count="50"/>
+          <queue-length count="50"/>
+          <max-threads count="50"/>
+          <keepalive-time time="10" unit="seconds"/>
+        </long-running-threads>
+      </default-workmanager>
+      <cached-connection-manager debug="true"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:jdr:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:jmx:1.3">
+      <expose-resolved-model/>
+      <expose-expression-model/>
+      <remoting-connector/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:jpa:1.1">
+      <jpa default-datasource="" default-extended-persistence-inheritance="DEEP"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:jsf:1.0" default-jsf-impl-slot="mojarra-2.1.28"/>
+    <subsystem xmlns="urn:jboss:domain:mail:2.0">
+      <mail-session name="default" jndi-name="java:jboss/mail/Default">
+        <smtp-server outbound-socket-binding-ref="mail-smtp"/>
+      </mail-session>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:naming:2.0">
+      <bindings>
+        <simple name="java:global/zanata/security/auth-policy-names/internal"
+          value="zanata.internal" />
+        <simple name="java:global/zanata/security/admin-users"
+          value="user1,user2,user3" />
+        <simple name="java:global/zanata/email/default-from-address"
+          value="no-reply@zanata.org" />
+        <simple name="java:global/zanata/smtp/port" value="${smtp.port,env.SMTP_PORT:2552}" />
+        <simple name="java:global/zanata/files/document-storage-directory"
+          value="${project.build.directory}/zanata-documents" />
+        <lookup name="java:jboss/exported/zanata/files/document-storage-directory"
+          lookup="java:global/zanata/files/document-storage-directory" />
+      </bindings>
+      <remote-naming/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:pojo:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:remoting:2.0">
+      <endpoint worker="default"/>
+      <http-connector name="http-remoting-connector" connector-ref="default" />
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:resource-adapters:2.0"/>
+    <subsystem xmlns="urn:jboss:domain:sar:1.0"/>
+    <subsystem xmlns="urn:jboss:domain:security:1.2">
+      <security-domains>
+        <security-domain name="zanata">
+          <authentication>
+            <login-module code="org.zanata.security.ZanataCentralLoginModule" flag="required"/>
+          </authentication>
+        </security-domain>
+        <security-domain name="zanata.internal">
+          <authentication>
+            <login-module code="org.jboss.seam.security.jaas.SeamLoginModule" flag="required"/>
+          </authentication>
+        </security-domain>
+        <security-domain name="zanata.jaas">
+          <authentication>
+            <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule" flag="required">
+              <module-option name="dsJndiName" value="java:authdb"/>
+              <module-option name="principalsQuery" value="SELECT password FROM users WHERE username = ?"/>
+              <module-option name="rolesQuery" value="select '','' FROM users WHERE username = ?"/>
+              <module-option name="hashAlgorithm" value="md5"/>
+              <module-option name="hashEncoding" value="hex"/>
+            </login-module>
+          </authentication>
+        </security-domain>
+        <security-domain name="zanata.kerberos">
+          <authentication>
+            <login-module code="org.jboss.security.negotiation.spnego.SPNEGOLoginModule" flag="sufficient">
+              <module-option name="password-stacking" value="useFirstPass"/>
+              <module-option name="serverSecurityDomain" value="host"/>
+              <module-option name="removeRealmFromPrincipal" value="true"/>
+              <module-option name="usernamePasswordDomain" value="krb5"/>
+            </login-module>
+          </authentication>
+        </security-domain>
+        <security-domain name="krb5">
+          <authentication>
+            <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="sufficient">
+              <module-option name="storePass" value="false"/>
+              <module-option name="clearPass" value="true"/>
+              <module-option name="debug" value="true"/>
+              <module-option name="doNotPrompt" value="false"/>
+            </login-module>
+          </authentication>
+        </security-domain>
+        <security-domain name="host">
+          <authentication>
+            <login-module code="com.sun.security.auth.module.Krb5LoginModule" flag="required">
+              <module-option name="storeKey" value="true"/>
+              <module-option name="useKeyTab" value="true"/>
+              <module-option name="principal" value="HTTP/zanata-master-kerberos.lab.eng.bne.redhat.com@REDHAT.COM"/>
+              <module-option name="keyTab" value="/usr/share/jbossas/standalone/configuration/jboss.keytab"/>
+              <module-option name="doNotPrompt" value="true"/>
+              <module-option name="debug" value="true"/>
+            </login-module>
+          </authentication>
+        </security-domain>
+        <security-domain name="other" cache-type="default">
+          <authentication>
+            <login-module code="Remoting" flag="optional">
+              <module-option name="password-stacking" value="useFirstPass"/>
+            </login-module>
+            <login-module code="RealmDirect" flag="required">
+              <module-option name="password-stacking" value="useFirstPass"/>
+            </login-module>
+          </authentication>
+        </security-domain>
+        <security-domain name="jboss-web-policy" cache-type="default">
+          <authorization>
+            <policy-module code="Delegating" flag="required"/>
+          </authorization>
+        </security-domain>
+        <security-domain name="jboss-ejb-policy" cache-type="default">
+          <authorization>
+            <policy-module code="Delegating" flag="required"/>
+          </authorization>
+        </security-domain>
+      </security-domains>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:transactions:2.0">
+      <core-environment>
+        <process-id>
+          <uuid/>
+        </process-id>
+      </core-environment>
+      <recovery-environment socket-binding="txn-recovery-environment" status-socket-binding="txn-status-manager"/>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:undertow:1.1">
+      <buffer-cache name="default"/>
+      <server name="default-server">
+        <http-listener name="default" socket-binding="http"/>
+        <host name="default-host" alias="localhost">
+          <location name="/" handler="welcome-content"/>
+          <filter-ref name="server-header"/>
+          <filter-ref name="x-powered-by-header"/>
+        </host>
+      </server>
+      <servlet-container name="default">
+        <jsp-config/>
+      </servlet-container>
+      <handlers>
+        <file name="welcome-content" path="${jboss.home.dir}/welcome-content"/>
+      </handlers>
+      <filters>
+        <response-header name="server-header" header-name="Server" header-value="WildFly/8"/>
+        <response-header name="x-powered-by-header" header-name="X-Powered-By" header-value="Undertow/1"/>
+      </filters>
+    </subsystem>
+    <subsystem xmlns="urn:jboss:domain:webservices:1.2">
+      <wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
+      <endpoint-config name="Standard-Endpoint-Config"/>
+      <endpoint-config name="Recording-Endpoint-Config">
+        <pre-handler-chain name="recording-handlers" protocol-bindings="##SOAP11_HTTP ##SOAP11_HTTP_MTOM ##SOAP12_HTTP ##SOAP12_HTTP_MTOM">
+          <handler name="RecordingHandler" class="org.jboss.ws.common.invocation.RecordingServerHandler"/>
+        </pre-handler-chain>
+      </endpoint-config>
+      <client-config name="Standard-Client-Config"/>
+    </subsystem>
+  </profile>
+
+  <interfaces>
+    <interface name="management">
+      <inet-address value="${jboss.bind.address.management:127.0.0.1}"/>
+    </interface>
+    <interface name="public">
+      <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+    </interface>
+    <interface name="unsecure">
+      <inet-address value="${jboss.bind.address.unsecure:127.0.0.1}"/>
+    </interface>
+  </interfaces>
+
+  <socket-binding-group name="standard-sockets" default-interface="public"
+    port-offset="${jboss.socket.binding.port-offset:0}">
+    <socket-binding name="management-http" interface="management"
+      port="${jboss.management.http.port,env.JBOSS_MANAGEMENT_HTTP_PORT:10090}"/>
+    <socket-binding name="management-https" interface="management"
+      port="${jboss.management.https.port,env.JBOSS_MANAGEMENT_HTTPS_PORT:10093}"/>
+    <socket-binding name="ajp"
+     port="${jboss.ajp.port,env.JBOSS_AJP_PORT:8109}"/>
+    <socket-binding name="http"
+     port="${jboss.http.port,env.JBOSS_HTTP_PORT:8180}"/>
+    <socket-binding name="https"
+     port="${jboss.https.port,env.JBOSS_HTTPS_PORT:8543}"/>
+    <socket-binding name="remoting"
+     port="${jboss.remoting.port,env.JBOSS_REMOTING_PORT:4547}" />
+    <socket-binding name="txn-recovery-environment"
+     port="${jboss.txn.recovery.port,env.JBOSS_TXN_RECOVERY_PORT:4812}"/>
+    <socket-binding name="txn-status-manager"
+     port="${jboss.txn.status.port,env.JBOSS_TXN_STATUS_PORT:4813}"/>
+    <outbound-socket-binding name="mail-smtp">
+      <remote-destination host="localhost" port="${smtp.port,env.SMTP_PORT:2552}"/>
+    </outbound-socket-binding>
+  </socket-binding-group>
+
+</server>
diff --git a/zanata-war/src/test/resources/arquillian/standalone.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
similarity index 99%
rename from zanata-war/src/test/resources/arquillian/standalone.xml
rename to zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
index d1bdef0b8c..fb3b7fa0bf 100644
--- a/zanata-war/src/test/resources/arquillian/standalone.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
@@ -1,7 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
 <server xmlns="urn:jboss:domain:1.3">
-
   <extensions>
     <extension module="org.jboss.as.clustering.infinispan" />
     <extension module="org.jboss.as.configadmin" />
@@ -115,7 +114,7 @@
           </security>
         </datasource>
         <datasource jndi-name="java:jboss/datasources/ExampleDS"
-          pool-name="ExampleDS" enabled="true" use-java-context="true">
+          pool-name="ExampleDS" enabled="false" use-java-context="true">
           <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
           <driver>h2</driver>
           <security>