Merge remote-tracking branch 'origin/master' into infinispan

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java

.gitignore

@@ -64,3 +64,9 @@ bin/
 *.tmp
 /tmp*
 *.bak
+
+# Gradle files
+.gradle/
+
+# other things that really ought to go under target/
+ehcache.disk.store.dir/

build.sh

@@ -2,4 +2,4 @@
 
 set -a # make sure the env vars are exported
 source <(etc/scripts/allocate-jboss-ports)
-exec mvn "$@"
+exec xvfb-run -a mvn "$@"

etc/scripts/cargowait.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+#set -x
+
+clean=clean
+extraArgs=
+while getopts "nhd:" opt; do
+  case ${opt} in
+    n)
+      echo ">> -n specified. Will NOT run maven goal 'clean'." >&2
+      clean=''
+      ;;
+    h)
+      echo ">> run this script to prepare a functional test war and start cargo in waiting mode" >&2
+      echo ">>>> -n if you don't want to run maven clean goal. Useful when you have run functional-test-db.snapshot.sh." >&2
+      echo ">>>> -d <extra maven arguments, e.g. '-Dwebdriver.type=firefox -Dsmtp.port=25'> if you want to pass in extra arguments when running functional test" >&2
+      exit 0;
+      ;;
+    d)
+      extraArgs=$OPTARG
+      echo ">> extra parameter passed to functional-test module execution:$extraArgs"
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      exit 1;
+      ;;
+  esac
+done
+
+scriptBaseDir=$(dirname $0)
+serverModuleRoot=$(readlink -f "${scriptBaseDir}/../..")
+
+cd ${serverModuleRoot}
+
+echo ">> Now working in $(pwd)"
+echo
+
+# this will build zanata war and prepare war overlay for functional test
+mvn ${clean} package -Dchromefirefox -DskipTests -Dfunctional-test -pl zanata-model,zanata-war,zanata-test-war;
+
+# this will start cargo container and deploy above generated overlay war and then pause
+mvn ${clean} process-test-resources package cargo:run -Dfunctional-test -Dmysql.port=13306 -pl functional-test ${extraArgs};

etc/scripts/functional-test-db-snapshot.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# once you have run cargowait.sh script and cargo has started, you can run this
+# script to take a snapshot of current database and store it as
+# target/database.sql.
+# subsequent cargowait.sh execution can then use -n option (no clean) to make
+# use of this script.
+
+scriptBaseDir=$(dirname $0)
+
+functionalTestTarget=${scriptBaseDir}/../../functional-test/target
+
+targetPath=$(readlink -f ${functionalTestTarget})
+
+${targetPath}/mysql-dist/bin/mysqldump --port=13306 --user=root --password=root --socket=${targetPath}/mdb/mysql.sock root > ${targetPath}/database.sql
+
+ls -ltr ${targetPath}/database.sql

etc/scripts/standalone.cli.messaging.config

@@ -0,0 +1,63 @@
+# run jboss-cli.sh --file <location of this file> to apply messaging changes
+
+connect
+
+# jboss cli specification for an operation request
+#[/node-type=node-name (/node-type=node-name)*] : operation-name [( [parameter-name=parameter-value (,parameter-name=parameter-value)*] )]
+
+# add messaging extension if not already exist
+if (outcome == failed) of /extension=org.jboss.as.messaging:read-resource()
+    /extension=org.jboss.as.messaging:add()
+end-if
+
+if (outcome == failed) of /subsystem=messaging:read-resource()
+    /subsystem=messaging:add()
+end-if
+
+batch
+
+/subsystem=ejb3:write-attribute(name="default-resource-adapter-name", value="hornetq-ra")
+/subsystem=ejb3:write-attribute(name="default-mdb-instance-pool", value="mdb-strict-max-pool")
+
+/subsystem=messaging/hornetq-server=default:add(persistence-enabled=true, security-enabled=false, journal-type=NIO, journal-min-files=2)
+#/subsystem=messaging/hornetq-server=default/:write-attribute(name=persistence-enabled, value=true)
+#/subsystem=messaging/hornetq-server=default/:write-attribute(name=security-enabled, value=false)
+#/subsystem=messaging/hornetq-server=default/:write-attribute(name=journal-type, value=NIO)
+#/subsystem=messaging/hornetq-server=default/:write-attribute(name=journal-min-files, value=2)
+
+/subsystem=messaging/hornetq-server=default/address-setting=#:add(address-full-policy="PAGE", \
+    dead-letter-address="jms.queue.DLQ", expiry-address="jms.queue.ExpiryQueue", expiry-delay=-1L, \
+    last-value-queue=false, max-delivery-attempts=3, max-size-bytes=10485760L, message-counter-history-day-limit=10, \
+    page-max-cache-size=5, page-size-bytes=2097152L, redelivery-delay=5000L, redistribution-delay=5000L, send-to-dla-on-no-route=false)
+
+/subsystem=messaging/hornetq-server=default/in-vm-connector=in-vm:add(server-id=0)
+/subsystem=messaging/hornetq-server=default/in-vm-acceptor=in-vm:add(server-id=0)
+
+/subsystem=messaging/hornetq-server=default/connection-factory=InVmConnectionFactory:add(connector={"in-vm"=>undefined}, entries = ["java:/ConnectionFactory"])
+/subsystem=messaging/hornetq-server=default/pooled-connection-factory=hornetq-ra:add(connector={"in-vm"=>undefined}, entries=["java:/JmsXA","java:jboss/DefaultJMSConnectionFactory"])
+/subsystem=messaging/hornetq-server=default/pooled-connection-factory=hornetq-ra/:write-attribute(name=min-pool-size,value=2)
+/subsystem=messaging/hornetq-server=default/pooled-connection-factory=hornetq-ra/:write-attribute(name=max-pool-size,value=10)
+
+/subsystem=messaging/hornetq-server=default/security-setting=#:add()
+/subsystem=messaging/hornetq-server=default/security-setting=#/role=guest:add(consume=true, create-durable-queue=false, create-non-durable-queue=true, delete-durable-queue=false, delete-non-durable-queue=true, manage=false, send=true)
+
+jms-queue add --queue-address=ExpiryQueue --durable=true --entries=["java:/jms/queue/ExpiryQueue"]
+jms-queue add --queue-address=DLQ --durable=true --entries=["java:/jms/queue/DLQ"]
+jms-queue add --queue-address=MailsQueue --durable=true --entries=["java:/jms/queue/MailsQueue"]
+
+# if we want to add netty as remote connector
+#/subsystem=messaging/hornetq-server=default/remote-connector=netty/:add(socket-binding=messaging)
+#/subsystem=messaging/hornetq-server=default/remote-connector=netty-throughput/:add(socket-binding=messaging-throughput)
+#/subsystem=messaging/hornetq-server=default/remote-connector=netty-throughput/param=batch-delay/:add(value=50)
+#/subsystem=messaging/hornetq-server=default/remote-connector=netty-throughput/param=direct-deliver/:add(value=false)
+
+#/subsystem=messaging/hornetq-server=default/remote-acceptor=netty/:add(socket-binding=messaging)
+#/subsystem=messaging/hornetq-server=default/remote-acceptor=netty-throughput/:add(socket-binding=messaging-throughput)
+#/subsystem=messaging/hornetq-server=default/remote-acceptor=netty-throughput/param=batch-delay:add(value=50)
+#/subsystem=messaging/hornetq-server=default/remote-acceptor=netty-throughput/param=direct-deliver:add(value=false)
+
+#/socket-binding-group=standard-sockets/socket-binding=messaging:add(port="${jboss.messaging.port,env.JBOSS_MESSAGING_PORT:5445}")
+#/socket-binding-group=standard-sockets/socket-binding=messaging-group:add(port=0, multicast-address="${jboss.messaging.group.address:231.7.7.7}", multicast-port="${jboss.messaging.group.port:9876}")
+#/socket-binding-group=standard-sockets/socket-binding=messaging-throughput:add(port="${jboss.messaging.throughput.port,env.JBOSS_MESSAGING_THROUGHPUT_PORT:5455}")
+
+run-batch

functional-test/etc/mysql-socket.groovy

@@ -0,0 +1,17 @@
+// This script sets the Maven project property 'mysql.socket'
+// to a short path under /tmp (derived from the project build directory)
+// and optionally deletes the socket file if it exists.
+
+import java.security.MessageDigest
+
+def messageDigest = MessageDigest.getInstance("MD5")
+messageDigest.update(project.build.directory.bytes);
+String md5Hex = messageDigest.digest().encodeHex()
+
+File mysqlSocket = new File(System.getProperty('java.io.tmpdir'), 'mysql-'+md5Hex+'.socket')
+project.properties['mysql.socket'] = mysqlSocket.absolutePath
+
+if (project.properties['delete'] == 'true') {
+    log.info('Deleting mysql.socket file: ' + mysqlSocket)
+    mysqlSocket.delete();
+}