Merge pull request #230 from zanata/scope-and-thread-safety

Scope and thread safety (bugfixes)
zanata · Oct 17, 2013 · bd95c68 · bd95c68
2 parents 3a9ea5c + 4bd3921
commit bd95c68
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/zanata-war/src/etc/zanata-ds.xml b/zanata-war/src/etc/zanata-ds.xml
@@ -8,8 +8,7 @@ See http://jaitechwriteups.blogspot.com/2012/02/jboss-as-710final-thunder-releas
 -->
 <datasources>
   <datasource jndi-name="java:jboss/datasources/zanataDatasource"
-    enabled="true" use-java-context="true" pool-name="zanataDatasource"
-    use-ccm="true">
+    enabled="true" use-java-context="true" pool-name="zanataDatasource">
     <connection-url>jdbc:mysql://localhost:3306/zanata?characterEncoding=UTF-8</connection-url>
     <driver>mysql-connector-java.jar</driver>
     <security>

diff --git a/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java b/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
@@ -40,7 +41,6 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-
 import static org.zanata.async.tasks.CopyTransTask.CopyTransTaskHandle;
 
 /**
@@ -50,6 +50,7 @@
  * @author Carlos Munoz <a
  *         href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
+@AutoCreate
 @Name("copyTransManager")
 @Scope(ScopeType.STATELESS)
 // TODO This class should be merged with the copy trans service (?)

diff --git a/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java b/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
@@ -6,6 +6,7 @@
 import java.util.concurrent.ExecutionException;
 
 import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.AutoCreate;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
@@ -15,6 +16,7 @@
 import org.joda.time.format.PeriodFormatterBuilder;
 import org.zanata.async.AsyncTaskHandle;
 
+@AutoCreate
 @Name("reindexAction")
 @Scope(ScopeType.STATELESS)
 @Restrict("#{s:hasRole('admin')}")

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java b/zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
@@ -6,6 +6,7 @@
 
 import javax.servlet.http.HttpSession;
 
+import lombok.extern.slf4j.Slf4j;
 import net.customware.gwt.dispatch.server.ActionHandler;
 import net.customware.gwt.dispatch.server.ActionResult;
 import net.customware.gwt.dispatch.server.Dispatch;
@@ -17,13 +18,11 @@
 
 import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
-import org.jboss.seam.annotations.Logger;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
 import org.jboss.seam.annotations.Startup;
 import org.jboss.seam.deployment.HotDeploymentStrategy;
 import org.jboss.seam.deployment.StandardDeploymentStrategy;
-import org.jboss.seam.log.Log;
 import org.jboss.seam.security.AuthorizationException;
 import org.jboss.seam.security.NotLoggedInException;
 import org.jboss.seam.web.ServletContexts;
@@ -37,15 +36,13 @@
 @Name("seamDispatch")
 @Scope(ScopeType.APPLICATION)
 @Startup
+@Slf4j
 public class SeamDispatch implements Dispatch {
 
     @SuppressWarnings("rawtypes")
     private final Map<Class<? extends Action>, Class<? extends ActionHandler<?, ?>>> handlers =
             Maps.newHashMap();
 
-    @Logger
-    Log log;
-
     @SuppressWarnings("rawtypes")
     public SeamDispatch() {
         // register all handlers with the @ActionHandlerFor annotation
@@ -75,7 +72,7 @@ public SeamDispatch() {
 
     @SuppressWarnings("unchecked")
     private void register(Class<?> clazz) {
-        log.debug("Registering ActionHandler {0}", clazz.getName());
+        log.debug("Registering ActionHandler {}", clazz.getName());
         ActionHandlerFor ahf = clazz.getAnnotation(ActionHandlerFor.class);
         handlers.put(ahf.value(), (Class<? extends ActionHandler<?, ?>>) clazz);
     }

diff --git a/zanata-war/src/test/resources/arquillian/standalone.xml b/zanata-war/src/test/resources/arquillian/standalone.xml
@@ -211,7 +211,7 @@
           <keepalive-time time="10" unit="seconds" />
         </long-running-threads>
       </default-workmanager>
-      <cached-connection-manager debug="true" />
+      <cached-connection-manager/>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jdr:1.0" />
     <subsystem xmlns="urn:jboss:domain:jmx:1.1">