Fix some compilation errors after migration

zanata · Jul 9, 2015 · 176dedf · 176dedf
1 parent 17ae8ea
commit 176dedf
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 73 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java b/zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
@@ -182,7 +182,7 @@ public static void persistApplicationConfig(String key,
 
         Event<ConfigurationChanged> event =
                 ServiceLocator.instance().getInstance(Event.class);
-        event.fireAfterSuccess(new ConfigurationChanged(key));
+        event.fire(new ConfigurationChanged(key));
     }
 
     private boolean isConfigKeyValid(String configKey) {

diff --git a/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java b/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java
diff --git a/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java b/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
@@ -50,9 +50,8 @@
 import static org.jboss.seam.ScopeType.SESSION;
 import static org.jboss.seam.annotations.Install.APPLICATION;
 
-@Named("org.jboss.seam.security.identity")
+@Named("zanataIdentity")
 @javax.enterprise.context.SessionScoped
-@Install(precedence = APPLICATION)
 @BypassInterceptors
 /* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */
 public class ZanataIdentity extends Identity {

diff --git a/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
@@ -110,8 +110,7 @@ public class DocumentServiceImpl implements DocumentService {
     @Inject
     private ApplicationConfiguration applicationConfiguration;
 
-    @Inject(value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION,
-            required = false)
+    @Inject
     private HAccount authenticatedAccount;
 
     @Inject
@@ -204,7 +203,7 @@ public HDocument saveDocument(String projectSlug, String iterationSlug,
 
         long actorId = authenticatedAccount.getPerson().getId();
         if (changed) {
-            documentUploadedEvent.fireAfterSuccess(new DocumentUploadedEvent(
+            documentUploadedEvent.fire(new DocumentUploadedEvent(
                     actorId, document.getId(), true, hLocale.getLocaleId()));
             clearStatsCacheForUpdatedDocument(document);
         }

diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
@@ -129,8 +129,7 @@ public class TranslationServiceImpl implements TranslationService {
     @Inject
     private ValidationService validationServiceImpl;
 
-    @Inject(value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION,
-            required = false)
+    @Inject
     private HAccount authenticatedAccount;
 
     @Inject
@@ -321,7 +320,7 @@ private void signalPostTranslateEvent(Long actorId,
             // new DocumentId(document.getId(), document.getDocId()), hasError,
             // hTextFlowTarget.getLastChanged(),
             // hTextFlowTarget.getLastModifiedBy().getAccount().getUsername());
-            textFlowTargetStateEvent.fireAfterSuccess(
+            textFlowTargetStateEvent.fire(
                     new TextFlowTargetStateEvent(actorId, versionId,
                             documentId, textFlow.getId(), hTextFlowTarget
                             .getLocale().getLocaleId(), hTextFlowTarget

diff --git a/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java b/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
@@ -51,9 +51,6 @@
  */
 @org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */
 @Named("jsfMessages")
-@Install(precedence = APPLICATION,
-        classDependencies = "javax.faces.context.FacesContext")
-
 @BypassInterceptors
 public class FacesMessages {
 

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java b/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
@@ -175,7 +175,7 @@ private void prepareTransUnitUpdatedEvent(int previousVersionNum,
                             "unknown", -1),
                             TransUnitUpdated.UpdateType.NonEditorSave);
         }
-        textFlowTargetUpdatedEvent.fireAfterSuccess(
+        textFlowTargetUpdatedEvent.fire(
                 new TextFlowTargetUpdatedEvent(workspaceOptional.get(),
                         target.getId(), updated));
     }

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
@@ -33,6 +33,9 @@
 import org.zanata.webtrans.shared.model.ValidationAction.*;
 import org.zanata.webtrans.shared.rpc.*;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 /**
  *
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
@@ -43,6 +43,8 @@
 
 import javax.enterprise.event.Observes;
 import javax.enterprise.event.TransactionPhase;
+import javax.inject.Inject;
+import javax.inject.Named;
 
 /**
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>