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 @@
- wildfly
+ wildfly81
- wildfly
+ wildfly81
- 8.1.0.Final
wildfly8x
http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip
standalone_wildfly.xml
diff --git a/pom.xml b/pom.xml
index e2fd705cea..140298b88f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
org.jboss.arquillian
arquillian-bom
- 1.1.1.Final
+ 1.1.5.Final
import
pom
@@ -1056,6 +1056,18 @@
+
+
+ wildfly81
+
+
+ wildfly81
+
+
+
+ 8.1.0.Final
+
+
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 @@
${basedir}/src/etc
- jboss71x
true
@@ -165,27 +164,6 @@
-
- maven-enforcer-plugin
-
-
- enforce-arquillian-jboss-home
-
- enforce
-
- pre-integration-test
-
-
-
- arquillian.jboss.home
- You must set the arquillian.jboss.home property to run integration tests
-
-
-
-
-
-
-
com.ning.maven.plugins
@@ -253,19 +231,6 @@
run
-
- prepare-arquillian-container
- pre-integration-test
-
- run
-
-
-
-
-
-
-
@@ -482,28 +447,6 @@
-
-
- maven-failsafe-plugin
-
-
-
- container-tests
-
- integration-test
- verify
-
-
-
- **/*ITCase.java
-
- none:none
- alphabetical
-
-
-
-
-
org.codehaus.mojo
l10n-maven-plugin
@@ -1032,6 +975,231 @@
+
+ jbosseap6
+
+
+ jbosseap6
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ prepare-arquillian-container
+ pre-integration-test
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+ maven-failsafe-plugin
+
+
+
+ container-tests
+
+ integration-test
+ verify
+
+
+
+ **/*ITCase.java
+
+ none:none
+ alphabetical
+ 1
+ true
+
+ jbossas-managed
+
+
+
+
+
+
+
+
+
+
+ org.jboss.as
+ jboss-as-arquillian-container-managed
+ ${jboss.as.version}
+ test
+
+
+ org.jboss.logmanager
+ jboss-logmanager
+
+
+ org.jboss.logmanager
+ log4j-jboss-logmanager
+
+
+
+
+ org.jboss.as
+ jboss-as-arquillian-common
+ test
+
+
+ org.jboss.logmanager
+ log4j-jboss-logmanager
+
+
+
+
+ org.jboss.as
+ jboss-as-controller-client
+ test
+
+
+ org.jboss.as
+ jboss-as-controller
+ test
+
+
+
+
+
+ wildfly81
+
+
+
+ wildfly81
+
+
+
+ ${project.build.directory}/wildfly/wildfly-${wildfly.version}
+
+
+
+
+
+ maven-dependency-plugin
+
+
+ unpack
+ pre-integration-test
+
+ unpack
+
+
+
+
+ org.wildfly
+ wildfly-dist
+ ${wildfly.version}
+ zip
+ false
+ ${project.build.directory}/wildfly
+
+
+
+
+
+
+
+
+ maven-antrun-plugin
+
+
+ prepare-arquillian-container
+ pre-integration-test
+
+ run
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ maven-failsafe-plugin
+
+
+
+ container-tests
+
+ integration-test
+ verify
+
+
+
+ **/*ITCase.java
+
+ none:none
+ alphabetical
+ 1
+ true
+
+ wildfly81
+ org.jboss.logmanager.LogManager
+
+ ${wildfly.home}
+
+ false
+
+
+
+
+
+
+
+
+ org.wildfly
+ wildfly-arquillian-container-embedded
+ ${wildfly.version}
+ test
+
+
+ org.wildfly
+ wildfly-embedded
+ ${wildfly.version}
+ test
+
+
+
+
@@ -1749,47 +1917,7 @@
test
-
- org.jboss.as
- jboss-as-arquillian-container-managed
- ${jboss.as.version}
- test
-
-
- jboss-logmanager
- org.jboss.logmanager
-
-
- log4j-jboss-logmanager
- org.jboss.logmanager
-
-
-
-
- org.jboss.as
- jboss-as-arquillian-common
- test
-
-
-
- log4j-jboss-logmanager
-
-
- org.jboss.logmanager
-
-
-
-
-
- org.jboss.as
- jboss-as-controller-client
- test
-
-
- org.jboss.as
- jboss-as-controller
- test
-
+
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 @@
-
+
${arquillian.jboss.home}
@@ -22,6 +22,8 @@
name="javaVmArguments">-Xms1536m -Xmx1536m -XX:MaxPermSize=256m -Dorg.jboss.as.logging.per-deployment=false
+
+ standalone-arquillian.xml
@@ -29,6 +31,17 @@
${jboss.management.native.port,env.JBOSS_MANAGEMENT_NATIVE_PORT:10099}
+
+
+
+
+
+
+
+
+ ${jboss.management.native.port,env.JBOSS_MANAGEMENT_NATIVE_PORT:10099}
+
+
2.3.1.Final
false
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1
+ h2
+
+ sa
+ sa
+
+
+
+ jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
+ h2
+
+ sa
+ sa
+
+
+
+
+ org.h2.jdbcx.JdbcDataSource
+
+
+
+
+
+
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${jboss.bind.address:127.0.0.1}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
-
@@ -115,7 +114,7 @@
+ pool-name="ExampleDS" enabled="false" use-java-context="true">
jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
h2