Merge remote-tracking branch 'origin' into ZNTA-1693-projectsidebar

zanata · Feb 14, 2017 · 95e2574 · 95e2574
2 parents e888e2b + e511462
commit 95e2574
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 57 deletions.
diff --git a/server/docker/conf/zanata-config.cli b/server/docker/conf/zanata-config.cli
@@ -46,12 +46,13 @@ data-source add --name=zanataDatasource \
 # /subsystem=logging/logger=LOG_CATEGORY:write-attribute(name=level,value=DEBUG)
 # /subsystem=logging/logger=LOG_CATEGORY:write-attribute(name=filter-spec, value=FILTER_EXPRESSION)
 
-## JDBC connection allocation/release will be logged to server.log
-/subsystem=logging/logger=org.hibernate.engine.jdbc.internal.LogicalConnectionImpl:add
-/subsystem=logging/logger=org.hibernate.engine.jdbc.internal.LogicalConnectionImpl:write-attribute(name=level,value=DEBUG)
-## More info about JDBC connections will be logged to server.log
-/subsystem=logging/logger=org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl:add
-/subsystem=logging/logger=org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl:write-attribute(name=level,value=DEBUG)
+## Remove default file logging (server.log)
+/subsystem=logging/root-logger=ROOT:remove-handler(name=FILE)
+/subsystem=logging/periodic-rotating-file-handler=FILE:remove
+
+## Allow stdout handler to include DEBUG/TRACE logging
+/subsystem=logging/console-handler=CONSOLE:write-attribute(name=level,value=TRACE)
+
 ## Disable some startup warnings triggered by third-party jars
 /subsystem=logging/logger=org.jboss.as.server.deployment:add
 /subsystem=logging/logger=org.jboss.as.server.deployment:write-attribute(name=level,value=INFO)

diff --git a/server/docker/rundb.sh b/server/docker/rundb.sh
@@ -1,10 +1,11 @@
-#!/bin/bash
+#!/bin/bash -eu
+### This program sets up the data volume and database containers for Zanata
 
 # determine directory containing this script
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
+  SOURCE="$(realpath "$SOURCE")"
   [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -14,7 +15,6 @@ source ${DIR}/common
 VOLUME_DIR=$HOME/docker-volumes/zanata-mariadb
 
 mkdir -p $VOLUME_DIR
-sudo chcon -Rt svirt_sandbox_file_t $VOLUME_DIR
 
 while getopts ":n:h" opt; do
   case ${opt} in
@@ -41,7 +41,7 @@ docker run --name zanatadb \
   -e MYSQL_USER=$DB_USERNAME -e MYSQL_PASSWORD=$DB_PASSWORD \
   -e MYSQL_DATABASE=$DB_SCHEMA -e MYSQL_ROOT_PASSWORD=$DB_ROOT_PASSWORD \
   -P --net=${DOCKER_NETWORK} \
-  -v $VOLUME_DIR:/var/lib/mysql \
+  -v $VOLUME_DIR:/var/lib/mysql:Z \
   -d mariadb:10.1 \
   --character-set-server=utf8 --collation-server=utf8_general_ci
 

diff --git a/server/docker/rundev.sh b/server/docker/rundev.sh
@@ -1,10 +1,10 @@
-#!/bin/bash -xe
+#!/bin/bash -xeu
 
 # determine directory containing this script
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
   DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
+  SOURCE="$(realpath "$SOURCE")"
   [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
 done
 DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
@@ -18,7 +18,7 @@ ZANATA_WAR=$(echo $PWD/zanata-war/target/zanata-*.war)
 # volume mapping for JBoss deployment folder (put exploded war or war file here to deploy)
 ZANATA_DEPLOYMENTS_DIR=$HOME/docker-volumes/zanata-deployments
 # make zanata deployment directory accessible to docker containers (SELinux)
-mkdir -p ${ZANATA_DEPLOYMENTS_DIR} && chcon -Rt svirt_sandbox_file_t ${ZANATA_DEPLOYMENTS_DIR}
+mkdir -p ${ZANATA_DEPLOYMENTS_DIR}
 
 if [ -f "$ZANATA_WAR" ]
 then
@@ -102,7 +102,7 @@ ensure_docker_network
 # volume mapping for zanata server files
 ZANATA_DIR=$HOME/docker-volumes/zanata
 # create the data directory and set permissions (SELinux)
-mkdir -p $ZANATA_DIR && chcon -Rt svirt_sandbox_file_t "$ZANATA_DIR"
+mkdir -p $ZANATA_DIR
 
 # build the docker dev image
 docker build -t zanata/server-dev docker/
@@ -121,6 +121,6 @@ docker run \
     -e MAIL_HOST="${MAIL_HOST}" ${MAIL_CREDENTIAL_ENV} \
     --rm --name zanata --net=${DOCKER_NETWORK} \
     -p ${HTTP_PORT}:8080 -p ${DEBUG_PORT}:8787 -p ${MGMT_PORT}:9990 -it \
-    -v ${ZANATA_DEPLOYMENTS_DIR}:${JBOSS_DEPLOYMENT_VOLUME} \
-    -v $ZANATA_DIR:/opt/jboss/zanata \
+    -v ${ZANATA_DEPLOYMENTS_DIR}:${JBOSS_DEPLOYMENT_VOLUME}:Z \
+    -v $ZANATA_DIR:/opt/jboss/zanata:Z \
     zanata/server-dev
diff --git a/server/functional-test/src/test/conf/standalone_wildfly.xml b/server/functional-test/src/test/conf/standalone_wildfly.xml
@@ -115,14 +115,6 @@
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
-      <!-- JDBC connection allocation/release will be logged to server.log -->
-      <!--<logger category="org.hibernate.engine.jdbc.internal.LogicalConnectionImpl">-->
-        <!--<level name="DEBUG"/>-->
-      <!--</logger>-->
-      <!-- More info about JDBC connections will be logged to server.log -->
-      <!--<logger category="org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl">-->
-        <!--<level name="DEBUG"/>-->
-      <!--</logger>-->
       <logger category="org.jboss.as.config">
         <level name="DEBUG"/>
       </logger>

diff --git a/server/zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml b/server/zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
@@ -121,15 +121,6 @@
             <logger category="com.arjuna">
                 <level name="WARN" />
             </logger>
-            <!-- JDBC connection allocation/release will be logged to server.log -->
-            <logger
-              category="org.hibernate.engine.jdbc.internal.LogicalConnectionImpl">
-                <level name="DEBUG" />
-            </logger>
-            <!-- More info about JDBC connections will be logged to server.log -->
-            <logger category="org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl">
-                <level name="DEBUG" />
-            </logger>
             <logger category="org.jboss.as.config">
                 <level name="DEBUG" />
             </logger>

diff --git a/server/zanata-war/src/test/java/org/zanata/adapter/TSAdapterTest.java b/server/zanata-war/src/test/java/org/zanata/adapter/TSAdapterTest.java
@@ -250,27 +250,19 @@ public void testFailToParseOriginalFile() throws Exception {
     }
 
     private String getContext(TextFlow textFlow) {
-        Iterator<TextFlowExtension> iterator = textFlow.getExtensions().iterator();
-        while (iterator.hasNext()) {
-            try {
-                PotEntryHeader potEntryHeader = (PotEntryHeader) iterator.next();
-                return potEntryHeader.getContext();
-            } catch(ClassCastException cce) {
-                // Not a PotEntryHeader
-            }
+        PotEntryHeader potEntryHeader = textFlow.getExtensions(true)
+                .findByType(PotEntryHeader.class);
+        if (potEntryHeader != null) {
+            return potEntryHeader.getContext();
         }
         return null;
     }
 
     private String getComment(TextFlow textFlow) {
-        Iterator<TextFlowExtension> iterator = textFlow.getExtensions().iterator();
-        while (iterator.hasNext()) {
-            try {
-                SimpleComment simpleComment = (SimpleComment) iterator.next();
-                return simpleComment.getValue();
-            } catch(ClassCastException cce) {
-                // Not a SimpleComment
-            }
+        SimpleComment simpleComment = textFlow.getExtensions(true)
+                .findByType(SimpleComment.class);
+        if (simpleComment != null) {
+            return simpleComment.getValue();
         }
         return null;
     }

diff --git a/server/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/server/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -116,14 +116,6 @@
       <logger category="com.arjuna">
         <level name="WARN"/>
       </logger>
-      <!-- JDBC connection allocation/release will be logged to server.log -->
-      <logger category="org.hibernate.engine.jdbc.internal.LogicalConnectionImpl">
-        <level name="DEBUG"/>
-      </logger>
-      <!-- More info about JDBC connections will be logged to server.log -->
-      <logger category="org.hibernate.engine.jdbc.internal.JdbcCoordinatorImpl">
-        <level name="DEBUG"/>
-      </logger>
       <logger category="org.jboss.as.config">
         <level name="DEBUG"/>
       </logger>