diff --git a/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java b/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java index 46df408427..aa441b0230 100644 --- a/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java +++ b/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java @@ -85,7 +85,7 @@ public String getKey() { } @NotNull - @Type(type = "text") + @javax.persistence.Lob @Column(name = "config_value", nullable = false) public String getValue() { return value; diff --git a/zanata-model/src/main/java/org/zanata/model/HDocument.java b/zanata-model/src/main/java/org/zanata/model/HDocument.java index c31dc2e5ba..a1513ed38f 100644 --- a/zanata-model/src/main/java/org/zanata/model/HDocument.java +++ b/zanata-model/src/main/java/org/zanata/model/HDocument.java @@ -57,7 +57,6 @@ import org.hibernate.annotations.Where; import org.hibernate.validator.constraints.NotEmpty; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.ContentType; diff --git a/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java b/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java index 0d974f5415..86a904813e 100644 --- a/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java +++ b/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java @@ -71,7 +71,7 @@ public Map getGlossaryTerms() { return glossaryTerms; } - @Type(type = "text") + @javax.persistence.Lob public String getSourceRef() { return sourceRef; } diff --git a/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java b/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java index ddb0b7fbd1..2d163014a6 100644 --- a/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java +++ b/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java @@ -80,7 +80,7 @@ public HGlossaryTerm(String content) { } @NotNull - @Type(type = "text") + @javax.persistence.Lob @Field(analyzer = @Analyzer(impl = StandardAnalyzer.class)) public String getContent() { return content; diff --git a/zanata-model/src/main/java/org/zanata/model/HProject.java b/zanata-model/src/main/java/org/zanata/model/HProject.java index d4b5c74a4e..8a3ea3fc5d 100644 --- a/zanata-model/src/main/java/org/zanata/model/HProject.java +++ b/zanata-model/src/main/java/org/zanata/model/HProject.java @@ -110,7 +110,7 @@ public class HProject extends SlugEntityBase implements Serializable, @Field(analyzer = @Analyzer(impl = CaseInsensitiveWhitespaceAnalyzer.class)) private String description; - @Type(type = "text") + @javax.persistence.Lob private String homeContent; @Url(canEndInSlash = true) diff --git a/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java b/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java index 7511281713..58559bd85a 100644 --- a/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java +++ b/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java @@ -76,7 +76,7 @@ protected void setId(Long id) { } @NotNull - @Type(type = "text") + @javax.persistence.Lob public String getComment() { return comment; } diff --git a/zanata-model/src/main/java/org/zanata/model/HTermComment.java b/zanata-model/src/main/java/org/zanata/model/HTermComment.java index a1cbec40bd..9653b44e8a 100644 --- a/zanata-model/src/main/java/org/zanata/model/HTermComment.java +++ b/zanata-model/src/main/java/org/zanata/model/HTermComment.java @@ -74,7 +74,7 @@ protected void setId(Long id) { } @NotNull - @Type(type = "text") + @javax.persistence.Lob public String getComment() { return comment; } diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java index cdf9551e25..c41f428bcd 100644 --- a/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java +++ b/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java @@ -100,7 +100,7 @@ public void setTextFlow(HTextFlow textFlow) { } @NotEmpty - @Type(type = "text") + @javax.persistence.Lob @AccessType("field") @ElementCollection(fetch = FetchType.EAGER) @JoinTable(name = "HTextFlowContentHistory", joinColumns = @JoinColumn( diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java index 35e8c28ffb..0bfc2129a3 100644 --- a/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java +++ b/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java @@ -163,7 +163,7 @@ public void setVersionNum(Integer versionNum) { } @Override - @Type(type = "text") + @javax.persistence.Lob @AccessType("field") @ElementCollection(fetch = FetchType.EAGER) @JoinTable(name = "HTextFlowTargetContentHistory", diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java index 079ed003de..b73a78428a 100644 --- a/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java +++ b/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java @@ -69,7 +69,7 @@ public class HTextFlowTargetReviewComment extends ModelEntityBase { private HTextFlowTarget textFlowTarget; @NotEmpty - @Type(type = "text") + @javax.persistence.Lob @Getter private String comment; diff --git a/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java b/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java index acb13092de..b4fbcb8e2e 100644 --- a/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java +++ b/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java @@ -118,7 +118,7 @@ public void setReferences(String references) { * Gettext message references, delimited by ',' (comma) */ @Column(name = "refs") - @Type(type = "text") + @javax.persistence.Lob public String getReferences() { return references; } diff --git a/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java b/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java index 401e5c6163..b01168a293 100644 --- a/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java +++ b/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.java @@ -59,7 +59,7 @@ public HSimpleComment getComment() { } // see PoUtility.stringToHeaderEntries - @Type(type = "text") + @javax.persistence.Lob public String getEntries() { return entries; } diff --git a/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java b/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java index 5169246303..1bbf0ddca0 100644 --- a/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java +++ b/zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java @@ -10,8 +10,8 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.security.RunAsOperation; import org.zanata.common.LocaleId; @@ -30,14 +30,14 @@ * href="mailto:pahuang@redhat.com">pahuang@redhat.com */ @Path("/test/data/sample") -@Name("sampleProjectResourceImpl") +@Named("sampleProjectResourceImpl") @Slf4j public class SampleDataResourceImpl implements SampleDataResource { - @In(create = true) + @Inject private SampleProjectProfile sampleProjectProfile; - @In + @Inject private EntityManager entityManager; @Override diff --git a/zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java b/zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java index 50b430c8a1..d133296ef6 100644 --- a/zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java +++ b/zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java @@ -6,11 +6,8 @@ import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.Search; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.common.ContentType; import org.zanata.common.LocaleId; @@ -58,16 +55,16 @@ * href="mailto:pahuang@redhat.com">pahuang@redhat.com */ @Slf4j -@Name("sampleProjectProfile") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("sampleProjectProfile") +@javax.enterprise.context.ApplicationScoped + @Transactional public class SampleProjectProfile { - @In + @Inject private EntityManager entityManager; - @In + @Inject private EntityManagerFactory entityManagerFactory; private HLocale enUSLocale; diff --git a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java index c630211a6a..4a55881817 100644 --- a/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java +++ b/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java @@ -38,12 +38,10 @@ import lombok.Setter; import org.apache.log4j.Level; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Synchronized; import org.jboss.seam.web.ServletContexts; @@ -62,9 +60,9 @@ import com.google.common.collect.Sets; import org.zanata.security.OpenIdLoginModule; -@Name("applicationConfiguration") -@Scope(ScopeType.APPLICATION) -@Startup +@Named("applicationConfiguration") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) @Slf4j public class ApplicationConfiguration implements Serializable { @@ -76,13 +74,13 @@ public class ApplicationConfiguration implements Serializable { @Getter private static final int defaultMaxFilesPerUpload = 100; - @In + @Inject private DatabaseBackedConfig databaseBackedConfig; - @In + @Inject private JndiBackedConfig jndiBackedConfig; - @In + @Inject private JaasConfig jaasConfig; - @In + @Inject private Messages msgs; private static final ZanataSMTPAppender smtpAppenderInstance = @@ -118,7 +116,7 @@ public class ApplicationConfiguration implements Serializable { private String defaultServerPath; - @Create + @PostConstruct public void load() { log.info("Reloading configuration"); this.loadLoginModuleNames(); diff --git a/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java b/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java index f53afb1b78..517630da7f 100644 --- a/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java +++ b/zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java @@ -22,11 +22,8 @@ package org.zanata; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Named; import javax.faces.application.ResourceHandler; import javax.faces.context.FacesContext; @@ -45,9 +42,9 @@ * * @author Alex Eng aeng@redhat.com */ -@AutoCreate -@Name("assets") -@Scope(ScopeType.APPLICATION) + +@Named("assets") +@javax.enterprise.context.ApplicationScoped public class WebAssetsConfiguration extends AbstractMap { /** diff --git a/zanata-war/src/main/java/org/zanata/ZanataInit.java b/zanata-war/src/main/java/org/zanata/ZanataInit.java index 42d8dfa97c..760ffb2958 100644 --- a/zanata-war/src/main/java/org/zanata/ZanataInit.java +++ b/zanata-war/src/main/java/org/zanata/ZanataInit.java @@ -57,17 +57,15 @@ import org.apache.commons.io.FileUtils; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.contexts.ServletLifecycle; import org.jboss.seam.mail.MailSession; import org.zanata.events.ServerStarted; import org.zanata.exception.ZanataInitializationException; import org.zanata.rest.dto.VersionInfo; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.util.VersionUtility; /** @@ -79,8 +77,8 @@ * @author Christian Bauer * @author Sean Flanigan sflaniga@redhat.com */ -@Name("zanataInit") -@Scope(ScopeType.STATELESS) +@Named("zanataInit") +@javax.enterprise.context.Dependent @Slf4j public class ZanataInit { private static final DefaultArtifactVersion MIN_EAP_VERSION = @@ -101,10 +99,10 @@ public class ZanataInit { Level.SEVERE); } - @In + @Inject private ApplicationConfiguration applicationConfiguration; - @In("event") + @Inject private Event startupEvent; @Observer("org.jboss.seam.postInitialization") diff --git a/zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java b/zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java index c29008ad4b..0d113f6f67 100644 --- a/zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java +++ b/zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java @@ -4,7 +4,7 @@ import javax.validation.constraints.Size; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; -import org.jboss.seam.annotations.In; +import javax.inject.Inject; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.AccountDAO; import org.zanata.dao.PersonDAO; @@ -24,19 +24,19 @@ public abstract class AbstractProfileAction { protected boolean valid; private String activationKey; - @In + @Inject ZanataIdentity identity; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ HAccount authenticatedAccount; - @In + @Inject PersonDAO personDAO; - @In + @Inject AccountDAO accountDAO; protected void validateEmail(String email) { diff --git a/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java b/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java index 8867f297d5..2bd9f60705 100644 --- a/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java +++ b/zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java @@ -27,11 +27,9 @@ import lombok.Getter; import lombok.Setter; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; +import javax.enterprise.inject.Produces; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.AccountDAO; @@ -48,29 +46,29 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("accountMergeAction") -@Scope(ScopeType.PAGE) +@Named("accountMergeAction") +@javax.faces.bean.ViewScoped public class AccountMergeAction implements Serializable { private static final long serialVersionUID = 1L; - @In(value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private AuthenticationManager authenticationManager; - @In + @Inject private RegisterService registerServiceImpl; @Getter @Setter private String openId = "http://"; - @In(required = false, scope = ScopeType.SESSION) - @Out(required = false, scope = ScopeType.SESSION) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, scope = ScopeType.SESSION) */ + @Produces /* FIXME [CDI] check this: migrated from @Out */(required = false, scope = ScopeType.SESSION) @Getter private HAccount obsoleteAccount; diff --git a/zanata-war/src/main/java/org/zanata/action/ActivateAction.java b/zanata-war/src/main/java/org/zanata/action/ActivateAction.java index fa348e317d..bb34ba488d 100644 --- a/zanata-war/src/main/java/org/zanata/action/ActivateAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ActivateAction.java @@ -24,12 +24,10 @@ import java.util.Date; import org.apache.commons.lang.time.DateUtils; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityManager; import org.zanata.dao.AccountActivationKeyDAO; @@ -38,19 +36,19 @@ import org.zanata.model.HAccountActivationKey; import org.zanata.ui.faces.FacesMessages; -@Name("activate") -@Scope(ScopeType.CONVERSATION) +@Named("activate") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ public class ActivateAction implements Serializable { private static final long serialVersionUID = -8079131168179421345L; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private AccountActivationKeyDAO accountActivationKeyDAO; - @In + @Inject private IdentityManager identityManager; private String activationKey; diff --git a/zanata-war/src/main/java/org/zanata/action/ActivityAction.java b/zanata-war/src/main/java/org/zanata/action/ActivityAction.java index 66b430576c..f6732dcca9 100644 --- a/zanata-war/src/main/java/org/zanata/action/ActivityAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ActivityAction.java @@ -24,11 +24,11 @@ import java.util.Collections; import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.model.Activity; import org.zanata.model.HAccount; @@ -37,16 +37,16 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("activityAction") -@Scope(ScopeType.PAGE) -@Restrict("#{identity.loggedIn}") +@Named("activityAction") +@javax.faces.bean.ViewScoped +@CheckLoggedIn public class ActivityAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private ActivityService activityServiceImpl; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; private final int ACTIVITY_COUNT_PER_LOAD = 5; diff --git a/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java b/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java index 9622137534..d10bb3ab4f 100644 --- a/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java +++ b/zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java @@ -24,10 +24,8 @@ import lombok.Getter; import lombok.Setter; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.DocumentDAO; import org.zanata.dao.PersonDAO; import org.zanata.dao.ProjectDAO; @@ -40,30 +38,30 @@ * @author Alex Eng aeng@redhat.com * **/ -@Name("adminStatsAction") -@Scope(ScopeType.PAGE) +@Named("adminStatsAction") +@javax.faces.bean.ViewScoped public class AdminStatsAction implements Serializable { /** * */ private static final long serialVersionUID = 1L; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private DocumentDAO documentDAO; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java b/zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java index 2ca45aa065..3384f0c113 100644 --- a/zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java +++ b/zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java @@ -21,17 +21,16 @@ package org.zanata.action; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import javax.servlet.http.HttpServletRequest; /** * @author Sean Flanigan sflaniga@redhat.com */ -@AutoCreate -@Name("ajaxCounter") + +@Named("ajaxCounter") @Slf4j public class AjaxCounterBean { // http://stackoverflow.com/questions/4410218/trying-to-keep-track-of-number-of-outstanding-ajax-requests-in-firefox @@ -71,7 +70,7 @@ public class AjaxCounterBean { "})(XMLHttpRequest);\n" + "\n"; - @In + @Inject private HttpServletRequest httpRequest; public String getAjaxCounterScript() { diff --git a/zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java b/zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java index bcdf4de5ef..b39d7df8d9 100644 --- a/zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java @@ -21,10 +21,8 @@ package org.zanata.action; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.ApplicationConfiguration; /** @@ -35,10 +33,10 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("applicationConfigurationAction") -@Scope(ScopeType.STATELESS) +@Named("applicationConfigurationAction") +@javax.enterprise.context.Dependent public class ApplicationConfigurationAction { - @In + @Inject private ApplicationConfiguration applicationConfiguration; public boolean isLoginHandledByInternalPage() { diff --git a/zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java b/zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java index 18ce26882f..f1b0e2e49e 100644 --- a/zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java +++ b/zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java @@ -22,10 +22,8 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.model.HAccount; import org.zanata.model.HPerson; @@ -34,8 +32,8 @@ /** * A simple bean to hold the currently authenticated account. */ -@Name("authenticatedAccountHome") -@Scope(ScopeType.CONVERSATION) +@Named("authenticatedAccountHome") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ @Slf4j public class AuthenticatedAccountHome extends EntityHome { @@ -44,7 +42,7 @@ public class AuthenticatedAccountHome extends EntityHome { */ private static final long serialVersionUID = 1L; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ HAccount authenticatedAccount; @Override diff --git a/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java b/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java index 215c8f7e7d..7f59d4ea2d 100644 --- a/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java +++ b/zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java @@ -24,16 +24,14 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.security.Identity; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.model.HAccount; -@Name("authenticationEvents") -@Scope(ScopeType.STATELESS) +@Named("authenticationEvents") +@javax.enterprise.context.Dependent @Slf4j public class AuthenticationEvents implements Serializable { private static final long serialVersionUID = 1L; diff --git a/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java b/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java index 6c01cc3aeb..2d8b0b4622 100644 --- a/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java +++ b/zanata-war/src/main/java/org/zanata/action/Breadcrumbs.java @@ -6,14 +6,11 @@ import java.util.List; import java.util.Map; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -@Name("breadcrumbs") -@AutoCreate -@Scope(ScopeType.PAGE) +import javax.inject.Named; + +@Named("breadcrumbs") + +@javax.faces.bean.ViewScoped public class Breadcrumbs implements Serializable { private static final long serialVersionUID = 1L; diff --git a/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java b/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java index 224764abe1..ed23bdf66c 100644 --- a/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java @@ -28,25 +28,23 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.web.RequestParameter; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.servlet.annotations.HttpParam; import org.zanata.model.HLocale; import org.zanata.service.ConfigurationService; -@Name("configurationAction") -@Scope(ScopeType.EVENT) +@Named("configurationAction") +@javax.enterprise.context.RequestScoped @Slf4j public class ConfigurationAction implements Serializable { private static final long serialVersionUID = 1L; - @RequestParameter("iterationSlug") + @Inject @HttpParam("iterationSlug") private String iterationSlug; - @RequestParameter("projectSlug") + @Inject @HttpParam("projectSlug") private String projectSlug; - @In + @Inject private ConfigurationService configurationServiceImpl; public void downloadGeneralConfig() { diff --git a/zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java b/zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java index eaa1fabb3c..13b4602628 100644 --- a/zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java @@ -23,12 +23,12 @@ import java.io.Serializable; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.email.ContactAdminAnonymousEmailStrategy; import org.zanata.email.ContactAdminEmailStrategy; @@ -51,21 +51,21 @@ * * @author Alex Eng aeng@redhat.com */ -@Name("contactAdminAction") -@Scope(ScopeType.PAGE) +@Named("contactAdminAction") +@javax.faces.bean.ViewScoped @Slf4j public class ContactAdminAction implements Serializable { - @In(value = JpaIdentityStore.AUTHENTICATED_USER, required = false) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER, required = false) */ private HAccount authenticatedAccount; - @In + @Inject private EmailService emailServiceImpl; - @In + @Inject private Messages msgs; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; @Getter @@ -79,7 +79,7 @@ public class ContactAdminAction implements Serializable { /** * Send email to admin by registered user. */ - @Restrict("#{identity.loggedIn}") + @CheckLoggedIn public void send() { String fromName = authenticatedAccount.getPerson().getName(); String fromLoginName = authenticatedAccount.getUsername(); diff --git a/zanata-war/src/main/java/org/zanata/action/CopyTransAction.java b/zanata-war/src/main/java/org/zanata/action/CopyTransAction.java index da133d01cf..32d0b18bfc 100644 --- a/zanata-war/src/main/java/org/zanata/action/CopyTransAction.java +++ b/zanata-war/src/main/java/org/zanata/action/CopyTransAction.java @@ -23,13 +23,13 @@ import java.io.Serializable; import javax.faces.application.FacesMessage; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessage; import org.zanata.async.handle.CopyTransTaskHandle; @@ -52,24 +52,24 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("copyTransAction") -@Scope(ScopeType.CONVERSATION) +@Named("copyTransAction") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ public class CopyTransAction extends CopyAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private CopyTransManager copyTransManager; - @In + @Inject private ConversationScopeMessages conversationScopeMessages; - @In + @Inject private Messages msgs; - @In + @Inject private CopyTransOptionsModel copyTransOptionsModel; @Getter @@ -82,7 +82,7 @@ public class CopyTransAction extends CopyAction implements Serializable { private HProjectIteration projectIteration; - @Create + @PostConstruct public void onCreate() { copyTransOptionsModel.setInstance(CopyTransOptionFactory .getExplicitOptions()); @@ -132,7 +132,7 @@ public HProjectIteration getProjectIteration() { return projectIteration; } - @Restrict("#{s:hasPermission(copyTransAction.projectIteration, 'copy-trans')}") + @Restrict("#{identity.hasPermission(copyTransAction.projectIteration, 'copy-trans')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void startCopyTrans() { if (isInProgress()) { diff --git a/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java b/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java index 344d73963f..3fa6b1ebfe 100644 --- a/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java +++ b/zanata-war/src/main/java/org/zanata/action/CopyTransManager.java @@ -31,11 +31,8 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; @@ -52,21 +49,21 @@ * @author Carlos Munoz camunoz@redhat.com */ -@AutoCreate -@Name("copyTransManager") -@Scope(ScopeType.STATELESS) + +@Named("copyTransManager") +@javax.enterprise.context.Dependent @Slf4j // TODO This class should be merged with the copy trans service (?) public class CopyTransManager implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; - @In + @Inject private CopyTransService copyTransServiceImpl; - @In + @Inject private Identity identity; public boolean isCopyTransRunning(@Nonnull Object target) { diff --git a/zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java b/zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java index dc059dd00f..cde3b5a434 100644 --- a/zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java +++ b/zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java @@ -24,11 +24,8 @@ import java.util.List; import javax.persistence.EntityManager; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.i18n.Messages; import org.zanata.model.HCopyTransOptions; import org.zanata.service.impl.CopyTransOptionFactory; @@ -47,19 +44,19 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("copyTransOptionsModel") -@Scope(ScopeType.PAGE) -@AutoCreate +@Named("copyTransOptionsModel") +@javax.faces.bean.ViewScoped + public class CopyTransOptionsModel implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private EntityManager entityManager; @Setter private HCopyTransOptions instance; - @In + @Inject private Messages msgs; @Getter(lazy = true) diff --git a/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java b/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java index d8ca47b6e7..258c776acc 100644 --- a/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java +++ b/zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java @@ -7,11 +7,8 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.async.AsyncTaskHandleManager; import org.zanata.async.handle.CopyVersionTaskHandle; @@ -22,18 +19,18 @@ * * @author Alex Eng aeng@redhat.com */ -@AutoCreate -@Name("copyVersionManager") -@Scope(ScopeType.STATELESS) + +@Named("copyVersionManager") +@javax.enterprise.context.Dependent @Slf4j public class CopyVersionManager implements Serializable { - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; - @In + @Inject private CopyVersionService copyVersionServiceImpl; - @In + @Inject private Identity identity; /** diff --git a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java index 4131138011..285e611ee5 100644 --- a/zanata-war/src/main/java/org/zanata/action/DashboardAction.java +++ b/zanata-war/src/main/java/org/zanata/action/DashboardAction.java @@ -30,11 +30,11 @@ import com.google.common.collect.Collections2; import lombok.NonNull; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; import org.zanata.dao.AccountDAO; @@ -57,34 +57,34 @@ import lombok.Getter; -@Name("dashboardAction") -@Scope(ScopeType.PAGE) -@Restrict("#{identity.loggedIn}") +@Named("dashboardAction") +@javax.faces.bean.ViewScoped +@CheckLoggedIn public class DashboardAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private GravatarService gravatarServiceImpl; - @In + @Inject private ActivityService activityServiceImpl; - @In + @Inject private LanguageTeamService languageTeamServiceImpl; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private Messages msgs; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java index 57ea647b15..23080d3084 100644 --- a/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java +++ b/zanata-war/src/main/java/org/zanata/action/GlossaryAction.java @@ -11,10 +11,8 @@ import javax.validation.ConstraintViolationException; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.GlossaryDAO; import org.zanata.dao.LocaleDAO; @@ -36,25 +34,25 @@ import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -@Name("glossaryAction") -@Scope(ScopeType.PAGE) +@Named("glossaryAction") +@javax.faces.bean.ViewScoped @Slf4j public class GlossaryAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private GlossaryDAO glossaryDAO; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private GlossaryFileService glossaryFileServiceImpl; - @In + @Inject private Messages msgs; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/HomePage.java b/zanata-war/src/main/java/org/zanata/action/HomePage.java index 8b2702a325..428d343643 100644 --- a/zanata-war/src/main/java/org/zanata/action/HomePage.java +++ b/zanata-war/src/main/java/org/zanata/action/HomePage.java @@ -21,12 +21,9 @@ package org.zanata.action; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.zanata.ApplicationConfiguration; import org.zanata.events.HomeContentChangedEvent; import org.zanata.util.CommonMarkRenderer; @@ -36,16 +33,16 @@ * * @author Sean Flanigan sflaniga@redhat.com */ -@AutoCreate -@Name("homePage") -@Scope(ScopeType.APPLICATION) + +@Named("homePage") +@javax.enterprise.context.ApplicationScoped @Slf4j public class HomePage { - @In + @Inject private ApplicationConfiguration applicationConfiguration; - @In("commonMarkRenderer") + @Inject private CommonMarkRenderer renderer; private String html; diff --git a/zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java b/zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java index bd50f91998..17b935bc43 100644 --- a/zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java +++ b/zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java @@ -7,10 +7,8 @@ import lombok.Setter; import org.apache.commons.lang.StringUtils; import org.hibernate.validator.constraints.Email; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.action.validator.NotDuplicateEmail; import org.zanata.dao.AccountActivationKeyDAO; @@ -26,31 +24,31 @@ import org.zanata.service.EmailService; import org.zanata.ui.faces.FacesMessages; -@Name("inactiveAccountAction") -@Scope(ScopeType.PAGE) +@Named("inactiveAccountAction") +@javax.faces.bean.ViewScoped public class InactiveAccountAction implements Serializable { - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private EmailService emailServiceImpl; - @In + @Inject private ZanataCredentials credentials; - @In + @Inject private ZanataOpenId zanataOpenId; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private CredentialsDAO credentialsDAO; - @In + @Inject private AccountActivationKeyDAO accountActivationKeyDAO; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageAction.java index ae96997fea..a1ad12a1c9 100644 --- a/zanata-war/src/main/java/org/zanata/action/LanguageAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LanguageAction.java @@ -27,12 +27,12 @@ import javax.persistence.EntityNotFoundException; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.faces.Redirect; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; @@ -53,7 +53,7 @@ import org.zanata.service.LanguageTeamService; import org.zanata.service.LocaleService; import org.zanata.ui.faces.FacesMessages; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.ui.AbstractListFilter; import org.zanata.ui.InMemoryListFilter; import org.zanata.util.ServiceLocator; @@ -64,52 +64,52 @@ import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -@Name("languageAction") -@Scope(ScopeType.PAGE) +@Named("languageAction") +@javax.faces.bean.ViewScoped @Slf4j public class LanguageAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private LanguageTeamService languageTeamServiceImpl; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private Messages msgs; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In("event") + @Inject private Event joinLanguageTeamEvent; - @In("event") + @Inject private Event languageTeamPermissionChangedEvent; - @In("event") + @Inject private Event leaveLanguageTeamEvent; - @In + @Inject private LocaleMemberDAO localeMemberDAO; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private Redirect redirect; @Getter @@ -166,7 +166,7 @@ public boolean isUserInTeam() { } - @Restrict("#{s:hasPermission(languageAction.locale, 'manage-language-team')}") + @Restrict("#{identity.hasPermission(languageAction.locale, 'manage-language-team')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void addSelected() { for (SelectablePerson selectablePerson : getSearchResults()) { if (selectablePerson.isSelected()) { @@ -205,7 +205,7 @@ public void validatePluralForms(ValueChangeEvent e) { isValidPluralForms((String) e.getNewValue(), e.getComponent().getId()); } - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public void saveSettings() { HLocale hLocale = getLocale(); if(!isValidPluralForms(hLocale.getPluralForms(), "pluralForms")) { @@ -264,7 +264,7 @@ public List getLocaleMembers() { } @Transactional - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public void joinLanguageTeam() { if (authenticatedAccount == null) { log.error("failed to load auth person"); @@ -308,7 +308,7 @@ public void leaveLanguageTeam() { getLocale().retrieveNativeName())); } - @Restrict("#{s:hasPermission(languageAction.locale, 'manage-language-team')}") + @Restrict("#{identity.hasPermission(languageAction.locale, 'manage-language-team')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void saveTeamCoordinator(HLocaleMember member) { savePermission(member, msgs.get("jsf.Coordinator"), member.isCoordinator()); HPerson doneByPerson = authenticatedAccount.getPerson(); @@ -320,7 +320,7 @@ public void saveTeamCoordinator(HLocaleMember member) { languageTeamPermissionChangedEvent.fire(changedEvent); } - @Restrict("#{s:hasPermission(languageAction.locale, 'manage-language-team')}") + @Restrict("#{identity.hasPermission(languageAction.locale, 'manage-language-team')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void saveTeamReviewer(HLocaleMember member) { savePermission(member, msgs.get("jsf.Reviewer"), member.isReviewer()); HPerson doneByPerson = authenticatedAccount.getPerson(); @@ -332,7 +332,7 @@ public void saveTeamReviewer(HLocaleMember member) { languageTeamPermissionChangedEvent.fire(changedEvent); } - @Restrict("#{s:hasPermission(languageAction.locale, 'manage-language-team')}") + @Restrict("#{identity.hasPermission(languageAction.locale, 'manage-language-team')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void saveTeamTranslator(HLocaleMember member) { savePermission(member, msgs.get("jsf.Translator"), member.isTranslator()); HPerson doneByPerson = authenticatedAccount.getPerson(); @@ -369,7 +369,7 @@ private void addTeamMember(final Long personId, boolean isTranslator, isCoordinator); } - @Restrict("#{s:hasPermission(languageAction.locale, 'manage-language-team')}") + @Restrict("#{identity.hasPermission(languageAction.locale, 'manage-language-team')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeMembership(HLocaleMember member) { this.languageTeamServiceImpl.leaveLanguageTeam(this.language, member diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java index eebf72a5cb..df46c36638 100644 --- a/zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java @@ -25,12 +25,11 @@ import javax.faces.application.FacesMessage; -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; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; import org.zanata.email.ContactLanguageCoordinatorEmailStrategy; @@ -49,25 +48,25 @@ /** * @author Alex Eng aeng@redhat.com */ -@AutoCreate -@Name("languageContactCoordinatorAction") -@Scope(ScopeType.PAGE) + +@Named("languageContactCoordinatorAction") +@javax.faces.bean.ViewScoped @Slf4j public class LanguageContactCoordinatorAction implements Serializable { - @In(value = JpaIdentityStore.AUTHENTICATED_USER, required = false) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER, required = false) */ private HAccount authenticatedAccount; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private EmailService emailServiceImpl; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private Messages msgs; @Getter @@ -80,7 +79,7 @@ public class LanguageContactCoordinatorAction implements Serializable { private HLocale locale; - @Restrict("#{identity.loggedIn}") + @CheckLoggedIn public void send() { String fromName = authenticatedAccount.getPerson().getName(); String fromLoginName = authenticatedAccount.getUsername(); diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java index 1ead3675d5..510902148e 100644 --- a/zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java @@ -26,12 +26,11 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; -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; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleMemberDAO; @@ -49,26 +48,26 @@ * @author Alex Eng aeng@redhat.com */ -@AutoCreate -@Name("languageJoinAction") -@Scope(ScopeType.PAGE) + +@Named("languageJoinAction") +@javax.faces.bean.ViewScoped @Slf4j public class LanguageJoinAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private LocaleMemberDAO localeMemberDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private EmailService emailServiceImpl; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private Messages msgs; @Getter @@ -93,7 +92,7 @@ public class LanguageJoinAction implements Serializable { @Setter private String message; - @In(value = JpaIdentityStore.AUTHENTICATED_USER, required = false) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER, required = false) */ private HAccount authenticatedAccount; public boolean hasSelectedRole() { @@ -117,7 +116,7 @@ private void reset() { message = ""; } - @Restrict("#{identity.loggedIn}") + @CheckLoggedIn public void send() { String fromName = authenticatedAccount.getPerson().getName(); String fromLoginName = authenticatedAccount.getUsername(); diff --git a/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java b/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java index a8c6c83eb5..3dd525214a 100644 --- a/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java @@ -35,12 +35,12 @@ import lombok.Setter; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; import org.zanata.model.HLocale; @@ -56,23 +56,23 @@ import com.google.common.collect.Lists; import com.ibm.icu.util.ULocale; -@Name("languageManagerAction") -@Scope(ScopeType.PAGE) +@Named("languageManagerAction") +@javax.faces.bean.ViewScoped public class LanguageManagerAction extends AbstractAutocomplete implements Serializable { private static final long serialVersionUID = 1L; private static final int LENGTH_LIMIT = 254; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private Map msgs; @Getter @@ -92,7 +92,7 @@ public class LanguageManagerAction extends AbstractAutocomplete @Getter private String languageNameWarningMessage; - @Create + @PostConstruct public void onCreate() { allLocales = localeServiceImpl.getAllJavaLanguages(); } @@ -106,7 +106,7 @@ public void updateLanguage(String language) { } } - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public String save() { if (!isLanguageNameValid()) { return null; // not success diff --git a/zanata-war/src/main/java/org/zanata/action/LanguagesAction.java b/zanata-war/src/main/java/org/zanata/action/LanguagesAction.java index a1575dbb7b..7829ce15d6 100644 --- a/zanata-war/src/main/java/org/zanata/action/LanguagesAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LanguagesAction.java @@ -27,10 +27,8 @@ import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.model.HLocale; import org.zanata.security.ZanataIdentity; @@ -42,18 +40,18 @@ import com.google.common.collect.Maps; import lombok.Getter; -@Name("languagesAction") -@Scope(ScopeType.PAGE) +@Named("languagesAction") +@javax.faces.bean.ViewScoped public class LanguagesAction extends InMemoryListFilter implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private LanguageTeamService languageTeamServiceImpl; - @In + @Inject private ZanataIdentity identity; private List allLanguages; diff --git a/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java b/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java index d5ad05818d..17c764d09e 100644 --- a/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LocaleListAction.java @@ -28,19 +28,17 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.inject.Named; +import javax.enterprise.inject.Produces; import org.zanata.dao.ProjectDAO; import org.zanata.model.HProject; import org.zanata.service.LocaleService; -@Name("localeListAction") -@Scope(ScopeType.PAGE) +@Named("localeListAction") +@javax.faces.bean.ViewScoped @Slf4j public class LocaleListAction implements Serializable { private static final long serialVersionUID = 1L; @@ -48,17 +46,17 @@ public class LocaleListAction implements Serializable { private List availableList = new ArrayList(); private Map globalItems; private Map availableItems; - @Out(required = false) + @Produces /* FIXME [CDI] check this: migrated from @Out */(required = false) private Map customizedItems; - @Out(required = false) + @Produces /* FIXME [CDI] check this: migrated from @Out */(required = false) private Boolean overrideLocales; private boolean setting; - @In + @Inject ProjectDAO projectDAO; private String slug; - @In + @Inject LocaleService localeServiceImpl; public void toCustomizedLocales() { @@ -100,7 +98,7 @@ public Map getCustomizedItems() { return customizedItems; } - @Factory("availableItems") + @Produces(/* TODO [CDI] check this: migrated from @Factory */"availableItems") public Map loadItems() { availableItems = new TreeMap(); log.debug("loadProjectItems"); @@ -118,7 +116,7 @@ public Map loadItems() { return availableItems; } - @Create + @PostConstruct public void loadGlobalItems() { globalItems = localeServiceImpl.getGlobalLocaleItems(); } diff --git a/zanata-war/src/main/java/org/zanata/action/LoginAction.java b/zanata-war/src/main/java/org/zanata/action/LoginAction.java index 17755fa784..7e0631ccfe 100644 --- a/zanata-war/src/main/java/org/zanata/action/LoginAction.java +++ b/zanata-war/src/main/java/org/zanata/action/LoginAction.java @@ -25,10 +25,8 @@ import lombok.Getter; import lombok.Setter; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.ApplicationConfiguration; import org.zanata.security.AuthenticationManager; @@ -46,21 +44,21 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("loginAction") -@Scope(ScopeType.PAGE) +@Named("loginAction") +@javax.faces.bean.ViewScoped public class LoginAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private Identity identity; - @In + @Inject private ZanataCredentials credentials; - @In + @Inject private AuthenticationManager authenticationManager; - @In + @Inject private ApplicationConfiguration applicationConfiguration; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/MergeTransAction.java b/zanata-war/src/main/java/org/zanata/action/MergeTransAction.java index f9734e9564..0404dcc166 100644 --- a/zanata-war/src/main/java/org/zanata/action/MergeTransAction.java +++ b/zanata-war/src/main/java/org/zanata/action/MergeTransAction.java @@ -11,10 +11,8 @@ import lombok.Setter; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessage; import org.jboss.seam.security.management.JpaIdentityStore; @@ -39,8 +37,8 @@ * * @author Alex Eng aeng@redhat.com */ -@Name("mergeTransAction") -@Scope(ScopeType.PAGE) +@Named("mergeTransAction") +@javax.faces.bean.ViewScoped public class MergeTransAction extends CopyAction implements Serializable { @Getter @@ -61,25 +59,25 @@ public class MergeTransAction extends CopyAction implements Serializable { @Setter private boolean keepExistingTranslation; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private MergeTranslationsManager mergeTranslationsManager; - @In + @Inject private CopyTransManager copyTransManager; - @In + @Inject private CopyVersionManager copyVersionManager; - @In + @Inject private Messages msgs; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; private HProjectIteration targetVersion; diff --git a/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java b/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java index 6e2e516be6..079ac0b450 100644 --- a/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java +++ b/zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java @@ -7,11 +7,8 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.async.AsyncTaskHandleManager; import org.zanata.async.handle.MergeTranslationsTaskHandle; @@ -22,18 +19,18 @@ * * @author Alex Eng aeng@redhat.com */ -@AutoCreate -@Name("mergeTranslationsManager") -@Scope(ScopeType.STATELESS) + +@Named("mergeTranslationsManager") +@javax.enterprise.context.Dependent @Slf4j public class MergeTranslationsManager implements Serializable { - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; - @In + @Inject private MergeTranslationsService mergeTranslationsServiceImpl; - @In + @Inject private Identity identity; /** diff --git a/zanata-war/src/main/java/org/zanata/action/NewProfileAction.java b/zanata-war/src/main/java/org/zanata/action/NewProfileAction.java index 2982eb080e..428a14f4b2 100644 --- a/zanata-war/src/main/java/org/zanata/action/NewProfileAction.java +++ b/zanata-war/src/main/java/org/zanata/action/NewProfileAction.java @@ -23,11 +23,9 @@ import java.io.Serializable; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.ApplicationConfiguration; import org.zanata.i18n.Messages; @@ -41,31 +39,31 @@ * This action handles new user profile creation. * */ -@Name("newProfileAction") -@Scope(ScopeType.PAGE) +@Named("newProfileAction") +@javax.faces.bean.ViewScoped @Slf4j public class NewProfileAction extends AbstractProfileAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private ZanataOpenId zanataOpenId; - @In + @Inject private EmailService emailServiceImpl; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject Messages msgs; - @In + @Inject RegisterService registerServiceImpl; - @In + @Inject ApplicationConfiguration applicationConfiguration; - @Create + @PostConstruct public void onCreate() { if (identity.getCredentials().getAuthType() != AuthenticationType.OPENID) { // Open id user names are url's so they don't make good defaults diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java index b2497680e4..f355339e9f 100644 --- a/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java +++ b/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java @@ -8,12 +8,10 @@ import lombok.Getter; import lombok.Setter; import org.hibernate.validator.constraints.NotEmpty; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.AuthorizationException; import org.jboss.seam.security.NotLoggedInException; import org.jboss.seam.security.RunAsOperation; @@ -23,22 +21,22 @@ import org.zanata.model.HAccountResetPasswordKey; import org.zanata.ui.faces.FacesMessages; -@Name("passwordReset") -@Scope(ScopeType.CONVERSATION) +@Named("passwordReset") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ public class PasswordResetAction implements Serializable { private static final long serialVersionUID = -3966625589007754411L; - @In + @Inject private EntityManager entityManager; - @In + @Inject private IdentityManager identityManager; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private Messages msgs; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java b/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java index ad9880d37b..0078186c0d 100644 --- a/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java +++ b/zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java @@ -6,11 +6,9 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.hibernate.validator.constraints.NotEmpty; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.AccountActivationKeyDAO; import org.zanata.dao.AccountDAO; import org.zanata.i18n.Messages; @@ -24,29 +22,29 @@ import java.io.Serializable; import java.util.Date; -@Name("passwordResetRequest") +@Named("passwordResetRequest") @NoArgsConstructor -@Scope(ScopeType.EVENT) +@javax.enterprise.context.RequestScoped @Slf4j public class PasswordResetRequestAction implements Serializable { private static final long serialVersionUID = 1L; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private EmailService emailServiceImpl; - @In + @Inject private UserAccountService userAccountServiceImpl; - @In + @Inject private Messages msgs; - @In + @Inject private AccountActivationKeyDAO accountActivationKeyDAO; @Setter diff --git a/zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java b/zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java index f7cecea92f..090d7f45b4 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java @@ -24,11 +24,11 @@ import java.util.Collection; import java.util.Date; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; @@ -36,11 +36,11 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("processManagerAction") -@Scope(ScopeType.EVENT) -@Restrict("#{s:hasRole('admin')}") +@Named("processManagerAction") +@javax.enterprise.context.RequestScoped +@CheckRole("admin") public class ProcessManagerAction { - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; public Collection getRunningProcesses() { diff --git a/zanata-war/src/main/java/org/zanata/action/ProfileAction.java b/zanata-war/src/main/java/org/zanata/action/ProfileAction.java index b9558dc3b6..17c5810e50 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProfileAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProfileAction.java @@ -22,11 +22,9 @@ import java.io.Serializable; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.faces.FacesMessages; import org.zanata.model.HPerson; @@ -38,16 +36,16 @@ * @see org.zanata.action.NewProfileAction * */ -@Name("profileAction") -@Scope(ScopeType.PAGE) +@Named("profileAction") +@javax.faces.bean.ViewScoped @Slf4j public class ProfileAction extends AbstractProfileAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject EmailChangeService emailChangeService; - @Create + @PostConstruct public void onCreate() { username = identity.getCredentials().getUsername(); HPerson person = diff --git a/zanata-war/src/main/java/org/zanata/action/ProfileHome.java b/zanata-war/src/main/java/org/zanata/action/ProfileHome.java index 4a291a3d45..f585825d90 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProfileHome.java +++ b/zanata-war/src/main/java/org/zanata/action/ProfileHome.java @@ -30,10 +30,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.international.StatusMessage; import org.jboss.seam.security.management.JpaIdentityStore; @@ -60,8 +58,8 @@ * @see NewProfileAction for new user profile form page * */ -@Name("profileHome") -@Scope(ScopeType.PAGE) +@Named("profileHome") +@javax.faces.bean.ViewScoped @Slf4j public class ProfileHome implements Serializable { private static final long serialVersionUID = 1L; @@ -76,17 +74,17 @@ public class ProfileHome implements Serializable { @Getter private String userLanguageTeams; - @In + @Inject ZanataIdentity identity; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ HAccount authenticatedAccount; - @In + @Inject PersonDAO personDAO; - @In + @Inject AccountDAO accountDAO; - @In + @Inject private GravatarService gravatarServiceImpl; - @In + @Inject Messages msgs; private void init() { diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectAction.java index 196b0e6a7b..fe9a5ba0f4 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectAction.java @@ -24,16 +24,14 @@ import javax.faces.model.DataModel; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.dao.ProjectDAO; import org.zanata.model.HProject; -@Name("projectAction") -@Scope(ScopeType.PAGE) +@Named("projectAction") +@javax.faces.bean.ViewScoped public class ProjectAction implements Serializable { private static final long serialVersionUID = 1L; @@ -45,10 +43,10 @@ public class ProjectAction implements Serializable { new ProjectPagedListDataModel(!showActive, !showReadOnly, !showObsolete); - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject Identity identity; public boolean getEmpty() { diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java index ff2d443903..d36583dbb2 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectHome.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectHome.java @@ -47,10 +47,12 @@ import org.hibernate.Session; import org.hibernate.criterion.NaturalIdentifier; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.faces.FacesManager; import org.jboss.seam.faces.Redirect; import org.jboss.seam.security.management.JpaIdentityStore; @@ -90,7 +92,7 @@ import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -@Name("projectHome") +@Named("projectHome") @Slf4j public class ProjectHome extends SlugHome implements HasLanguageSettings { @@ -114,46 +116,46 @@ public class ProjectHome extends SlugHome implements @Getter private Long projectId; - @In + @Inject private ZanataIdentity identity; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private SlugEntityService slugEntityServiceImpl; - @In("commonMarkRenderer") + @Inject private CommonMarkRenderer renderer; - @In + @Inject private EntityManager entityManager; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private Messages msgs; - @In + @Inject private AccountRoleDAO accountRoleDAO; - @In + @Inject private WebHookDAO webHookDAO; - @In + @Inject private ValidationService validationServiceImpl; - @In + @Inject private CopyTransOptionsModel copyTransOptionsModel; - @In + @Inject private UrlUtil urlUtil; // This property is present to keep the filter in place when the region with @@ -336,7 +338,7 @@ public boolean hasLocaleAlias(HLocale locale) { * alias (if any) is removed for the given locale, otherwise the alias is * replaced with the value. */ - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateToEnteredLocaleAlias(LocaleId localeId) { String enteredAlias = enteredLocaleAliases.get(localeId); setLocaleAlias(localeId, enteredAlias); @@ -396,7 +398,7 @@ private boolean removeAliasSilently(LocaleId localeId) { return setLocaleAliasSilently(localeId, ""); } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeSelectedLocaleAliases() { List removed = new ArrayList<>(); for (Map.Entry entry : @@ -411,7 +413,7 @@ public void removeSelectedLocaleAliases() { showRemovedAliasesMessage(removed); } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeAllLocaleAliases() { List removed = new ArrayList<>(); List aliasedLocales = @@ -445,7 +447,7 @@ private void showRemovedAliasesMessage(List removed) { } } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void disableLocale(HLocale locale) { disableLocaleSilently(locale); facesMessages.addGlobal(FacesMessage.SEVERITY_INFO, @@ -454,7 +456,7 @@ public void disableLocale(HLocale locale) { } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void disableSelectedLocales() { List removedLocales = new ArrayList<>(); for (Map.Entry entry : @@ -501,7 +503,7 @@ private boolean disableLocaleSilently(HLocale locale) { return localeWasEnabled; } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void enableLocale(HLocale locale) { enableLocaleSilently(locale); LocaleId localeId = locale.getLocaleId(); @@ -509,7 +511,7 @@ public void enableLocale(HLocale locale) { msgs.format("jsf.languageSettings.LanguageEnabled", localeId)); } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void enableSelectedLocales() { List addedLocales = new ArrayList<>(); for (Map.Entry entry : selectedDisabledLocales @@ -555,7 +557,7 @@ private boolean enableLocaleSilently(HLocale locale) { return localeWasDisabled; } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void useDefaultLocales() { setOverrideLocales(false); removeAliasesForDisabledLocales(); @@ -616,7 +618,7 @@ private void refreshDisabledLocales() { disabledLocales = null; } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void setRestrictedByRole(String key, boolean checked) { getInstance().setRestrictedByRoles(checked); update(); @@ -724,7 +726,7 @@ public void setSlug(String slug) { } @Override - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public String update() { if (!getInputSlugValue().equals(slug) && !validateSlug(getInputSlugValue(), "slug")) { return null; @@ -805,10 +807,10 @@ public List getInstanceMaintainers() { return list; } - @In + @Inject private Redirect redirect; - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public String removeMaintainer(HPerson person) { if (getInstanceMaintainers().size() <= 1) { facesMessages.addGlobal(FacesMessage.SEVERITY_INFO, @@ -830,7 +832,7 @@ public String removeMaintainer(HPerson person) { return ""; } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateRoles(String roleName, boolean isRestricted) { getInstance().getAllowedRoles().clear(); if (getInstance().isRestrictedByRoles()) { @@ -849,7 +851,7 @@ public void updateRoles(String roleName, boolean isRestricted) { msgs.get("jsf.RolesUpdated")); } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateStatus(char initial) { getInstance().setStatus(EntityStatus.valueOf(initial)); if (getInstance().getStatus() == EntityStatus.READONLY) { @@ -971,7 +973,7 @@ private Map getValidations() { return availableValidations; } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateValidationOption(String name, String state) { ValidationId validationId = ValidationId.valueOf(name); @@ -1001,7 +1003,7 @@ public List getValidationList() { return sortedList; } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void addWebHook(String url) { if (isValidUrl(url)) { WebHook webHook = new WebHook(this.getInstance(), url); @@ -1012,7 +1014,7 @@ public void addWebHook(String url) { } } - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeWebHook(WebHook webHook) { getInstance().getWebHooks().remove(webHook); webHookDAO.makeTransient(webHook); @@ -1063,7 +1065,7 @@ public List getValidationStates() { /** * Update the about page to the entered value, and show a success message. */ - @Restrict("#{s:hasPermission(projectHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(projectHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateAboutPage() { String status = update(); if ("updated".equals(status)) { diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java index 48b65facb4..c09157b4f4 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java @@ -33,10 +33,8 @@ import javax.faces.application.FacesMessage; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.async.handle.CopyVersionTaskHandle; import org.zanata.common.EntityStatus; @@ -72,43 +70,43 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("projectHomeAction") -@Scope(ScopeType.PAGE) +@Named("projectHomeAction") +@javax.faces.bean.ViewScoped public class ProjectHomeAction extends AbstractSortAction implements Serializable { - @In + @Inject private ActivityService activityServiceImpl; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private VersionStateCache versionStateCacheImpl; - @In + @Inject private LocaleMemberDAO localeMemberDAO; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private CopyVersionManager copyVersionManager; - @In + @Inject private Messages msgs; @Setter @Getter private String slug; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private ConversationScopeMessages conversationScopeMessages; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java index 93597de293..3aa468e037 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java @@ -5,12 +5,10 @@ import lombok.Getter; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; @@ -18,25 +16,25 @@ import org.zanata.security.ZanataIdentity; import org.zanata.service.TranslationArchiveService; -@Name("projectIterationZipFileAction") -@Scope(ScopeType.CONVERSATION) +@Named("projectIterationZipFileAction") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ public class ProjectIterationZipFileAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; @Getter private AsyncTaskHandle zipFilePrepHandle; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TranslationArchiveService translationArchiveServiceImpl; @Begin(join = true) diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java b/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java index df988fc416..465f8e9bec 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java @@ -12,11 +12,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.lucene.queryParser.ParseException; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.AccountDAO; import org.zanata.dao.ProjectDAO; import org.zanata.model.HAccount; @@ -30,9 +27,9 @@ /** * This will search both projects and people. */ -@Name("projectSearch") -@Scope(ScopeType.CONVERSATION) -@AutoCreate +@Named("projectSearch") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ + public class ProjectSearch implements Serializable { private static final long serialVersionUID = 1L; diff --git a/zanata-war/src/main/java/org/zanata/action/RegisterAction.java b/zanata-war/src/main/java/org/zanata/action/RegisterAction.java index fd6d647355..9be26145a9 100644 --- a/zanata-war/src/main/java/org/zanata/action/RegisterAction.java +++ b/zanata-war/src/main/java/org/zanata/action/RegisterAction.java @@ -31,12 +31,10 @@ import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.action.validator.NotDuplicateEmail; import org.zanata.dao.PersonDAO; import org.zanata.model.HPerson; @@ -46,26 +44,26 @@ import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -@Name("register") -@Scope(ScopeType.CONVERSATION) +@Named("register") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ @Slf4j public class RegisterAction implements Serializable { private static final long serialVersionUID = -7883627570614588182L; - @In + @Inject private EntityManager entityManager; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject RegisterService registerServiceImpl; - @In + @Inject PersonDAO personDAO; - @In + @Inject EmailService emailServiceImpl; private String username; diff --git a/zanata-war/src/main/java/org/zanata/action/ReindexAction.java b/zanata-war/src/main/java/org/zanata/action/ReindexAction.java index ce05c6f382..514a618088 100644 --- a/zanata-war/src/main/java/org/zanata/action/ReindexAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ReindexAction.java @@ -8,12 +8,11 @@ import lombok.extern.slf4j.Slf4j; -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; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.joda.time.Period; import org.joda.time.format.PeriodFormatter; import org.joda.time.format.PeriodFormatterBuilder; @@ -22,17 +21,17 @@ import com.google.common.base.Optional; -@AutoCreate -@Name("reindexAction") + +@Named("reindexAction") @Slf4j -@Scope(ScopeType.STATELESS) -@Restrict("#{s:hasRole('admin')}") +@javax.enterprise.context.Dependent +@CheckRole("admin") public class ReindexAction implements Serializable { private static final long serialVersionUID = 1L; private final DecimalFormat PERCENT_FORMAT = new DecimalFormat("###.##"); - @In + @Inject private SearchIndexManager searchIndexManager; public List getClasses() { diff --git a/zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java b/zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java index cbdc3a993c..bccd2fa050 100644 --- a/zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java +++ b/zanata-war/src/main/java/org/zanata/action/RoleAssignmentRuleAction.java @@ -25,12 +25,12 @@ import javax.validation.constraints.NotNull; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.ApplicationConfiguration; import org.zanata.dao.AccountRoleDAO; import org.zanata.dao.RoleAssignmentRuleDAO; @@ -42,19 +42,19 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("roleAssignmentRuleAction") -@Scope(ScopeType.CONVERSATION) -@Restrict("#{s:hasRole('admin')}") +@Named("roleAssignmentRuleAction") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ +@CheckRole("admin") public class RoleAssignmentRuleAction extends EntityHome { private static final long serialVersionUID = 1L; - @In + @Inject private RoleAssignmentRuleDAO roleAssignmentRuleDAO; - @In + @Inject private AccountRoleDAO accountRoleDAO; - @In + @Inject private ApplicationConfiguration applicationConfiguration; public List getAllRules() { diff --git a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java index 50cdbac1cb..c09a478439 100644 --- a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java +++ b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java @@ -34,13 +34,13 @@ import org.apache.commons.beanutils.BeanUtils; import org.hibernate.validator.constraints.Email; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.core.Events; import org.zanata.ApplicationConfiguration; import org.zanata.action.validator.EmailList; @@ -53,24 +53,24 @@ import static org.zanata.model.HApplicationConfiguration.*; -@Name("serverConfigurationBean") -@Scope(ScopeType.PAGE) -@Restrict("#{s:hasRole('admin')}") +@Named("serverConfigurationBean") +@javax.faces.bean.ViewScoped +@CheckRole("admin") @Slf4j public class ServerConfigurationBean implements Serializable { private static final long serialVersionUID = 1L; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; public static final String DEFAULT_HELP_URL = "http://zanata.org/help"; public static final String DEFAULT_TERM_OF_USE_URL = "http://zanata.org/term"; - @In + @Inject private ApplicationConfigurationDAO applicationConfigurationDAO; - @In + @Inject private ApplicationConfiguration applicationConfiguration; @Url(canEndInSlash = true) @@ -176,7 +176,7 @@ public String updateHomeContent() { return "/home.xhtml"; } - @Create + @PostConstruct public void onCreate() { setPropertiesFromConfigIfNotNull(commonStringProperties); setBooleanPropertyFromConfigIfNotNull(enableLogEmailProperty); diff --git a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java index 3ded4eedcb..60376d7edd 100644 --- a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java +++ b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java @@ -34,13 +34,13 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; +import javax.enterprise.inject.Produces; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; import org.zanata.dao.TransMemoryDAO; @@ -57,21 +57,21 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("translationMemoryAction") -@Restrict("#{s:hasRole('admin')}") -@Scope(ScopeType.PAGE) +@Named("translationMemoryAction") +@CheckRole("admin") +@javax.faces.bean.ViewScoped @Slf4j public class TranslationMemoryAction implements Serializable { - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private TransMemoryDAO transMemoryDAO; - @In + @Inject private TranslationMemoryResourceService translationMemoryResource; - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; private List transMemoryList; @@ -79,8 +79,8 @@ public class TranslationMemoryAction implements Serializable { /** * Stores the last process handle, in page scope (ie for this user). */ - @In(scope = ScopeType.PAGE, required = false) - @Out(scope = ScopeType.PAGE, required = false) + @Inject /* TODO [CDI] check this: migrated from @In(scope = ScopeType.PAGE, required = false) */ + @Produces /* FIXME [CDI] check this: migrated from @Out */(scope = ScopeType.PAGE, required = false) private Future lastTaskResult; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java index df871b1e3d..eafacc0da6 100644 --- a/zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java +++ b/zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java @@ -24,10 +24,12 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.model.tm.TransMemory; import org.zanata.seam.framework.EntityHome; import org.zanata.service.SlugEntityService; @@ -39,14 +41,14 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("translationMemoryHome") -@Restrict("#{s:hasRole('admin')}") +@Named("translationMemoryHome") +@CheckRole("admin") @Slf4j public class TranslationMemoryHome extends EntityHome { - @In + @Inject private SlugEntityService slugEntityServiceImpl; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; public void verifySlugAvailable(ValueChangeEvent e) { diff --git a/zanata-war/src/main/java/org/zanata/action/UserAction.java b/zanata-war/src/main/java/org/zanata/action/UserAction.java index cb78733e37..30a0bac59b 100644 --- a/zanata-war/src/main/java/org/zanata/action/UserAction.java +++ b/zanata-war/src/main/java/org/zanata/action/UserAction.java @@ -29,12 +29,11 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.exception.ConstraintViolationException; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.security.management.IdentityManager; import org.zanata.ApplicationConfiguration; import org.zanata.dao.AccountDAO; @@ -62,32 +61,32 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("org.jboss.seam.security.management.userAction") -@Scope(CONVERSATION) +@Named("org.jboss.seam.security.management.userAction") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ @Install(precedence = APPLICATION) public class UserAction extends org.jboss.seam.security.management.action.UserAction { private static final long serialVersionUID = 1L; - @In + @Inject private IdentityManager identityManager; - @In + @Inject private EntityManager entityManager; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private Messages msgs; - @In + @Inject private UserAccountService userAccountServiceImpl; - @In + @Inject private EmailService emailServiceImpl; - @In + @Inject private PersonDAO personDAO; private boolean newUserFlag; diff --git a/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java b/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java index c223df9e8d..66787b1381 100644 --- a/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java +++ b/zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java @@ -36,11 +36,9 @@ import org.apache.commons.lang.StringEscapeUtils; import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Conversation; import org.jboss.seam.security.RunAsOperation; @@ -83,38 +81,38 @@ * href="mailto:camunoz@redhat.com">camunoz@redhat.com * @see {@link org.zanata.action.ProfileAction} */ -@Name("userSettingsAction") -@Scope(ScopeType.PAGE) +@Named("userSettingsAction") +@javax.faces.bean.ViewScoped @Slf4j public class UserSettingsAction { - @In + @Inject private EmailService emailServiceImpl; - @In + @Inject private EmailChangeService emailChangeService; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private IdentityManager identityManager; - @In + @Inject private AuthenticationManager authenticationManager; - @In + @Inject private LanguageTeamService languageTeamServiceImpl; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private Messages msgs; - @In(value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER) */ HAccount authenticatedAccount; @Getter @@ -144,7 +142,7 @@ public class UserSettingsAction { @Size(min = 2, max = 80) private String accountName; - @Create + @PostConstruct public void onCreate() { HPerson person = personDAO.findById(authenticatedAccount.getPerson().getId()); diff --git a/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java b/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java index 272f678497..5fa92f6059 100644 --- a/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ValidateEmailAction.java @@ -28,8 +28,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.security.Identity; import org.zanata.dao.PersonDAO; @@ -42,22 +42,22 @@ import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -@Name("validateEmail") +@Named("validateEmail") @Slf4j public class ValidateEmailAction implements Serializable { private static final long serialVersionUID = 1L; private String activationKey; - @In + @Inject PersonDAO personDAO; - @In + @Inject Identity identity; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject EmailChangeService emailChangeService; @Transactional diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java index 39b18ca456..31120a8830 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java @@ -27,25 +27,23 @@ import lombok.Getter; import lombok.Setter; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; import org.zanata.model.HAccount; import org.zanata.model.HIterationGroup; import org.zanata.service.VersionGroupService; -@Name("versionGroupAction") -@Scope(ScopeType.PAGE) +@Named("versionGroupAction") +@javax.faces.bean.ViewScoped public class VersionGroupAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private VersionGroupService versionGroupServiceImpl; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; @Setter diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java index 431aff1673..496eb43071 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java @@ -32,9 +32,11 @@ import org.hibernate.Session; import org.hibernate.criterion.NaturalIdentifier; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; import org.zanata.dao.ProjectIterationDAO; @@ -67,7 +69,7 @@ * @author Alex Eng aeng@redhat.com */ -@Name("versionGroupHome") +@Named("versionGroupHome") public class VersionGroupHome extends SlugHome { private static final long serialVersionUID = 1L; @@ -75,19 +77,19 @@ public class VersionGroupHome extends SlugHome { @Setter private String slug; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private SlugEntityService slugEntityServiceImpl; - @In + @Inject private Messages msgs; - @In + @Inject private ConversationScopeMessages conversationScopeMessages; @Getter @@ -141,7 +143,7 @@ protected void updatedMessage() { } @Override - @Restrict("#{s:hasPermission(versionGroupHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionGroupHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public String persist() { if (!validateSlug(getInstance().getSlug(), "slug")) return null; @@ -153,7 +155,7 @@ public String persist() { } @Override - @Restrict("#{s:hasPermission(versionGroupHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionGroupHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public String update() { return super.update(); } @@ -176,7 +178,7 @@ public void setStatus(char initial) { getInstance().setStatus(EntityStatus.valueOf(initial)); } - @Restrict("#{s:hasPermission(versionGroupHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionGroupHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeLanguage(HLocale locale) { getInstance().getActiveLocales().remove(locale); update(); @@ -186,7 +188,7 @@ public void removeLanguage(HLocale locale) { locale.retrieveDisplayName())); } - @Restrict("#{s:hasPermission(versionGroupHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionGroupHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeVersion(HProjectIteration version) { getInstance().getProjectIterations().remove(version); update(); @@ -196,7 +198,7 @@ public void removeVersion(HProjectIteration version) { version.getProject().getSlug())); } - @Restrict("#{s:hasPermission(versionGroupHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionGroupHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeMaintainer(HPerson maintainer) { if (getInstance().getMaintainers().size() <= 1) { conversationScopeMessages.setMessage(FacesMessage.SEVERITY_INFO, diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java index e87a277b71..fadb133b42 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java @@ -28,10 +28,8 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; @@ -61,28 +59,28 @@ * @author Alex Eng aeng@redhat.com */ -@Name("versionGroupHomeAction") -@Scope(ScopeType.PAGE) +@Named("versionGroupHomeAction") +@javax.faces.bean.ViewScoped public class VersionGroupHomeAction extends AbstractSortAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private VersionGroupService versionGroupServiceImpl; - @In + @Inject private Messages msgs; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private VersionGroupDAO versionGroupDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private LocaleDAO localeDAO; @Getter diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java index a1a8b925ee..8b042e84ae 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java @@ -31,12 +31,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -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; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.international.LocaleSelector; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.EntityStatus; @@ -59,27 +58,27 @@ import com.google.common.collect.Lists; -@AutoCreate -@Name("versionGroupJoinAction") -@Scope(ScopeType.PAGE) + +@Named("versionGroupJoinAction") +@javax.faces.bean.ViewScoped @Slf4j public class VersionGroupJoinAction extends AbstractAutocomplete implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private VersionGroupService versionGroupServiceImpl; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private VersionGroupDAO versionGroupDAO; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; @Getter @@ -92,14 +91,14 @@ public class VersionGroupJoinAction extends AbstractAutocomplete @Getter private List projectVersions = Lists.newArrayList(); - @In + @Inject private EmailService emailServiceImpl; @Getter @Setter private String message; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; public boolean hasSelectedVersion() { @@ -155,7 +154,7 @@ public List getGroupMaintainers() { return maintainers; } - @Restrict("#{identity.loggedIn}") + @CheckLoggedIn public void send() { if (hasSelectedVersion()) { String fromName = authenticatedAccount.getPerson().getName(); diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHome.java b/zanata-war/src/main/java/org/zanata/action/VersionHome.java index 1d437400b0..2641bc63ad 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionHome.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionHome.java @@ -39,9 +39,11 @@ import org.hibernate.Session; import org.hibernate.criterion.NaturalIdentifier; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.faces.FacesManager; import org.zanata.common.DocumentType; import org.zanata.common.EntityStatus; @@ -78,7 +80,7 @@ import java.util.Map; import java.util.ResourceBundle; -@Name("versionHome") +@Named("versionHome") @Slf4j public class VersionHome extends SlugHome implements HasLanguageSettings { @@ -104,37 +106,37 @@ public class VersionHome extends SlugHome implements @Setter private String projectSlug; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private ConversationScopeMessages conversationScopeMessages; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ValidationService validationServiceImpl; - @In + @Inject private SlugEntityService slugEntityServiceImpl; - @In(create = true) + @Inject private ProjectDAO projectDAO; - @In + @Inject private Messages msgs; - @In + @Inject private CopyVersionManager copyVersionManager; - @In + @Inject private UrlUtil urlUtil; private Map availableValidations = Maps @@ -265,7 +267,7 @@ private void validateIterationState(HProjectIteration iteration) { } } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateRequireTranslationReview(String key, boolean checked) { getInstance().setRequireTranslationReview(checked); update(); @@ -462,7 +464,7 @@ public void copyValidationFromProject() { * @return the String "updated" */ @Override - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public String update() { if (!getInputSlugValue().equals(slug) && !validateSlug(getInputSlugValue(), "slug")) { return null; @@ -499,7 +501,7 @@ protected void updatedMessage() { // Disable the default message from Seam } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateStatus(char initial) { String message = msgs.format("jsf.iteration.status.updated", EntityStatus.valueOf(initial)); @@ -572,7 +574,7 @@ public List getValidationStates() { return Arrays.asList(ValidationAction.State.values()); } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateValidationOption(String name, String state) { ValidationId validationId = ValidationId.valueOf(name); @@ -623,7 +625,7 @@ public boolean isOverrideLocales() { return getInstance().isOverrideLocales(); } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void setOverrideLocales(boolean overrideLocales) { getInstance().setOverrideLocales(overrideLocales); } @@ -632,7 +634,7 @@ public Map getLocaleAliases() { return LocaleServiceImpl.getLocaleAliasesByIteration(getInstance()); } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeAllLocaleAliases() { List removed = new ArrayList<>(); List aliasedLocales = @@ -695,7 +697,7 @@ private void refreshDisabledLocales() { disabledLocales = null; } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void removeSelectedLocaleAliases() { List removed = new ArrayList<>(); for (Map.Entry entry : @@ -753,7 +755,7 @@ public boolean hasLocaleAlias(HLocale locale) { private Map enteredLocaleAliases = Maps.newHashMap(); - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void updateToEnteredLocaleAlias(LocaleId localeId) { String enteredAlias = enteredLocaleAliases.get(localeId); setLocaleAlias(localeId, enteredAlias); @@ -804,7 +806,7 @@ private boolean setLocaleAliasSilently(LocaleId localeId, String alias) { return hadAlias; } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void useDefaultLocales() { setOverrideLocales(false); refreshDisabledLocales(); @@ -845,7 +847,7 @@ public Map getSelectedEnabledLocales() { return selectedEnabledLocales; } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void disableSelectedLocales() { List removed = new ArrayList<>(); for (Map.Entry entry : @@ -876,7 +878,7 @@ private boolean disableLocaleSilently(LocaleId localeId) { return disableLocaleSilently(locale); } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void disableLocale(HLocale locale) { boolean wasEnabled = disableLocaleSilently(locale); if (wasEnabled) { @@ -939,7 +941,7 @@ public boolean apply(HLocale input) { @Setter private Map selectedDisabledLocales = Maps.newHashMap(); - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void enableSelectedLocales() { List enabled = new ArrayList<>(); for (Map.Entry entry : selectedDisabledLocales @@ -966,7 +968,7 @@ public void enableSelectedLocales() { } } - @Restrict("#{s:hasPermission(versionHome.instance, 'update')}") + @Restrict("#{identity.hasPermission(versionHome.instance, 'update')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void enableLocale(HLocale locale) { boolean wasDisabled = enableLocaleSilently(locale); diff --git a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java index 28e28765b9..09e97fc384 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java @@ -38,11 +38,11 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.faces.FacesMessages; import org.jboss.seam.util.Hex; import org.zanata.async.handle.CopyVersionTaskHandle; @@ -102,56 +102,56 @@ import lombok.Setter; import lombok.extern.slf4j.Slf4j; -@Name("versionHomeAction") -@Scope(ScopeType.PAGE) +@Named("versionHomeAction") +@javax.faces.bean.ViewScoped @Slf4j public class VersionHomeAction extends AbstractSortAction implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private CopyVersionManager copyVersionManager; - @In + @Inject private MergeTranslationsManager mergeTranslationsManager; - @In + @Inject private CopyTransManager copyTransManager; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private VersionStateCache versionStateCacheImpl; - @In + @Inject private TranslationStateCache translationStateCacheImpl; - @In + @Inject private Messages msgs; - @In + @Inject private DocumentService documentServiceImpl; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationFileService translationFileServiceImpl; - @In + @Inject private VirusScanner virusScanner; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private TranslationService translationServiceImpl; @Getter @@ -172,13 +172,13 @@ public class VersionHomeAction extends AbstractSortAction implements @Getter private HDocument selectedDocument; - @In + @Inject private ConversationScopeMessages conversationScopeMessages; - @In("filePersistService") + @Inject private FilePersistService filePersistService; - @In + @Inject private UrlUtil urlUtil; private List supportedLocale; @@ -622,7 +622,7 @@ private boolean isVersionActive() { || getVersion().getStatus() == EntityStatus.ACTIVE; } - @Restrict("#{versionHomeAction.documentRemovalAllowed}") + @Restrict("#{versionHomeAction.documentRemovalAllowed}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public void deleteDocument(Long docId) { HDocument doc = documentDAO.getById(docId); documentServiceImpl.makeObsolete(doc); diff --git a/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java b/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java index 06a9ced260..f80669a7fb 100644 --- a/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java +++ b/zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java @@ -27,10 +27,7 @@ import java.util.concurrent.TimeUnit; import com.google.common.collect.Lists; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -39,9 +36,9 @@ /** * @author Carlos Munoz camunoz@redhat.com */ -@Name("asyncTaskHandleManager") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("asyncTaskHandleManager") +@javax.enterprise.context.ApplicationScoped + public class AsyncTaskHandleManager { private Map handlesByKey = Maps diff --git a/zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java b/zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java index 813e621ffb..0d30dd73f6 100644 --- a/zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java +++ b/zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java @@ -30,13 +30,10 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.contexts.Lifecycle; import org.jboss.seam.security.RunAsOperation; import org.zanata.action.AuthenticationEvents; @@ -53,24 +50,24 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("asyncTaskManager") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("asyncTaskManager") +@javax.enterprise.context.ApplicationScoped + @Slf4j public class AsyncTaskManager { private ExecutorService scheduler; - @In + @Inject private AsyncConfig asyncConfig; - @Create + @PostConstruct public void init() { scheduler = Executors.newFixedThreadPool(asyncConfig.getThreadPoolSize()); } - @Destroy + @PreDestroy public void cleanup() { scheduler.shutdown(); } diff --git a/zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java b/zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java index a7b8028e7c..d502a49e92 100644 --- a/zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java +++ b/zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java @@ -22,13 +22,10 @@ import lombok.extern.slf4j.Slf4j; import org.infinispan.manager.CacheContainer; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; -import org.jboss.seam.annotations.Unwrap; +import javax.enterprise.inject.Produces; import org.zanata.util.ServiceLocator; import javax.naming.NamingException; @@ -38,10 +35,10 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("cacheContainer") -@Scope(ScopeType.APPLICATION) -@AutoCreate -@Startup +@Named("cacheContainer") +@javax.enterprise.context.ApplicationScoped + +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ @Slf4j public class CacheContainerProducer { @@ -50,7 +47,7 @@ public class CacheContainerProducer { private CacheContainer container; - @Create + @PostConstruct public void initialize() { try { container = @@ -66,7 +63,7 @@ public void initialize() { } } - @Unwrap + @Produces /* FIXME [CDI] check this: migrated from @Unwrap */ public CacheContainer getCacheContainer() { return container; } diff --git a/zanata-war/src/main/java/org/zanata/config/AsyncConfig.java b/zanata-war/src/main/java/org/zanata/config/AsyncConfig.java index 85823bd81d..24d9437f28 100644 --- a/zanata-war/src/main/java/org/zanata/config/AsyncConfig.java +++ b/zanata-war/src/main/java/org/zanata/config/AsyncConfig.java @@ -22,11 +22,8 @@ import com.google.common.annotations.VisibleForTesting; import lombok.NoArgsConstructor; -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; +import javax.inject.Inject; +import javax.inject.Named; /** * Holds all configuration values related to the asynchronous execution of @@ -35,15 +32,15 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("asyncConfig") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("asyncConfig") +@javax.enterprise.context.Dependent + @NoArgsConstructor public class AsyncConfig { public static final String THREAD_POOL_SIZE = "async.threadpool.size"; - @In + @Inject private ConfigStore systemPropertyConfigStore; public AsyncConfig(ConfigStore systemPropertyConfigStore) { diff --git a/zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java b/zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java index 8d5ece4d20..21e1fa4c85 100644 --- a/zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java +++ b/zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java @@ -24,12 +24,9 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Synchronized; import org.zanata.ServerConstants; import org.zanata.dao.ApplicationConfigurationDAO; @@ -42,9 +39,9 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("databaseBackedConfig") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("databaseBackedConfig") +@javax.enterprise.context.ApplicationScoped + @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) public class DatabaseBackedConfig implements Serializable { @@ -52,14 +49,14 @@ public class DatabaseBackedConfig implements Serializable { private Map configurationValues; - @In + @Inject private ServiceLocator serviceLocator; /** * Resets the store by clearing out all values. This means that values will * need to be reloaded as they are requested. */ - @Create + @PostConstruct public void reset() { configurationValues = new HashMap(); } diff --git a/zanata-war/src/main/java/org/zanata/config/JaasConfig.java b/zanata-war/src/main/java/org/zanata/config/JaasConfig.java index c64525b376..f69b07ca4f 100644 --- a/zanata-war/src/main/java/org/zanata/config/JaasConfig.java +++ b/zanata-war/src/main/java/org/zanata/config/JaasConfig.java @@ -24,10 +24,7 @@ import javax.security.auth.login.Configuration; import javax.security.auth.spi.LoginModule; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; /** @@ -36,10 +33,10 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("jaasConfig") -@AutoCreate +@Named("jaasConfig") + @BypassInterceptors -@Scope(ScopeType.APPLICATION) +@javax.enterprise.context.ApplicationScoped public class JaasConfig { /** diff --git a/zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java b/zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java index b177f22e80..1ea9cc38e4 100644 --- a/zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java +++ b/zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java @@ -33,11 +33,8 @@ import javax.naming.NamingEnumeration; import javax.naming.NamingException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Named; import org.jboss.seam.annotations.Synchronized; import org.zanata.ServerConstants; @@ -47,9 +44,9 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("jndiBackedConfig") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("jndiBackedConfig") +@javax.enterprise.context.ApplicationScoped + // TODO populate HashMap in constructor; remove @Synchronized @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) public class JndiBackedConfig implements Serializable { @@ -95,7 +92,7 @@ private boolean containsKey(String key) { * Resets the store by clearing out all values. This means that values will * need to be reloaded as they are requested. */ - @Create + @PostConstruct public void reset() { configurationValues.clear(); } diff --git a/zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java b/zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java index d6537727e0..05a1333f07 100644 --- a/zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java +++ b/zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java @@ -20,10 +20,7 @@ */ package org.zanata.config; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; /** @@ -32,9 +29,9 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("systemPropertyConfigStore") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("systemPropertyConfigStore") +@javax.enterprise.context.Dependent + @BypassInterceptors public class SystemPropertyConfigStore implements ConfigStore { diff --git a/zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java b/zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java index ef348c9aa2..e478c40ec4 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java +++ b/zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java @@ -8,7 +8,7 @@ import org.hibernate.Session; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Example; -import org.jboss.seam.annotations.In; +import javax.inject.Inject; /** * Based on code from http://community.jboss.org/wiki/GenericDataAccessObjects @@ -29,7 +29,7 @@ public AbstractDAOImpl(Class clz) { this.persistentClass = clz; } - @In + @Inject public void setSession(Session s) { this.session = s; } diff --git a/zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java b/zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java index 565f50b7b1..443a9fceb6 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java @@ -21,16 +21,13 @@ package org.zanata.dao; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HAccount; import org.zanata.model.HAccountActivationKey; -@Name("accountActivationKeyDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("accountActivationKeyDAO") + +@javax.enterprise.context.Dependent public class AccountActivationKeyDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java b/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java index 2d06503670..7065406c52 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/AccountDAO.java @@ -22,17 +22,14 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.security.management.PasswordHash; import org.jboss.seam.util.Hex; import org.zanata.model.HAccount; -@Name("accountDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("accountDAO") + +@javax.enterprise.context.Dependent public class AccountDAO extends AbstractDAOImpl { public AccountDAO() { super(HAccount.class); diff --git a/zanata-war/src/main/java/org/zanata/dao/AccountOptionDAO.java b/zanata-war/src/main/java/org/zanata/dao/AccountOptionDAO.java index 0129161550..15184f2e76 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AccountOptionDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/AccountOptionDAO.java @@ -21,15 +21,12 @@ package org.zanata.dao; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HAccountOption; -@Name("accountOptionDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("accountOptionDAO") + +@javax.enterprise.context.Dependent public class AccountOptionDAO extends AbstractDAOImpl { public AccountOptionDAO() { super(HAccountOption.class); diff --git a/zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java b/zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java index ac4f2cdffb..bdea7aae15 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java @@ -21,15 +21,12 @@ package org.zanata.dao; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HAccountResetPasswordKey; -@Name("accountResetPasswordKeyDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("accountResetPasswordKeyDAO") + +@javax.enterprise.context.Dependent public class AccountResetPasswordKeyDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java b/zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java index 4328a474b6..c1ef74f87f 100644 --- a/zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/AccountRoleDAO.java @@ -9,17 +9,14 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HAccount; import org.zanata.model.HAccountRole; import org.zanata.model.HProject; -@Name("accountRoleDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("accountRoleDAO") + +@javax.enterprise.context.Dependent public class AccountRoleDAO extends AbstractDAOImpl { public AccountRoleDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java b/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java index 906dc03e66..09496dc6bf 100644 --- a/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java @@ -25,10 +25,7 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.ActivityType; import org.zanata.model.Activity; import org.zanata.model.type.EntityType; @@ -36,9 +33,9 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("activityDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("activityDAO") + +@javax.enterprise.context.Dependent public class ActivityDAO extends AbstractDAOImpl { private static final long serialVersionUID = 1L; diff --git a/zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java b/zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java index f0617de034..f08509fc7a 100644 --- a/zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java @@ -1,15 +1,12 @@ package org.zanata.dao; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HApplicationConfiguration; -@Name("applicationConfigurationDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("applicationConfigurationDAO") + +@javax.enterprise.context.Dependent public class ApplicationConfigurationDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/CredentialsDAO.java b/zanata-war/src/main/java/org/zanata/dao/CredentialsDAO.java index b2ef51e525..40875bb7a8 100644 --- a/zanata-war/src/main/java/org/zanata/dao/CredentialsDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/CredentialsDAO.java @@ -20,19 +20,16 @@ */ package org.zanata.dao; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.security.HCredentials; /** * @author Carlos Munoz camunoz@redhat.com */ -@Name("credentialsDAO") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("credentialsDAO") +@javax.enterprise.context.Dependent + public class CredentialsDAO extends AbstractDAOImpl { public CredentialsDAO() { super(HCredentials.class); diff --git a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java index b52cc774fb..22143b172c 100644 --- a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java @@ -12,10 +12,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.type.TimestampType; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.common.LocaleId; import org.zanata.common.TransUnitCount; @@ -36,9 +33,9 @@ import lombok.extern.slf4j.Slf4j; -@Name("documentDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("documentDAO") + +@javax.enterprise.context.Dependent @Slf4j public class DocumentDAO extends AbstractDAOImpl { public DocumentDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java b/zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java index c3ee1d8d9d..25be320c23 100644 --- a/zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java @@ -21,15 +21,12 @@ package org.zanata.dao; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HDocumentUpload; -@Name("documentUploadDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("documentUploadDAO") + +@javax.enterprise.context.Dependent public class DocumentUploadDAO extends AbstractDAOImpl { private static final long serialVersionUID = 1L; diff --git a/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java b/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java index 8e975167d8..5ac74ebede 100644 --- a/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java @@ -34,11 +34,8 @@ import org.hibernate.Session; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.FullTextQuery; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.model.HGlossaryEntry; import org.zanata.model.HGlossaryTerm; @@ -50,11 +47,11 @@ * @author Alex Eng aeng@redhat.com * **/ -@Name("glossaryDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("glossaryDAO") + +@javax.enterprise.context.Dependent public class GlossaryDAO extends AbstractDAOImpl { - @In + @Inject private FullTextEntityManager entityManager; public GlossaryDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java b/zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java index b792ee005d..1da78e1462 100644 --- a/zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/HTextFlowTargetStreamingDAO.java @@ -26,10 +26,7 @@ import org.hibernate.ScrollMode; import org.hibernate.ScrollableResults; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HProject; import org.zanata.model.HProjectIteration; import org.zanata.model.HTextFlowTarget; @@ -38,9 +35,9 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("hTextFlowTargetStreamingDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("hTextFlowTargetStreamingDAO") + +@javax.enterprise.context.Dependent @Slf4j public class HTextFlowTargetStreamingDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java b/zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java index 5fb154188d..43f63718dd 100644 --- a/zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java @@ -27,16 +27,13 @@ import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.model.HLocale; -@Name("localeDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("localeDAO") + +@javax.enterprise.context.Dependent public class LocaleDAO extends AbstractDAOImpl { public LocaleDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java b/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java index a3bc75b03e..dae2095355 100644 --- a/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java @@ -24,18 +24,15 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.model.HLocale; import org.zanata.model.HLocaleMember; import org.zanata.model.HLocaleMember.HLocaleMemberPk; -@Name("localeMemberDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("localeMemberDAO") + +@javax.enterprise.context.Dependent public class LocaleMemberDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java b/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java index 9f9ee5e3d1..a719ba843d 100644 --- a/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java @@ -26,18 +26,15 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HLocale; import org.zanata.model.HLocaleMember; import org.zanata.model.HPerson; import org.zanata.model.HProject; -@Name("personDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("personDAO") + +@javax.enterprise.context.Dependent public class PersonDAO extends AbstractDAOImpl { public PersonDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java b/zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java index 833011d108..8197073bb8 100644 --- a/zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/PersonEmailValidationKeyDAO.java @@ -22,15 +22,12 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HPersonEmailValidationKey; -@Name("personEmailValidationKeyDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("personEmailValidationKeyDAO") + +@javax.enterprise.context.Dependent public class PersonEmailValidationKeyDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java b/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java index d8e8030eec..639f437cb2 100644 --- a/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java @@ -22,11 +22,8 @@ import org.hibernate.Session; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.FullTextQuery; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.EntityStatus; import org.zanata.hibernate.search.CaseInsensitiveWhitespaceAnalyzer; import org.zanata.hibernate.search.IndexFieldLabels; @@ -35,11 +32,11 @@ import org.zanata.model.HProject; import org.zanata.model.HProjectIteration; -@Name("projectDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("projectDAO") + +@javax.enterprise.context.Dependent public class ProjectDAO extends AbstractDAOImpl { - @In + @Inject private FullTextEntityManager entityManager; public ProjectDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java b/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java index 618f732b5b..72097c96e5 100644 --- a/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java @@ -33,10 +33,7 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; @@ -53,9 +50,9 @@ import com.google.common.collect.Lists; -@Name("projectIterationDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("projectIterationDAO") + +@javax.enterprise.context.Dependent public class ProjectIterationDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java b/zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java index 39db02b458..071d89aa8b 100644 --- a/zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java @@ -2,10 +2,7 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HRawDocument; import lombok.extern.slf4j.Slf4j; @@ -13,9 +10,9 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("rawDocumentDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("rawDocumentDAO") + +@javax.enterprise.context.Dependent @Slf4j public class RawDocumentDAO extends AbstractDAOImpl { public RawDocumentDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/RoleAssignmentRuleDAO.java b/zanata-war/src/main/java/org/zanata/dao/RoleAssignmentRuleDAO.java index 746767cc2d..ea31aed581 100644 --- a/zanata-war/src/main/java/org/zanata/dao/RoleAssignmentRuleDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/RoleAssignmentRuleDAO.java @@ -20,19 +20,16 @@ */ package org.zanata.dao; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.HRoleAssignmentRule; /** * @author Carlos Munoz camunoz@redhat.com */ -@Name("roleAssignmentRuleDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("roleAssignmentRuleDAO") + +@javax.enterprise.context.Dependent public class RoleAssignmentRuleDAO extends AbstractDAOImpl { public RoleAssignmentRuleDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java b/zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java index 2fac6fab95..53102a473a 100644 --- a/zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java @@ -27,7 +27,7 @@ import org.hibernate.Session; import org.hibernate.ejb.HibernateEntityManagerFactory; -import org.jboss.seam.annotations.In; +import javax.inject.Inject; /** * This class uses Hibernate's StatelessSession to iterate over large query @@ -39,7 +39,7 @@ @NoArgsConstructor public abstract class StreamingDAO { - @In + @Inject private HibernateEntityManagerFactory entityManagerFactory; public StreamingDAO(HibernateEntityManagerFactory emf) { diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java index 5a1228073b..6ef2c4856b 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java @@ -29,11 +29,8 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.transform.ResultTransformer; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.common.LocaleId; import org.zanata.model.HDocument; @@ -47,16 +44,16 @@ import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -@Name("textFlowDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("textFlowDAO") + +@javax.enterprise.context.Dependent @Slf4j public class TextFlowDAO extends AbstractDAOImpl { private static final long serialVersionUID = 1L; // TODO replace all getSession() code to use entityManager - @In + @Inject LocaleDAO localeDAO; public TextFlowDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java index ffa94e90db..6383aefc2f 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java @@ -27,9 +27,7 @@ import org.hibernate.Query; import org.hibernate.ejb.HibernateEntityManagerFactory; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.EntityStatus; import org.zanata.model.HProject; import org.zanata.model.HProjectIteration; @@ -45,8 +43,8 @@ * @author Sean Flanigan sflaniga@redhat.com */ -@Name("textFlowStreamDAO") -@Scope(ScopeType.EVENT) +@Named("textFlowStreamDAO") +@javax.enterprise.context.RequestScoped // TODO queries should only return Translated/Approved TFTs // TODO build related queries using querydsl @NoArgsConstructor diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java index 6b2df1c794..8afa603ed8 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java @@ -6,10 +6,7 @@ import org.hibernate.Query; import org.hibernate.SQLQuery; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; @@ -23,9 +20,9 @@ import com.google.common.base.Optional; -@Name("textFlowTargetDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("textFlowTargetDAO") + +@javax.enterprise.context.Dependent public class TextFlowTargetDAO extends AbstractDAOImpl implements TranslationFinder { diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java index ed390c487e..e9fd4598fa 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java @@ -28,10 +28,7 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.transform.ResultTransformer; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.zanata.common.ContentState; @@ -42,9 +39,9 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Optional; -@Name("textFlowTargetHistoryDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("textFlowTargetHistoryDAO") + +@javax.enterprise.context.Dependent public class TextFlowTargetHistoryDAO extends AbstractDAOImpl { diff --git a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java index 06dd8f0481..d0bc2dca50 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java @@ -25,10 +25,7 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.model.HTextFlowTargetReviewComment; import org.zanata.webtrans.shared.model.TransUnitId; @@ -38,9 +35,9 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("textFlowTargetReviewCommentsDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("textFlowTargetReviewCommentsDAO") + +@javax.enterprise.context.Dependent public class TextFlowTargetReviewCommentsDAO extends AbstractDAOImpl { @SuppressWarnings("unused") diff --git a/zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java b/zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java index af167e89e5..2df45c19aa 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java @@ -27,11 +27,8 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.Session; import org.hibernate.search.FullTextSession; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.transaction.Transaction; import org.zanata.exception.EntityMissingException; import org.zanata.model.tm.TransMemory; @@ -44,12 +41,12 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("transMemoryDAO") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("transMemoryDAO") +@javax.enterprise.context.Dependent + public class TransMemoryDAO extends AbstractDAOImpl { - @In + @Inject private FullTextSession session; public TransMemoryDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java b/zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java index ca00cab2bc..1488bf9292 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java @@ -25,9 +25,7 @@ import org.hibernate.Query; import org.hibernate.ejb.HibernateEntityManagerFactory; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.tm.TransMemoryUnit; import org.zanata.model.tm.TransMemory; import org.zanata.util.CloseableIterator; @@ -39,8 +37,8 @@ * @author Sean Flanigan sflaniga@redhat.com */ -@Name("transMemoryStreamingDAO") -@Scope(ScopeType.EVENT) +@Named("transMemoryStreamingDAO") +@javax.enterprise.context.RequestScoped @NoArgsConstructor /** * Note: unless the find* methods throw an exception, the caller is diff --git a/zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java b/zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java index ffbac69f52..8fba9cc9a8 100644 --- a/zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java @@ -20,17 +20,15 @@ */ package org.zanata.dao; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.tm.TransMemoryUnit; /** * @author Carlos Munoz camunoz@redhat.com */ -@Name("transMemoryUnitDAO") -@Scope(ScopeType.STATELESS) +@Named("transMemoryUnitDAO") +@javax.enterprise.context.Dependent public class TransMemoryUnitDAO extends AbstractDAOImpl { public TransMemoryUnitDAO() { diff --git a/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java b/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java index 421ecca3e3..434fe9576e 100644 --- a/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java @@ -28,10 +28,7 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.common.EntityStatus; import org.zanata.model.HIterationGroup; import org.zanata.model.HPerson; @@ -39,9 +36,9 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("versionGroupDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("versionGroupDAO") + +@javax.enterprise.context.Dependent public class VersionGroupDAO extends AbstractDAOImpl { public VersionGroupDAO() { super(HIterationGroup.class); diff --git a/zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java b/zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java index bdad7a872d..58e7397ab2 100644 --- a/zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java +++ b/zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java @@ -1,15 +1,12 @@ package org.zanata.dao; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.model.WebHook; -@Name("webHookDAO") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("webHookDAO") + +@javax.enterprise.context.Dependent public class WebHookDAO extends AbstractDAOImpl { public WebHookDAO() { diff --git a/zanata-war/src/main/java/org/zanata/email/EmailBuilder.java b/zanata-war/src/main/java/org/zanata/email/EmailBuilder.java index 9e68083d12..bdda86d046 100644 --- a/zanata-war/src/main/java/org/zanata/email/EmailBuilder.java +++ b/zanata-war/src/main/java/org/zanata/email/EmailBuilder.java @@ -28,10 +28,8 @@ import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.log.CommonsLogLogChute; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.international.LocaleSelector; import org.jboss.seam.mail.MailSession; import org.zanata.ApplicationConfiguration; @@ -51,9 +49,9 @@ * template and send it via the default JavaMail Transport. */ @AllArgsConstructor -@AutoCreate -@Name("emailBuilder") -@Scope(STATELESS) + +@Named("emailBuilder") +@javax.enterprise.context.Dependent @Slf4j public class EmailBuilder { // Use this if you want emails logged on stderr @@ -67,11 +65,11 @@ public EmailBuilder() { // it seems to be impossible to inject this in Seam 2: private final Session mailSession; - @In + @Inject private Context emailContext; - @In + @Inject private MessagesFactory messagesFactory; - @In + @Inject private LocaleSelector localeSelector; private static VelocityEngine makeVelocityEngine() { @@ -212,11 +210,11 @@ MimeMessage buildMessage(MimeMessage msg, EmailStrategy strategy, * A Seam component which can inject the required configuration and * components needed to create EmailBuilder at runtime. */ - @AutoCreate - @Name("emailContext") - @Scope(EVENT) + + @Named("emailContext") + @javax.enterprise.context.RequestScoped public static class Context { - @In + @Inject private ApplicationConfiguration applicationConfiguration; String getServerPath() { return applicationConfiguration.getServerPath(); diff --git a/zanata-war/src/main/java/org/zanata/file/BlobPersistService.java b/zanata-war/src/main/java/org/zanata/file/BlobPersistService.java index 0e0537ef19..798f7d5105 100644 --- a/zanata-war/src/main/java/org/zanata/file/BlobPersistService.java +++ b/zanata-war/src/main/java/org/zanata/file/BlobPersistService.java @@ -24,20 +24,17 @@ import java.sql.Blob; import org.hibernate.Session; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.model.HDocumentUploadPart; // TODO damason: replace with file system implementation, named something like "filePartPersistService" -@Name("blobPersistService") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("blobPersistService") +@javax.enterprise.context.Dependent + public class BlobPersistService implements UploadPartPersistService { - @In + @Inject private Session session; public HDocumentUploadPart newUploadPartFromStream( diff --git a/zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java b/zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java index 76d22a81b1..220585abf5 100644 --- a/zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java +++ b/zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java @@ -38,8 +38,8 @@ import lombok.extern.slf4j.Slf4j; import org.hibernate.Session; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.util.Hex; import org.zanata.common.DocumentType; import org.zanata.common.EntityStatus; @@ -60,24 +60,24 @@ // TODO damason: add thorough unit testing @Slf4j -@Name("documentUploadUtil") +@Named("documentUploadUtil") public class DocumentUploadUtil { - @In + @Inject private ZanataIdentity identity; // TODO technical debt: use entityManager - @In + @Inject private Session session; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TranslationFileService translationFileServiceImpl; - @In("blobPersistService") + @Inject private UploadPartPersistService uploadPartPersistService; - @In + @Inject private DocumentUploadDAO documentUploadDAO; // TODO damason: move all validation checks to separate class diff --git a/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java b/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java index b0e8bb0a8e..8b3a51067f 100644 --- a/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java +++ b/zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java @@ -29,11 +29,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.ApplicationConfiguration; import org.zanata.dao.DocumentDAO; import org.zanata.model.HDocument; @@ -44,19 +41,19 @@ import com.google.common.io.Files; -@Name("filePersistService") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("filePersistService") +@javax.enterprise.context.Dependent + @Slf4j public class FileSystemPersistService implements FilePersistService { private static final String RAW_DOCUMENTS_SUBDIRECTORY = "documents"; - @In("applicationConfiguration") + @Inject private ApplicationConfiguration appConfig; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private VirusScanner virusScanner; @Override diff --git a/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java b/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java index b1989c5f79..5c76e1b4a8 100644 --- a/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java +++ b/zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java @@ -35,8 +35,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.DocumentType; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; @@ -67,28 +67,28 @@ //TODO damason: add thorough unit testing @Slf4j -@Name("sourceDocumentUploader") +@Named("sourceDocumentUploader") public class SourceDocumentUpload { private static final HLocale NULL_LOCALE = null; - @In(create = true, value = "documentUploadUtil") + @Inject /* TODO [CDI] check this: migrated from @In(create = true, value = "documentUploadUtil") */ private DocumentUploadUtil util; - @In("filePersistService") + @Inject private FilePersistService filePersistService; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TranslationFileService translationFileServiceImpl; - @In + @Inject private VirusScanner virusScanner; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private DocumentUploadDAO documentUploadDAO; - @In + @Inject private DocumentService documentServiceImpl; public Response tryUploadSourceFileWithoutHash(GlobalDocumentId id, diff --git a/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java b/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java index cdccec2a76..0dc93032d4 100644 --- a/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java +++ b/zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java @@ -35,8 +35,8 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.DocumentType; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; @@ -62,22 +62,22 @@ //TODO damason: add thorough unit testing @Slf4j -@Name("translationDocumentUploader") +@Named("translationDocumentUploader") public class TranslationDocumentUpload { - @In(create = true, value = "documentUploadUtil") + @Inject /* TODO [CDI] check this: migrated from @In(create = true, value = "documentUploadUtil") */ private DocumentUploadUtil util; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TranslationService translationServiceImpl; - @In + @Inject private TranslationFileService translationFileServiceImpl; - @In + @Inject private DocumentUploadDAO documentUploadDAO; public Response diff --git a/zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java b/zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java index c063ad86c0..088e21bf6f 100644 --- a/zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java +++ b/zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java @@ -20,10 +20,7 @@ */ package org.zanata.file; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import java.util.HashSet; import java.util.Set; @@ -34,9 +31,9 @@ * This is intended to limit each user to a single upload operation at a time * to prevent an individual user tying up too many server resources. */ -@Name("userFileUploadTracker") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("userFileUploadTracker") +@javax.enterprise.context.ApplicationScoped + public class UserFileUploadTracker { Set uploadingUsers = new HashSet(); diff --git a/zanata-war/src/main/java/org/zanata/i18n/Messages.java b/zanata-war/src/main/java/org/zanata/i18n/Messages.java index 1a199bfc53..1d609a7d4c 100644 --- a/zanata-war/src/main/java/org/zanata/i18n/Messages.java +++ b/zanata-war/src/main/java/org/zanata/i18n/Messages.java @@ -29,10 +29,8 @@ import java.util.ResourceBundle; import java.util.Set; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.contexts.Contexts; import org.zanata.util.EmptyEnumeration; @@ -53,9 +51,9 @@ * @author Sean Flanigan sflaniga@redhat.com */ -@AutoCreate -@Name("msgs") -@Scope(EVENT) + +@Named("msgs") +@javax.enterprise.context.RequestScoped public class Messages extends AbstractMap { /** diff --git a/zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java b/zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java index c4f8f65915..8b978f87eb 100644 --- a/zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java +++ b/zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java @@ -23,9 +23,7 @@ import static org.jboss.seam.ScopeType.APPLICATION; import lombok.Getter; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import java.util.Locale; @@ -35,9 +33,9 @@ * @author Sean Flanigan sflaniga@redhat.com */ -@AutoCreate -@Name("messagesFactory") -@Scope(APPLICATION) + +@Named("messagesFactory") +@javax.enterprise.context.ApplicationScoped public class MessagesFactory { /** diff --git a/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java b/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java index f6f040b55f..112ff2c376 100644 --- a/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java +++ b/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java @@ -24,10 +24,8 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.service.FileSystemService; /** @@ -36,11 +34,11 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("downloadFileCleanupJob") -@Scope(ScopeType.STATELESS) +@Named("downloadFileCleanupJob") +@javax.enterprise.context.Dependent @Slf4j public class DownloadFileCleanupJob extends ZanataSchedulableJob { - @In + @Inject private FileSystemService fileSystemServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java b/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java index 9368c07664..135947ff58 100644 --- a/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java +++ b/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java @@ -23,14 +23,12 @@ import java.util.HashSet; import java.util.Set; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.inject.Inject; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Synchronized; import org.jboss.seam.async.QuartzTriggerHandle; @@ -42,28 +40,28 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("zanataJobScheduler") -@Scope(ScopeType.APPLICATION) -@AutoCreate -@Startup -@Install(false) +@Named("zanataJobScheduler") +@javax.enterprise.context.ApplicationScoped + +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ +@Exclude(ifProjectStage = ProjectStage.UnitTest.class) /* TODO [CDI] Set ProjectStage for unit tests */ @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) public class ZanataJobScheduler { // TODO have jobs schedule themselves after injecting this bean - @In(create = true) + @Inject private DownloadFileCleanupJob downloadFileCleanupJob; private Set triggerHandles = new HashSet(); - @Create + @PostConstruct public void scheduleJobs() { this.triggerHandles.add(this.downloadFileCleanupJob .startJob("0 0 0 * * ?")); } - @Destroy + @PreDestroy public void unscheduleAllJobs() throws Exception { for (QuartzTriggerHandle handle : this.triggerHandles) { handle.cancel(); diff --git a/zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java b/zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java index 489936d490..c06e3e19d2 100644 --- a/zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java +++ b/zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java @@ -8,12 +8,9 @@ import com.google.common.annotations.VisibleForTesting; import lombok.AccessLevel; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; +import javax.annotation.PostConstruct; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.zanata.ApplicationConfiguration; import org.zanata.events.ConfigurationChanged; import org.zanata.util.Introspectable; @@ -33,9 +30,9 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("rateLimitManager") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("rateLimitManager") +@javax.enterprise.context.ApplicationScoped + @Slf4j public class RateLimitManager implements Introspectable { @@ -55,7 +52,7 @@ public static RateLimitManager getInstance() { return ServiceLocator.instance().getInstance(RateLimitManager.class); } - @Create + @PostConstruct public void loadConfig() { readRateLimitState(); } diff --git a/zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java b/zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java index a99c070888..3b503f7a44 100644 --- a/zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java +++ b/zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java @@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; /** * Consumer of Dead Letter Queue (all unsuccessful message will be dropped into @@ -49,7 +49,7 @@ propertyName = "maxSession", propertyValue = "1") }) -@Name("deadLetterQueueReceiver") +@Named("deadLetterQueueReceiver") @Slf4j public class DeadLetterQueueReceiver implements MessageListener { diff --git a/zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java b/zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java index 63f69fdab0..9c1938b42e 100644 --- a/zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java +++ b/zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java @@ -36,8 +36,8 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.events.LanguageTeamPermissionChangedEvent; import com.google.common.base.Throwables; @@ -65,7 +65,7 @@ propertyValue = "jms/queue/MailsQueue" ) }) -@Name("emailQueueMessageReceiver") +@Named("emailQueueMessageReceiver") @Slf4j @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) @@ -74,7 +74,7 @@ public class EmailQueueMessageReceiver implements MessageListener { private static Map handlers = Collections .emptyMap(); - @In("languageTeamPermissionChangeJmsMessagePayloadHandler") + @Inject /* TODO [CDI] check this: migrated from @In("languageTeamPermissionChangeJmsMessagePayloadHandler") */ private LanguageTeamPermissionChangeJmsMessagePayloadHandler languageTeamHandler; @Override diff --git a/zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java b/zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java index 04d29df15e..b962a123ae 100644 --- a/zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java +++ b/zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java @@ -25,7 +25,7 @@ import javax.jms.Message; import javax.jms.MessageListener; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; import lombok.extern.slf4j.Slf4j; @MessageDriven(activationConfig = { @@ -47,7 +47,7 @@ * @author Patrick Huang * pahuang@redhat.com */ -@Name("expiryQueueReceiver") +@Named("expiryQueueReceiver") @Slf4j public class ExpiryQueueReceiver implements MessageListener { @Override diff --git a/zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java b/zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java index 8cfe80e3f9..ca2524a9eb 100644 --- a/zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java +++ b/zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java @@ -24,11 +24,8 @@ import javax.mail.internet.InternetAddress; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.ApplicationConfiguration; import org.zanata.email.Addresses; import org.zanata.email.EmailBuilder; @@ -52,21 +49,21 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("languageTeamPermissionChangeJmsMessagePayloadHandler") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("languageTeamPermissionChangeJmsMessagePayloadHandler") +@javax.enterprise.context.Dependent + @Slf4j @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class LanguageTeamPermissionChangeJmsMessagePayloadHandler implements EmailQueueMessageReceiver.JmsMessagePayloadHandler { - @In + @Inject private EmailBuilder emailBuilder; - @In + @Inject private Messages msgs; - @In + @Inject private ApplicationConfiguration applicationConfiguration; diff --git a/zanata-war/src/main/java/org/zanata/notification/NotificationManager.java b/zanata-war/src/main/java/org/zanata/notification/NotificationManager.java index 7339288415..a138342f65 100644 --- a/zanata-war/src/main/java/org/zanata/notification/NotificationManager.java +++ b/zanata-war/src/main/java/org/zanata/notification/NotificationManager.java @@ -33,12 +33,10 @@ import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.zanata.events.LanguageTeamPermissionChangedEvent; @@ -50,9 +48,9 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("notificationManager") -@Scope(ScopeType.APPLICATION) -@Startup +@Named("notificationManager") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ @Slf4j @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) @@ -60,14 +58,14 @@ public class NotificationManager implements Serializable { private static final long serialVersionUID = -1L; // JMS EmailQueue Producer. - @In + @Inject private QueueSender mailQueueSender; - @In + @Inject private QueueSession queueSession; - @Create + @PostConstruct public void onCreate() { try { mailQueueSender.getQueue(); diff --git a/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java b/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java index ed70b31323..fa39a8f469 100644 --- a/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java +++ b/zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java @@ -6,22 +6,20 @@ import org.jboss.resteasy.core.Dispatcher; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.deployment.AnnotationDeploymentHandler; import org.jboss.seam.deployment.HotDeploymentStrategy; import org.zanata.seam.resteasy.ResteasyBootstrap; import org.zanata.seam.resteasy.SeamResteasyProviderFactory; -@Name("org.jboss.seam.resteasy.bootstrap") -@Scope(ScopeType.APPLICATION) -@Startup -@AutoCreate +@Named("org.jboss.seam.resteasy.bootstrap") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ + @Install(classDependencies = "org.jboss.resteasy.spi.ResteasyProviderFactory", precedence = Install.DEPLOYMENT) @Slf4j diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java index 4a37ac93db..1cb5e71c83 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java @@ -28,8 +28,8 @@ import javax.ws.rs.core.Response; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.model.HLocale; import org.zanata.rest.editor.dto.Locale; @@ -41,12 +41,12 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.localesService") +@Named("editor.localesService") @Path(LocalesResource.SERVICE_PATH) @Transactional public class LocalesService implements LocalesResource { - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java index 2a49bae464..51578a37b5 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java @@ -8,8 +8,8 @@ import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.dao.ProjectDAO; import org.zanata.model.HProject; @@ -24,7 +24,7 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.projectService") +@Named("editor.projectService") @Path(ProjectResource.SERVICE_PATH) @Transactional @NoArgsConstructor @@ -34,10 +34,10 @@ public class ProjectService implements ProjectResource { @Context private Request request; - @In + @Inject private ETagUtils eTagUtils; - @In + @Inject private ProjectDAO projectDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java index d46ac3a5ab..1e65905aa1 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java @@ -15,8 +15,8 @@ import javax.ws.rs.core.Response; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.common.ContentState; import org.zanata.common.EntityStatus; @@ -52,31 +52,31 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.projectVersionService") +@Named("editor.projectVersionService") @Path(ProjectVersionResource.SERVICE_PATH) @Transactional @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class ProjectVersionService implements ProjectVersionResource { - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private LocaleService localeServiceImpl; @Context private Request request; - @In + @Inject private ETagUtils eTagUtils; - @In + @Inject private ResourceUtils resourceUtils; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java index 5e26e592e9..94fd34fa63 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java @@ -29,8 +29,8 @@ import javax.ws.rs.core.Response; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.DocumentDAO; import org.zanata.model.HDocument; @@ -49,12 +49,12 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.statisticService") +@Named("editor.statisticService") @Path(StatisticResource.SERVICE_PATH) @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class StatisticsService implements StatisticResource { - @In + @Inject private DocumentDAO documentDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java index badf6c1da3..ff8f36c22a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java @@ -23,8 +23,8 @@ import com.google.common.base.Joiner; import com.googlecode.totallylazy.Either; import com.googlecode.totallylazy.Option; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.common.LocaleId; import org.zanata.model.HLocale; @@ -47,17 +47,17 @@ /** * @see org.zanata.rest.editor.service.resource.SuggestionsResource */ -@Name("editor.suggestionsService") +@Named("editor.suggestionsService") @Path(SuggestionsResource.SERVICE_PATH) @Transactional public class SuggestionsService implements SuggestionsResource { public static final String SEARCH_TYPES = Joiner.on(", ").join(SearchType.values()); - @In("translationMemoryServiceImpl") + @Inject private TranslationMemoryService transMemoryService; - @In("localeServiceImpl") + @Inject private LocaleService localeService; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java index 55304f1e33..c9054c916b 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java @@ -27,8 +27,8 @@ import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.common.LocaleId; import org.zanata.dao.TextFlowDAO; @@ -44,16 +44,16 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.textFlowService") +@Named("editor.textFlowService") @Path(TextFlowResource.SERVICE_PATH) @Transactional @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class TextFlowService implements TextFlowResource { - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TransUnitUtils transUnitUtils; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java index 97bcb59adb..ecaec6c1fd 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java @@ -26,8 +26,8 @@ import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.dao.TextFlowDAO; import org.zanata.model.HLocale; @@ -41,17 +41,17 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.transUnitService") +@Named("editor.transUnitService") @Path(TransUnitResource.SERVICE_PATH) @Transactional public class TransUnitService implements TransUnitResource { - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TransUnitUtils transUnitUtils; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java index b17cae6182..5a95c7605d 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java @@ -9,11 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.model.HTextFlow; import org.zanata.model.HTextFlowTarget; @@ -29,17 +26,17 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("transUnitUtils") -@Scope(ScopeType.STATELESS) +@Named("transUnitUtils") +@javax.enterprise.context.Dependent @Slf4j -@AutoCreate + @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class TransUnitUtils { public static int MAX_SIZE = 200; public static String ID_SEPARATOR = ","; - @In + @Inject private ResourceUtils resourceUtils; /** diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java index 9dd1873bd5..78bba3fec8 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java @@ -27,8 +27,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; @@ -51,27 +51,27 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.translationService") +@Named("editor.translationService") @Path(TranslationResource.SERVICE_PATH) @Slf4j @Transactional public class TranslationService implements TranslationResource { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private TransUnitUtils transUnitUtils; - @In + @Inject private org.zanata.service.TranslationService translationServiceImpl; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java b/zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java index ebe5ce3767..6c19ed5bb0 100644 --- a/zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java +++ b/zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java @@ -3,8 +3,8 @@ import javax.ws.rs.Path; import javax.ws.rs.core.Response; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.AccountDAO; @@ -20,20 +20,20 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("editor.userService") +@Named("editor.userService") @Path(UserResource.SERVICE_PATH) @Transactional @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class UserService implements UserResource { - @In(value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private GravatarService gravatarServiceImpl; - @In + @Inject private AccountDAO accountDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java b/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java index 4facf14c7f..2fc31ed22a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java @@ -16,10 +16,12 @@ import org.hibernate.Session; import org.jboss.resteasy.spi.NoLogWebApplicationException; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.Identity; import org.zanata.common.LocaleId; import org.zanata.dao.AccountDAO; @@ -31,11 +33,11 @@ import org.zanata.model.HPerson; import org.zanata.rest.dto.Account; -@Name("accountService") +@Named("accountService") @Path(AccountResource.SERVICE_PATH) @Slf4j @Transactional -@Restrict("#{s:hasRole('admin')}") +@CheckRole("admin") public class AccountService implements AccountResource { /** User name that identifies an account. */ @PathParam("username") @@ -47,19 +49,19 @@ public class AccountService implements AccountResource { @Context private UriInfo uri; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private AccountRoleDAO accountRoleDAO; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private Identity identity; - @In + @Inject private Session session; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java index f444dbdf9d..8843beb44c 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java @@ -26,8 +26,8 @@ import java.util.concurrent.ExecutionException; import org.jboss.resteasy.spi.NotFoundException; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; @@ -64,34 +64,34 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("asynchronousProcessResourceService") +@Named("asynchronousProcessResourceService") @Path(AsynchronousProcessResource.SERVICE_PATH) @Transactional @Slf4j public class AsynchronousProcessResourceService implements AsynchronousProcessResource { - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private DocumentService documentServiceImpl; - @In + @Inject private TranslationService translationServiceImpl; - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java index 6f70390edd..cd7c543d05 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java @@ -22,8 +22,8 @@ import javax.ws.rs.Path; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.action.CopyTransManager; import org.zanata.async.handle.CopyTransTaskHandle; import org.zanata.dao.DocumentDAO; @@ -36,16 +36,16 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("copyTransResourceService") +@Named("copyTransResourceService") @Path(CopyTransResource.SERVICE_PATH) public class CopyTransResourceService implements CopyTransResource { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private CopyTransManager copyTransManager; - @In + @Inject private DocumentDAO documentDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java b/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java index 59def73b39..d19a8643c2 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java @@ -9,10 +9,8 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.DocumentDAO; import org.zanata.model.HDocument; import org.zanata.model.HLocale; @@ -22,14 +20,14 @@ import org.zanata.rest.dto.extensions.gettext.PoHeader; import org.zanata.util.HashUtil; -@Name("eTagUtils") -@Scope(ScopeType.STATELESS) +@Named("eTagUtils") +@javax.enterprise.context.Dependent public class ETagUtils { - @In + @Inject private Session session; - @In + @Inject private DocumentDAO documentDAO; /** diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java index 524ee0c56b..e1f1f5e75b 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java @@ -47,8 +47,8 @@ import org.jboss.resteasy.util.GenericType; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.adapter.FileFormatAdapter; import org.zanata.adapter.po.PoWriter2; import org.zanata.common.ContentState; @@ -76,38 +76,38 @@ import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; -@Name("fileService") +@Named("fileService") @Path(FileResource.SERVICE_PATH) @Slf4j public class FileService implements FileResource { private static final String FILE_TYPE_OFFLINE_PO = "offlinepo"; private static final String FILE_TYPE_OFFLINE_PO_TEMPLATE = "offlinepot"; - @In + @Inject private DocumentDAO documentDAO; - @In(create = true) + @Inject private TranslatedDocResourceService translatedDocResourceService; - @In + @Inject private FileSystemService fileSystemServiceImpl; - @In + @Inject private TranslationFileService translationFileServiceImpl; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private VirusScanner virusScanner; - @In(value = "sourceDocumentUploader", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "sourceDocumentUploader", create = true) */ private SourceDocumentUpload sourceUploader; - @In(value = "translationDocumentUploader", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "translationDocumentUploader", create = true) */ private TranslationDocumentUpload translationUploader; - @In("filePersistService") + @Inject private FilePersistService filePersistService; /** diff --git a/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java b/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java index d0bc51f1a3..5c04827b83 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java @@ -14,10 +14,12 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.common.LocaleId; import org.zanata.dao.GlossaryDAO; import org.zanata.model.HGlossaryEntry; @@ -28,7 +30,7 @@ import org.zanata.rest.dto.GlossaryTerm; import org.zanata.service.GlossaryFileService; -@Name("glossaryService") +@Named("glossaryService") @Path(GlossaryResource.SERVICE_PATH) @Slf4j @Transactional @@ -46,10 +48,10 @@ public class GlossaryService implements GlossaryResource { @Context private Request request; - @In + @Inject private GlossaryDAO glossaryDAO; - @In + @Inject private GlossaryFileService glossaryFileServiceImpl; @Override @@ -84,7 +86,7 @@ public Response get(LocaleId locale) { } @Override - @Restrict("#{s:hasPermission('', 'glossary-insert')}") + @CheckPermission("glossary-insert") public Response put(Glossary glossary) { ResponseBuilder response; @@ -101,7 +103,7 @@ public Response put(Glossary glossary) { } @Override - @Restrict("#{s:hasPermission('', 'glossary-delete')}") + @CheckPermission("glossary-delete") public Response deleteGlossary(LocaleId targetLocale) { ResponseBuilder response = request.evaluatePreconditions(); if (response != null) { @@ -115,7 +117,7 @@ public Response deleteGlossary(LocaleId targetLocale) { } @Override - @Restrict("#{s:hasPermission('', 'glossary-delete')}") + @CheckPermission("glossary-delete") public Response deleteGlossaries() { ResponseBuilder response = request.evaluatePreconditions(); if (response != null) { diff --git a/zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java b/zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java index 456f522e15..efa5dd4d92 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java @@ -18,9 +18,11 @@ import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.common.Namespaces; import org.zanata.rest.MediaTypes; import org.zanata.rest.dto.Link; @@ -41,12 +43,12 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("introspectableObjectMonitorService") +@Named("introspectableObjectMonitorService") @Path("/monitor") @Produces({ "application/xml" }) @Consumes({ "application/xml" }) @Transactional -@Restrict("#{s:hasRole('admin')}") +@CheckRole("admin") @Slf4j @Beta public class IntrospectableObjectMonitorService { diff --git a/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java b/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java index f1d3b6240d..98eeab4b4a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java @@ -22,8 +22,8 @@ import com.google.common.collect.Lists; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.ProjectDAO; import org.zanata.model.HLocale; diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java index 95c9153010..0283ccef90 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java @@ -20,8 +20,8 @@ */ package org.zanata.rest.service; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.ProjectIterationDAO; import org.zanata.model.HLocale; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; -@Name("projectIterationLocalesService") +@Named("projectIterationLocalesService") @Path(ProjectIterationLocalesService.SERVICE_PATH) public class ProjectIterationLocalesService extends LocalesService implements ProjectIterationLocalesResource { @PathParam("projectSlug") @@ -45,10 +45,10 @@ public class ProjectIterationLocalesService extends LocalesService implements Pr @PathParam("iterationSlug") String iterationSlug; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java index 62e369e019..271708a706 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java @@ -40,8 +40,8 @@ import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.util.HttpHeaderNames; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.security.Identity; import org.zanata.common.ProjectType; @@ -54,7 +54,7 @@ import com.google.common.base.Objects; -@Name("projectIterationService") +@Named("projectIterationService") @Path(ProjectIterationResource.SERVICE_PATH) @Transactional public class ProjectIterationService implements ProjectIterationResource { @@ -84,19 +84,19 @@ public class ProjectIterationService implements ProjectIterationResource { @Context private Request request; - @In + @Inject ProjectDAO projectDAO; - @In + @Inject ProjectIterationDAO projectIterationDAO; - @In + @Inject ETagUtils eTagUtils; - @In + @Inject Identity identity; - @In + @Inject private ConfigurationService configurationServiceImpl; @SuppressWarnings("null") diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java index 9949c7d010..85140a5c1c 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java @@ -31,8 +31,8 @@ import javax.ws.rs.core.Response.Status; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.ProjectDAO; import org.zanata.model.HLocale; @@ -43,16 +43,16 @@ import com.google.common.collect.Lists; -@Name("projectLocalesService") +@Named("projectLocalesService") @Path(ProjectLocalesResource.SERVICE_PATH) public class ProjectLocalesService extends LocalesService implements ProjectLocalesResource { @PathParam("projectSlug") String projectSlug; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java index 2d2e4dd05c..f1a9b692e0 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java @@ -21,8 +21,8 @@ import org.apache.commons.lang.StringUtils; import org.jboss.resteasy.util.HttpHeaderNames; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.security.Identity; import org.zanata.common.ProjectType; @@ -39,7 +39,7 @@ import com.google.common.base.Objects; -@Name("projectService") +@Named("projectService") @Path(ProjectResource.SERVICE_PATH) @Transactional public class ProjectService implements ProjectResource { @@ -57,16 +57,16 @@ public class ProjectService implements ProjectResource { @Context private Request request; - @In + @Inject ProjectDAO projectDAO; - @In + @Inject AccountDAO accountDAO; - @In + @Inject Identity identity; - @In + @Inject ETagUtils eTagUtils; @SuppressWarnings("null") diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java b/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java index 6a8b88441f..bffc82cf24 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java @@ -38,8 +38,8 @@ import org.hibernate.Query; import org.hibernate.Session; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.model.HProject; import org.zanata.rest.MediaTypes; @@ -48,12 +48,12 @@ import com.google.common.base.Objects; -@Name("projectsService") +@Named("projectsService") @Path(ProjectsResource.SERVICE_PATH) @Transactional public class ProjectsService implements ProjectsResource { - @In + @Inject private Session session; /** Type of media requested. */ diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java b/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java index df3cf2de5b..bcaa9b035d 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java @@ -35,10 +35,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.fedorahosted.tennera.jgettext.HeaderFields; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.web.FileUploadException; import org.zanata.ApplicationConfiguration; import org.zanata.common.ContentState; @@ -77,8 +75,8 @@ import com.google.common.base.Optional; -@Name("resourceUtils") -@Scope(ScopeType.STATELESS) +@Named("resourceUtils") +@javax.enterprise.context.Dependent @Slf4j public class ResourceUtils { /** @@ -117,10 +115,10 @@ public class ResourceUtils { private static Properties pluralForms; - @In + @Inject private EntityManager entityManager; - @In + @Inject private LocaleDAO localeDAO; @PostConstruct diff --git a/zanata-war/src/main/java/org/zanata/rest/service/RestSlugValidator.java b/zanata-war/src/main/java/org/zanata/rest/service/RestSlugValidator.java index 10e76a0a82..fa208d5d6f 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/RestSlugValidator.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/RestSlugValidator.java @@ -26,8 +26,8 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; import org.zanata.dao.ProjectDAO; @@ -45,14 +45,14 @@ * href="mailto:sflaniga@redhat.com">sflaniga@redhat.com * */ -@Name("restSlugValidator") +@Named("restSlugValidator") @Slf4j public class RestSlugValidator { - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; public @Nonnull diff --git a/zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java b/zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java index c3f96dffbb..85d0bef66a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/RestUtils.java @@ -14,17 +14,17 @@ import org.jboss.resteasy.core.Headers; import org.jboss.resteasy.core.ServerResponse; import org.jboss.resteasy.spi.NoLogWebApplicationException; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.zanata.seam.resteasy.SeamResteasyProviderFactory; -@Name("restUtils") +@Named("restUtils") public class RestUtils { private static final Logger log = LoggerFactory.getLogger(RestUtils.class); - @In + @Inject Validator validator; public static ServerResponse copyIfNotServerResponse(Response response) { 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 index d9e75bc0bc..32cd07df09 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java @@ -21,10 +21,12 @@ import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.common.Namespaces; import org.zanata.dao.ApplicationConfigurationDAO; import org.zanata.events.ConfigurationChanged; @@ -37,7 +39,7 @@ import com.google.common.collect.Lists; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.util.ServiceLocator; /** @@ -46,12 +48,12 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("serverConfigurationResource") +@Named("serverConfigurationResource") @Path("/configurations") @Produces({"application/xml", "application/json"}) @Consumes({"application/xml", "application/json"}) @Transactional -@Restrict("#{s:hasRole('admin')}") +@CheckRole("admin") @Slf4j @Beta public class ServerConfigurationService { @@ -63,7 +65,7 @@ public class ServerConfigurationService { @DefaultValue(MediaType.APPLICATION_JSON) @Context private MediaType accept; - @In + @Inject private ApplicationConfigurationDAO applicationConfigurationDAO; /** diff --git a/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java index 4d03063af7..0283473c12 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/SourceDocResourceService.java @@ -41,10 +41,12 @@ import lombok.extern.slf4j.Slf4j; import org.jboss.resteasy.util.GenericType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; import org.zanata.dao.DocumentDAO; @@ -67,7 +69,7 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("sourceDocResourceService") +@Named("sourceDocResourceService") @Path(SourceDocResource.SERVICE_PATH) @Slf4j @Transactional @@ -87,22 +89,22 @@ public class SourceDocResourceService implements SourceDocResource { @PathParam("iterationSlug") private String iterationSlug; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private DocumentService documentServiceImpl; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private ETagUtils eTagUtils; @Override @@ -148,7 +150,7 @@ public Response get(Set extensions) { } @Override - @Restrict("#{s:hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") + @Restrict("#{identity.hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public Response post(Resource resource, Set extensions, boolean copytrans) { @@ -245,7 +247,7 @@ public Response getResource(String idNoSlash, Set extensions) { } @Override - @Restrict("#{s:hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") + @Restrict("#{identity.hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public Response putResource(String idNoSlash, Resource resource, Set extensions, boolean copytrans) { @@ -278,7 +280,7 @@ Response putResource(String idNoSlash, Resource resource, } @Override - @Restrict("#{s:hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") + @Restrict("#{identity.hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public Response deleteResource(String idNoSlash) { String id = URIHelper.convertFromDocumentURIId(idNoSlash); @@ -334,7 +336,7 @@ public Response getResourceMeta(String idNoSlash, Set extensions) { } @Override - @Restrict("#{s:hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") + @Restrict("#{identity.hasPermission(sourceDocResourceService.securedIteration, 'import-template')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public Response putResourceMeta(String idNoSlash, ResourceMeta messageBody, Set extensions) { diff --git a/zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java b/zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java index ceacfcb2b7..a19b7ed30a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java @@ -40,10 +40,8 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.transform.ResultTransformer; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.DateTimeFormat; @@ -88,33 +86,33 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("statisticsServiceImpl") +@Named("statisticsServiceImpl") @Path(StatisticsResource.SERVICE_PATH) -@Scope(ScopeType.STATELESS) +@javax.enterprise.context.Dependent @Slf4j public class StatisticsServiceImpl implements StatisticsResource { - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private TextFlowTargetHistoryDAO textFlowTargetHistoryDAO; - @In + @Inject private LocaleServiceImpl localeServiceImpl; - @In + @Inject private ZPathService zPathService; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private EntityManager entityManager; - @In + @Inject private TranslationStateCache translationStateCacheImpl; // TODO Need to refactor this method to get Message statistic by default. diff --git a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java index 6812554912..7e367c23bc 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java @@ -39,10 +39,12 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.ApplicationConfiguration; import org.zanata.common.LocaleId; import org.zanata.common.MergeType; @@ -66,7 +68,7 @@ * This service allows clients to push and pull both source documents and * translations. */ -@Name("translatedDocResourceService") +@Named("translatedDocResourceService") @Path(TranslatedDocResource.SERVICE_PATH) @Slf4j @Transactional @@ -99,39 +101,39 @@ public class TranslatedDocResourceService implements TranslatedDocResource { @Context private UriInfo uri; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private ApplicationConfiguration applicationConfiguration; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private ETagUtils eTagUtils; - @In + @Inject private CopyTransService copyTransServiceImpl; - @In + @Inject private RestSlugValidator restSlugValidator; - @In + @Inject private TranslationService translationServiceImpl; - @In + @Inject private LocaleService localeServiceImpl; @Override @@ -190,7 +192,7 @@ public Response getTranslations(String idNoSlash, LocaleId locale, } @Override - @Restrict("#{s:hasPermission(translatedDocResourceService.securedIteration.project, 'modify-translation')}") + @Restrict("#{identity.hasPermission(translatedDocResourceService.securedIteration.project, 'modify-translation')}") /* FIXME [CDI] call hasPermission in the method (or use @PermissionTarget) */ public Response deleteTranslations(String idNoSlash, LocaleId locale) { String id = URIHelper.convertFromDocumentURIId(idNoSlash); diff --git a/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java index f973916d94..1cfcaed617 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java @@ -32,11 +32,13 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.TransactionPropagationType; import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.async.Async; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskResult; @@ -61,7 +63,7 @@ import com.google.common.base.Optional; -@Name("translationMemoryResource") +@Named("translationMemoryResource") @Path(TranslationMemoryResource.SERVICE_PATH) @Transactional(TransactionPropagationType.SUPPORTS) @Slf4j @@ -71,23 +73,23 @@ public class TranslationMemoryResourceService implements TranslationMemoryResource { - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private LockManagerService lockManagerServiceImpl; - @In + @Inject private RestSlugValidator restSlugValidator; - @In + @Inject private TextFlowStreamingDAO textFlowStreamDAO; - @In + @Inject private TransMemoryStreamingDAO transMemoryStreamingDAO; - @In + @Inject private TransMemoryDAO transMemoryDAO; - @In + @Inject private TMXParser tmxParser; @Override - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public Response getAllTranslationMemory(@Nullable LocaleId locale) { log.debug("exporting TMX for all projects, locale {}", locale); if (locale != null) { @@ -100,7 +102,7 @@ public Response getAllTranslationMemory(@Nullable LocaleId locale) { } @Override - @Restrict("#{s:hasPermission('', 'download-tmx')}") + @CheckPermission("download-tmx") public Response getProjectTranslationMemory(@Nonnull String projectSlug, @Nullable LocaleId locale) { log.debug("exporting TMX for project {}, locale {}", projectSlug, @@ -119,7 +121,7 @@ public Response getProjectTranslationMemory(@Nonnull String projectSlug, } @Override - @Restrict("#{s:hasPermission('', 'download-tmx')}") + @CheckPermission("download-tmx") public Response getProjectIterationTranslationMemory( @Nonnull String projectSlug, @Nonnull String iterationSlug, @Nullable LocaleId locale) { @@ -142,7 +144,7 @@ public Response getProjectIterationTranslationMemory( } @Override - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public Response getTranslationMemory(@Nonnull String slug) { log.debug("exporting TMX for translation memory {}", slug); TransMemory tm = getTM(transMemoryDAO.getBySlug(slug), slug); @@ -153,7 +155,7 @@ public Response getTranslationMemory(@Nonnull String slug) { } @Override - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public Response updateTranslationMemory(String slug, InputStream input) throws Exception { Lock tmLock = lockTM(slug); @@ -174,7 +176,7 @@ private TransMemory getTM(Optional tm, String slug) { return tm.get(); } - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public Object deleteTranslationMemory(String slug) throws EntityMissingException { Lock tmLock = lockTM(slug); @@ -192,7 +194,7 @@ public Object deleteTranslationMemory(String slug) } @Override - @Restrict("#{s:hasRole('admin')}") + @CheckRole("admin") public Object deleteTranslationUnits(String slug) { return deleteTranslationUnitsUnguarded(slug); } diff --git a/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java b/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java index 61bf418140..80f2afaa18 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java @@ -3,11 +3,11 @@ import javax.ws.rs.Path; import javax.ws.rs.core.Response; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; import org.zanata.rest.dto.VersionInfo; import org.zanata.util.VersionUtility; -@Name("versionService") +@Named("versionService") @Path(VersionResource.SERVICE_PATH) public class VersionService implements VersionResource { diff --git a/zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java b/zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java index 6d6d763e12..ea77782b88 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/VirusScanner.java @@ -34,7 +34,7 @@ import org.apache.commons.exec.ExecuteWatchdog; import org.apache.commons.exec.Executor; import org.apache.commons.exec.PumpStreamHandler; -import org.jboss.seam.annotations.Name; +import javax.inject.Named; import org.zanata.exception.VirusDetectedException; import com.google.common.base.Stopwatch; @@ -59,7 +59,7 @@ * href="mailto:sflaniga@redhat.com">sflaniga@redhat.com * */ -@Name("virusScanner") +@Named("virusScanner") @Slf4j public class VirusScanner { private static final boolean DISABLED; diff --git a/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java b/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java index 3b9ec995c0..c0c8398a3a 100644 --- a/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java +++ b/zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java @@ -26,11 +26,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.ProjectDAO; import org.zanata.model.HDocument; import org.zanata.model.HProject; @@ -46,9 +43,9 @@ * href="mailto:camunoz@redhat.com">camunoz@redhat.com * @since 2.0.0 */ -@Name("zPathService") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("zPathService") +@javax.enterprise.context.Dependent + public class ZPathService { /* * Public ZPaths. Used for rest resource path declaration. @@ -71,7 +68,7 @@ public class ZPathService { private static final Pattern PROJECT_ZPATH_PATTERN = Pattern .compile(PROJECT_ZPATH); - @In + @Inject private ProjectDAO projectDAO; public HProject resolveProject(String zPath) { diff --git a/zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java b/zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java index 1e5a612a8a..6db9d9a340 100644 --- a/zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java +++ b/zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java @@ -12,10 +12,9 @@ import javax.faces.context.FacesContext; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; import org.zanata.util.ServiceLocator; @@ -27,9 +26,9 @@ * @author Gavin King * */ -@Scope(ScopeType.APPLICATION) +@javax.enterprise.context.ApplicationScoped @BypassInterceptors -@Name("org.jboss.seam.navigation.safeActions") +@Named("org.jboss.seam.navigation.safeActions") @Install(precedence = DEPLOYMENT, classDependencies = "javax.faces.context.FacesContext") // Implementation copied from diff --git a/zanata-war/src/main/java/org/zanata/seam/framework/Home.java b/zanata-war/src/main/java/org/zanata/seam/framework/Home.java index e9fb1e634c..3c76a194b3 100644 --- a/zanata-war/src/main/java/org/zanata/seam/framework/Home.java +++ b/zanata-war/src/main/java/org/zanata/seam/framework/Home.java @@ -8,9 +8,7 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Expressions; import org.jboss.seam.core.Expressions.ValueExpression; @@ -24,7 +22,7 @@ * * @author Gavin King */ -@Scope(ScopeType.CONVERSATION) +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ public abstract class Home extends MutableController { private static final long serialVersionUID = -5462396456614090423L; @@ -99,7 +97,7 @@ protected void createdMessage() { * valid state.
* Validates that the class of the entity to be managed has been specified. */ - @Create + @PostConstruct public void create() { if (getEntityClass() == null) { throw new IllegalStateException("entityClass is null"); diff --git a/zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java b/zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java index 09a40ea88a..716a278925 100644 --- a/zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java +++ b/zanata-war/src/main/java/org/zanata/seam/resteasy/Application.java @@ -23,12 +23,10 @@ */ package org.zanata.seam.resteasy; -import org.jboss.seam.ScopeType; import org.jboss.seam.Component; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Install; +import javax.inject.Named; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; import javax.ws.rs.core.MediaType; import java.util.*; @@ -39,10 +37,10 @@ * * @author Christian Bauer */ -@Name("org.jboss.seam.resteasy.application") -@Scope(ScopeType.APPLICATION) +@Named("org.jboss.seam.resteasy.application") +@javax.enterprise.context.ApplicationScoped @Install(precedence = Install.BUILT_IN) -@AutoCreate + public class Application extends javax.ws.rs.core.Application { final private Map, Set> providerClasses = diff --git a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java index c668ca236b..e291aff330 100644 --- a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java +++ b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceHome.java @@ -46,7 +46,7 @@ import org.jboss.resteasy.core.StringParameterInjector; import org.jboss.seam.Entity; -import org.jboss.seam.annotations.Create; +import javax.annotation.PostConstruct; import org.jboss.seam.framework.Home; import static javax.ws.rs.core.Response.Status.UNSUPPORTED_MEDIA_TYPE; @@ -87,7 +87,7 @@ public class ResourceHome extends AbstractResource { * Called at component instantiation. EntityHome component must be set in * order for component to be created. */ - @Create + @PostConstruct public void create() { setEntityHome(getEntityHome()); if (entityHome == null) { diff --git a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java index 826a413207..3981b06085 100644 --- a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java +++ b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResourceQuery.java @@ -36,7 +36,7 @@ import javax.ws.rs.core.Response; import org.jboss.resteasy.annotations.providers.jaxb.Wrapped; -import org.jboss.seam.annotations.Create; +import javax.annotation.PostConstruct; import org.jboss.seam.framework.EntityQuery; import org.jboss.seam.framework.Query; @@ -63,7 +63,7 @@ public class ResourceQuery extends AbstractResource { /** * Called at component instantiation. */ - @Create + @PostConstruct public void create() { this.entityQuery = getEntityQuery(); if (entityQuery == null) { diff --git a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java index 45d3778c14..eda99b6636 100644 --- a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java +++ b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyBootstrap.java @@ -42,17 +42,15 @@ import org.jboss.resteasy.spi.ResourceFactory; import org.jboss.resteasy.spi.StringConverter; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; import org.jboss.seam.Seam; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Install; +import javax.annotation.PostConstruct; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; import org.jboss.seam.annotations.JndiName; import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Init; @@ -81,10 +79,10 @@ * * @author Christian Bauer */ -@Name("org.jboss.seam.resteasy.bootstrap") -@Scope(ScopeType.APPLICATION) -@Startup -@AutoCreate +@Named("org.jboss.seam.resteasy.bootstrap") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ + @Install(precedence = BUILT_IN, classDependencies = "org.jboss.resteasy.spi.ResteasyProviderFactory") public class ResteasyBootstrap { @@ -92,19 +90,19 @@ public class ResteasyBootstrap { @Logger Log log; - @In + @Inject protected Application application; // The job of this class is to initialize and configure the RESTEasy // Dispatcher instance protected Dispatcher dispatcher; - @Factory("org.jboss.seam.resteasy.dispatcher") + @Produces(/* TODO [CDI] check this: migrated from @Factory */"org.jboss.seam.resteasy.dispatcher") public Dispatcher getDispatcher() { return dispatcher; } - @Create + @PostConstruct public void init() { log.info("bootstrapping JAX-RS application"); diff --git a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java index b5efc08795..f2a25d0fd2 100644 --- a/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java +++ b/zanata-war/src/main/java/org/zanata/seam/resteasy/ResteasyResourceAdapter.java @@ -46,12 +46,11 @@ import org.jboss.resteasy.spi.HttpResponse; import org.jboss.resteasy.spi.ResteasyUriInfo; import org.jboss.seam.Component; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; +import javax.annotation.PostConstruct; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.log.Log; import org.jboss.seam.servlet.ContextualHttpServletRequest; @@ -64,8 +63,8 @@ * * @author Christian Bauer */ -@Scope(ScopeType.APPLICATION) -@Name("org.jboss.seam.resteasy.resourceAdapter") +@javax.enterprise.context.ApplicationScoped +@Named("org.jboss.seam.resteasy.resourceAdapter") @BypassInterceptors @Install(precedence = BUILT_IN) public class ResteasyResourceAdapter extends AbstractResource { @@ -76,7 +75,7 @@ public class ResteasyResourceAdapter extends AbstractResource { protected Dispatcher dispatcher; protected Application application; - @Create + @PostConstruct public void init() { // No injection, so lookup on first request dispatcher = diff --git a/zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java b/zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java index 44d5bb089c..04c7ddb358 100644 --- a/zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java +++ b/zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java @@ -26,20 +26,17 @@ import java.util.List; import javax.faces.application.FacesMessage; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import com.google.common.collect.Lists; import org.zanata.util.ServiceLocator; /** * @author Alex Eng aeng@redhat.com */ -@Name("conversationScopeMessages") -@Scope(ScopeType.CONVERSATION) -@AutoCreate +@Named("conversationScopeMessages") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ + public class ConversationScopeMessages implements Serializable { private List messages = Lists.newArrayList(); diff --git a/zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java b/zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java index 6ac9ee1735..01c11d6310 100644 --- a/zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java +++ b/zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java @@ -23,12 +23,9 @@ import java.util.List; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.zanata.ApplicationConfiguration; import org.zanata.dao.AccountDAO; import org.zanata.dao.CredentialsDAO; @@ -53,38 +50,38 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("authenticationManager") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("authenticationManager") +@javax.enterprise.context.Dependent + public class AuthenticationManager { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private ZanataJpaIdentityStore identityStore; - @In + @Inject private ZanataCredentials credentials; - @In + @Inject private ZanataOpenId zanataOpenId; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private UserAccountService userAccountServiceImpl; - @In + @Inject private CredentialsDAO credentialsDAO; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private UserRedirectBean userRedirect; - @In + @Inject private ApplicationConfiguration applicationConfiguration; /** diff --git a/zanata-war/src/main/java/org/zanata/security/FacesSecurityEvents.java b/zanata-war/src/main/java/org/zanata/security/FacesSecurityEvents.java index 41de2de730..b36adcdf7f 100644 --- a/zanata-war/src/main/java/org/zanata/security/FacesSecurityEvents.java +++ b/zanata-war/src/main/java/org/zanata/security/FacesSecurityEvents.java @@ -20,10 +20,9 @@ */ package org.zanata.security; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.international.StatusMessage; @@ -37,12 +36,12 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("org.jboss.seam.security.facesSecurityEvents") -@Scope(ScopeType.APPLICATION) +@Named("org.jboss.seam.security.facesSecurityEvents") +@javax.enterprise.context.ApplicationScoped @Install(precedence = APPLICATION, classDependencies = "javax.faces.context.FacesContext") @BypassInterceptors -@Startup +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ public class FacesSecurityEvents extends org.jboss.seam.security.FacesSecurityEvents { @Override diff --git a/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java b/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java index 11c1ee7345..aeae4bb039 100644 --- a/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java +++ b/zanata-war/src/main/java/org/zanata/security/FixedClientUidSelector.java @@ -2,13 +2,14 @@ import javax.faces.context.FacesContext; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; +import javax.annotation.PostConstruct; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.ui.ClientUidSelector; import org.jboss.seam.util.RandomStringUtils; -@Name("org.jboss.seam.ui.clientUidSelector") +@Named("org.jboss.seam.ui.clientUidSelector") @Install(precedence = Install.DEPLOYMENT) /** * Workaround for https://jira.jboss.org/browse/JBSEAM-4503 @@ -20,7 +21,7 @@ public class FixedClientUidSelector extends ClientUidSelector { private static final long serialVersionUID = -4923235748771706010L; private String clientUid; - @Create + @PostConstruct public void onCreate() { String requestContextPath = FacesContext.getCurrentInstance().getExternalContext() diff --git a/zanata-war/src/main/java/org/zanata/security/FixedRememberMe.java b/zanata-war/src/main/java/org/zanata/security/FixedRememberMe.java index 2de996e21f..8684bdf10a 100644 --- a/zanata-war/src/main/java/org/zanata/security/FixedRememberMe.java +++ b/zanata-war/src/main/java/org/zanata/security/FixedRememberMe.java @@ -22,16 +22,16 @@ import javax.faces.context.FacesContext; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.security.RememberMe; import static org.jboss.seam.ScopeType.SESSION; -@Name("org.jboss.seam.security.rememberMe") -@Scope(SESSION) +@Named("org.jboss.seam.security.rememberMe") +@javax.enterprise.context.SessionScoped @Install(precedence = Install.DEPLOYMENT) @BypassInterceptors public class FixedRememberMe extends RememberMe { diff --git a/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java b/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java index f7219156db..c1e081ce60 100644 --- a/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java +++ b/zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java @@ -21,7 +21,6 @@ package org.zanata.security; import com.google.common.base.Optional; -import org.jboss.seam.ScopeType; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.PersonDAO; import org.zanata.model.HAccount; diff --git a/zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java b/zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java index 4e7e514db2..ce6299d8a8 100644 --- a/zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java +++ b/zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java @@ -7,7 +7,9 @@ import javax.persistence.PreRemove; import javax.persistence.PreUpdate; -import org.jboss.seam.annotations.security.Restrict; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.jboss.seam.security.EntityAction; import org.jboss.seam.security.EntitySecurityListener; import org.jboss.seam.security.Identity; diff --git a/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java b/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java index 54873f28c8..d9b515ca85 100644 --- a/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java +++ b/zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java @@ -28,9 +28,9 @@ import javax.faces.context.FacesContext; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.core.Events; import org.jboss.seam.security.Identity; @@ -39,8 +39,8 @@ import org.slf4j.LoggerFactory; import org.zanata.util.ServiceLocator; -@Name("org.jboss.seam.security.spNegoIdentity") -@Scope(SESSION) +@Named("org.jboss.seam.security.spNegoIdentity") +@javax.enterprise.context.SessionScoped @Install(precedence = APPLICATION) @BypassInterceptors public class SpNegoIdentity implements Serializable { diff --git a/zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java b/zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java index 9ccb720d2e..a579a447de 100644 --- a/zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java +++ b/zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java @@ -25,10 +25,7 @@ import java.net.URLDecoder; import java.net.URLEncoder; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.web.ServletContexts; /** @@ -42,10 +39,10 @@ * TODO Use {@link org.jboss.seam.faces.Redirect} instead of this class (by * extension or otherwise). */ -@Name("userRedirect") +@Named("userRedirect") // TODO verify that SESSION scope will not persist this too long -@Scope(ScopeType.SESSION) -@AutoCreate +@javax.enterprise.context.SessionScoped + public class UserRedirectBean implements Serializable { private static final String HOME_URL = "/"; private static final String REGISTER_URL = "/register"; diff --git a/zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java b/zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java index bfcf8124dd..9239f905eb 100644 --- a/zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java +++ b/zanata-war/src/main/java/org/zanata/security/ZanataCredentials.java @@ -30,9 +30,9 @@ import static org.jboss.seam.ScopeType.SESSION; import static org.jboss.seam.annotations.Install.APPLICATION; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.security.Credentials; import org.zanata.security.openid.OpenIdProviderType; @@ -47,8 +47,8 @@ * href="mailto:camunoz@redhat.com">camunoz@redhat.com * @see {@link Credentials} */ -@Name("org.jboss.seam.security.credentials") -@Scope(SESSION) +@Named("org.jboss.seam.security.credentials") +@javax.enterprise.context.SessionScoped @Install(precedence = APPLICATION) @BypassInterceptors @Slf4j diff --git a/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java b/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java index a4e2ddb275..1903dd9489 100644 --- a/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java +++ b/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java @@ -25,10 +25,10 @@ import javax.security.auth.login.LoginContext; import javax.security.auth.login.LoginException; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; @@ -50,11 +50,11 @@ import static org.jboss.seam.ScopeType.SESSION; import static org.jboss.seam.annotations.Install.APPLICATION; -@Name("org.jboss.seam.security.identity") -@Scope(SESSION) +@Named("org.jboss.seam.security.identity") +@javax.enterprise.context.SessionScoped @Install(precedence = APPLICATION) @BypassInterceptors -@Startup +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ public class ZanataIdentity extends Identity { private static final Logger log = LoggerFactory.getLogger( ZanataIdentity.class); diff --git a/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java b/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java index e20f488b32..27fa1f7b48 100644 --- a/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java +++ b/zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java @@ -20,10 +20,10 @@ */ package org.zanata.security; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.annotations.security.management.PasswordSalt; @@ -40,10 +40,10 @@ import static org.jboss.seam.ScopeType.APPLICATION; -@Name("org.jboss.seam.security.identityStore") +@Named("org.jboss.seam.security.identityStore") @Install(precedence = Install.DEPLOYMENT, value = true) -@Scope(APPLICATION) -@Startup +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ @BypassInterceptors public class ZanataJpaIdentityStore extends JpaIdentityStore { @@ -60,7 +60,7 @@ public class ZanataJpaIdentityStore extends JpaIdentityStore { private AnnotatedBeanProperty passwordSaltProperty; private AnnotatedBeanProperty userPasswordProperty; - @Create + @PostConstruct public void init() { super.init(); initProperties(); diff --git a/zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java b/zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java index 3eb3ca025e..34204aa236 100644 --- a/zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java +++ b/zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java @@ -27,11 +27,9 @@ import javax.faces.context.ExternalContext; import javax.servlet.http.HttpServletRequest; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.core.Events; import org.jboss.seam.faces.FacesManager; import org.jboss.seam.faces.Redirect; @@ -63,12 +61,12 @@ import org.zanata.security.openid.OpenIdProviderType; import org.zanata.security.openid.YahooOpenIdProvider; import org.zanata.ui.faces.FacesMessages; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.util.ServiceLocator; -@Name("org.jboss.seam.security.zanataOpenId") -@Scope(SESSION) -@AutoCreate +@Named("org.jboss.seam.security.zanataOpenId") +@javax.enterprise.context.SessionScoped + /* * based on org.jboss.seam.security.openid.OpenId class */ @@ -79,19 +77,19 @@ public class ZanataOpenId implements OpenIdAuthCallback { private ZanataIdentity identity; private ApplicationConfiguration applicationConfiguration; - @In("jsfMessages") + @Inject private FacesMessages facesMessages; - @In + @Inject private Credentials credentials; - @In + @Inject private UserRedirectBean userRedirect; - @In + @Inject private AccountDAO accountDAO; - @In("event") + @Inject private Event loginCompletedEvent; private String id; @@ -230,7 +228,7 @@ public void logout() { init(); } - @Create + @PostConstruct public void init() { manager = new ConsumerManager(); discovered = null; diff --git a/zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java b/zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java index cabd62a57c..f8f03d88d6 100644 --- a/zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java +++ b/zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java @@ -27,9 +27,9 @@ import java.util.Iterator; import java.util.Set; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.security.permission.PermissionResolver; @@ -44,11 +44,11 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("customPermissionResolver") -@Scope(APPLICATION) +@Named("customPermissionResolver") +@javax.enterprise.context.ApplicationScoped @BypassInterceptors @Install(precedence = BUILT_IN) -@Startup +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ public class CustomPermissionResolver implements PermissionResolver, Serializable { diff --git a/zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java b/zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java index 0d6acde36d..14664907e8 100644 --- a/zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java +++ b/zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java @@ -30,11 +30,8 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import org.apache.commons.lang.ArrayUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.zanata.security.SecurityFunctions; @@ -47,10 +44,10 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("permissions") -@AutoCreate -@Scope(ScopeType.APPLICATION) -@Startup +@Named("permissions") + +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ public class PermissionEvaluator { private static final String ALL_ACTION_GRANTER = "__**__"; @@ -58,7 +55,7 @@ public class PermissionEvaluator { private final Multimap permissionGrantMethods = ArrayListMultimap.create(); - @Create + @PostConstruct public void buildIndex() { registerPermissionGranters(SecurityFunctions.class); } diff --git a/zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java b/zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java index 54ebc5653c..e0d45359e9 100644 --- a/zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java +++ b/zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java @@ -7,11 +7,9 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.annotations.Synchronized; import org.zanata.ServerConstants; @@ -26,18 +24,18 @@ import org.zanata.model.HTextFlowTarget; import org.zanata.model.tm.TransMemoryUnit; -@Name("searchIndexManager") -@Scope(ScopeType.APPLICATION) -@Startup +@Named("searchIndexManager") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ @Synchronized(timeout = ServerConstants.DEFAULT_TIMEOUT) @Slf4j public class SearchIndexManager implements Serializable { private static final long serialVersionUID = 1L; - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; - @In + @Inject private IndexingService indexingServiceImpl; // we use a list to ensure predictable order @@ -49,7 +47,7 @@ public class SearchIndexManager implements Serializable { private AsyncTaskHandle handle; - @Create + @PostConstruct public void create() { // TODO get the list of classes from Hibernate Search // ie FullTextSession.getSearchFactory().getStatistics().getIndexedClassNames() diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java b/zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java index c75d5e0ece..29559816e0 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/ActivityLockManager.java @@ -23,10 +23,7 @@ import java.util.concurrent.locks.Lock; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import com.google.common.util.concurrent.Striped; @@ -34,9 +31,9 @@ * @author Sean Flanigan sflaniga@redhat.com * */ -@Name("activityLockManager") -@AutoCreate -@Scope(ScopeType.APPLICATION) +@Named("activityLockManager") + +@javax.enterprise.context.ApplicationScoped public class ActivityLockManager { private static final int NUM_STRIPES = Runtime.getRuntime().availableProcessors() * 4; public ActivityLockManager() { diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java index 2fc2a4019e..a50d65930b 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java @@ -31,12 +31,9 @@ import javax.persistence.EntityManager; import org.apache.commons.lang.time.DateUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.zanata.action.DashboardUserStats; import org.zanata.common.ActivityType; @@ -64,26 +61,26 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("activityServiceImpl") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("activityServiceImpl") + +@javax.enterprise.context.Dependent public class ActivityServiceImpl implements ActivityService { - @In + @Inject private ActivityDAO activityDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private EntityManager entityManager; - @In + @Inject private ActivityLockManager activityLockManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java index 9cc77a5e8e..97ca37b8f6 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java @@ -25,10 +25,8 @@ import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.ApplicationConfiguration; import org.zanata.common.Namespaces; import org.zanata.common.ProjectType; @@ -37,20 +35,20 @@ import org.zanata.service.ConfigurationService; import org.zanata.service.LocaleService; -@Name("configurationServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("configurationServiceImpl") +@javax.enterprise.context.Dependent public class ConfigurationServiceImpl implements ConfigurationService { private static final String FILE_NAME = "zanata.xml"; private static final String PROJECT_TYPE_OFFLINE_PO = "offlinepo"; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private ApplicationConfiguration applicationConfiguration; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java index 4ca8e29f1c..e618ff8938 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java @@ -23,10 +23,8 @@ import java.util.List; import java.util.concurrent.Future; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.async.Async; import org.zanata.async.AsyncTaskResult; import org.zanata.async.ContainsAsyncMethods; @@ -53,8 +51,8 @@ import javax.validation.constraints.NotNull; -@Name("copyTransServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("copyTransServiceImpl") +@javax.enterprise.context.Dependent @Slf4j @ContainsAsyncMethods @AllArgsConstructor @@ -63,19 +61,19 @@ public class CopyTransServiceImpl implements CopyTransService { private static final int COPY_TRANS_BATCH_SIZE = 20; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private CopyTransWorkFactory copyTransWorkFactory; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private TranslationStateCache translationStateCacheImpl; - @In + @Inject private TextFlowDAO textFlowDAO; /** diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java index e90743f0cb..4f51f5ef3a 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java @@ -22,10 +22,8 @@ import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.TextFlowTargetDAO; import org.zanata.model.HCopyTransOptions; import org.zanata.model.HDocument; @@ -38,23 +36,23 @@ /** * @author Sean Flanigan sflaniga@redhat.com */ -@Name("copyTransWorkFactory") -@Scope(ScopeType.STATELESS) +@Named("copyTransWorkFactory") +@javax.enterprise.context.Dependent public class CopyTransWorkFactory { // Inject textFlowTargetDAO for Hibernate-based query // Inject translationMemoryServiceImpl for Hibernate Search query - @In("textFlowTargetDAO") -// @In("translationMemoryServiceImpl") + @Inject +// @Inject private TranslationFinder translationFinder; - @In("textFlowTargetDAO") + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private ValidationService validationServiceImpl; - @In + @Inject private VersionStateCache versionStateCacheImpl; public CopyTransWork createCopyTransWork(HLocale targetLocale, diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java index 380a7ed764..3d8199b6b6 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java @@ -4,11 +4,8 @@ import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.async.Async; import org.zanata.async.AsyncTaskResult; import org.zanata.async.ContainsAsyncMethods; @@ -45,10 +42,10 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("copyVersionServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("copyVersionServiceImpl") +@javax.enterprise.context.Dependent @Slf4j -@AutoCreate + @ContainsAsyncMethods public class CopyVersionServiceImpl implements CopyVersionService { @@ -61,25 +58,25 @@ public class CopyVersionServiceImpl implements CopyVersionService { // TextFlowTarget batch size protected final static int TFT_BATCH_SIZE = 20; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private VersionStateCache versionStateCacheImpl; - @In + @Inject private FilePersistService filePersistService; - @In + @Inject private ZanataIdentity identity; // Stop watch for textFlow and target copy process 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 index f0bde3f826..d3004e486a 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java @@ -25,11 +25,9 @@ import java.util.concurrent.Future; import com.google.common.collect.Lists; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Events; import org.jboss.seam.security.management.JpaIdentityStore; @@ -66,7 +64,7 @@ import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import javax.enterprise.event.Observes; @@ -77,49 +75,49 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("documentServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("documentServiceImpl") +@javax.enterprise.context.Dependent @ContainsAsyncMethods @Slf4j public class DocumentServiceImpl implements DocumentService { - @In(required = false) + @Inject /* TODO [CDI] check this: migrated from @In(required = false) */ private ZanataIdentity identity; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private CopyTransService copyTransServiceImpl; - @In + @Inject private LockManagerService lockManagerServiceImpl; - @In + @Inject private VersionStateCache versionStateCacheImpl; - @In + @Inject private TranslationStateCache translationStateCacheImpl; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private ApplicationConfiguration applicationConfiguration; - @In(value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION, + @Inject(value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION, required = false) private HAccount authenticatedAccount; - @In + @Inject private Messages msgs; - @In("event") + @Inject private Event documentUploadedEvent; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java b/zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java index b4796faf9d..89f9f4e176 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/EmailChangeService.java @@ -23,19 +23,17 @@ import java.util.Date; import org.apache.commons.lang.time.DateUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.PersonEmailValidationKeyDAO; import org.zanata.model.HPerson; import org.zanata.model.HPersonEmailValidationKey; import org.zanata.util.HashUtil; -@Name("emailChangeService") -@Scope(ScopeType.STATELESS) +@Named("emailChangeService") +@javax.enterprise.context.Dependent public class EmailChangeService { - @In + @Inject PersonEmailValidationKeyDAO personEmailValidationKeyDAO; public static class KeyParameter { diff --git a/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java index 25bc840442..838df91293 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java @@ -26,11 +26,8 @@ import lombok.extern.slf4j.Slf4j; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityManager; import org.zanata.ApplicationConfiguration; @@ -61,31 +58,31 @@ /** * @author Alex Eng aeng@redhat.com */ -@AutoCreate -@Name("emailServiceImpl") -@Scope(ScopeType.STATELESS) + +@Named("emailServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class EmailServiceImpl implements EmailService { - @In + @Inject private EmailBuilder emailBuilder; - @In + @Inject private IdentityManager identityManager; - @In + @Inject private PersonDAO personDAO; - @In + @Inject private ApplicationConfiguration applicationConfiguration; - @In + @Inject private VersionGroupJoinAction versionGroupJoinAction; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private Messages msgs; /** diff --git a/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java index 35637870d7..227a6aaabe 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java @@ -28,9 +28,7 @@ import java.util.Calendar; import java.util.Properties; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.service.FileSystemService; /** @@ -40,8 +38,8 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("fileSystemServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("fileSystemServiceImpl") +@javax.enterprise.context.Dependent public class FileSystemServiceImpl implements FileSystemService { private static final File STAGING_DIR = new File( System.getProperty("java.io.tmpdir")); diff --git a/zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java index e8617e3985..bc65619063 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java @@ -28,9 +28,8 @@ import java.util.List; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.zanata.adapter.glossary.GlossaryCSVReader; import org.zanata.adapter.glossary.GlossaryPoReader; @@ -52,13 +51,13 @@ * @author Alex Eng aeng@redhat.com * */ -@Name("glossaryFileServiceImpl") -@Scope(STATELESS) +@Named("glossaryFileServiceImpl") +@javax.enterprise.context.Dependent public class GlossaryFileServiceImpl implements GlossaryFileService { - @In + @Inject private GlossaryDAO glossaryDAO; - @In + @Inject private LocaleService localeServiceImpl; private final static int BATCH_SIZE = 50; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java index c1924852cf..acd635a86a 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java @@ -1,20 +1,18 @@ package org.zanata.service.impl; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.model.HAccount; import org.zanata.service.GravatarService; import org.zanata.util.HashUtil; -@Name("gravatarServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("gravatarServiceImpl") +@javax.enterprise.context.Dependent public class GravatarServiceImpl implements GravatarService { private static String GRAVATAR_URL = "//www.gravatar.com/avatar/"; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER) */ HAccount authenticatedAccount; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java index 56305af1a1..2de91375a3 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java @@ -30,11 +30,8 @@ import org.hibernate.Session; import org.hibernate.search.FullTextSession; import org.hibernate.search.Search; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.action.ReindexClassOptions; import org.zanata.async.Async; import org.zanata.async.AsyncTaskHandle; @@ -53,17 +50,17 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("indexingServiceImpl") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("indexingServiceImpl") +@javax.enterprise.context.Dependent + @Slf4j @ContainsAsyncMethods public class IndexingServiceImpl implements IndexingService { - @In + @Inject private EntityManagerFactory entityManagerFactory; - @In + @Inject private HTextFlowTargetStreamingDAO hTextFlowTargetStreamingDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java index 96d5be478d..0e3e088ce5 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java @@ -2,10 +2,8 @@ import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.core.Events; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.common.LocaleId; @@ -20,24 +18,24 @@ import org.zanata.model.HLocaleMember.HLocaleMemberPk; import org.zanata.model.HPerson; import org.zanata.service.LanguageTeamService; -import org.zanata.util.Event; +import javax.enterprise.event.Event; -@Name("languageTeamServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("languageTeamServiceImpl") +@javax.enterprise.context.Dependent public class LanguageTeamServiceImpl implements LanguageTeamService { - @In + @Inject private PersonDAO personDAO; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private LocaleMemberDAO localeMemberDAO; - @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION) + @Inject /* TODO [CDI] check this: migrated from @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION) */ private HAccount authenticatedAccount; - @In("event") + @Inject private Event languageTeamPermissionChangedEvent; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java index baa3e82748..5c28823a8a 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java @@ -31,10 +31,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.LocaleDAO; import org.zanata.dao.PersonDAO; @@ -59,8 +57,8 @@ * This implementation provides all the business logic related to Locale. * */ -@Name("localeServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("localeServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class LocaleServiceImpl implements LocaleService { private LocaleDAO localeDAO; @@ -99,32 +97,32 @@ public static Map getLocaleAliasesByIteration(HProjectIteratio return localeAliases; } - @In + @Inject public void setTextFlowTargetDAO(TextFlowTargetDAO textFlowTargetDAO) { this.textFlowTargetDAO = textFlowTargetDAO; } - @In + @Inject public void setLocaleDAO(LocaleDAO localeDAO) { this.localeDAO = localeDAO; } - @In + @Inject public void setProjectDAO(ProjectDAO projectDAO) { this.projectDAO = projectDAO; } - @In + @Inject public void setProjectIterationDAO(ProjectIterationDAO projectIterationDAO) { this.projectIterationDAO = projectIterationDAO; } - @In + @Inject public void setPersonDAO(PersonDAO personDAO) { this.personDAO = personDAO; } - @In + @Inject public void setVersionGroupDAO(VersionGroupDAO versionGroupDAO) { this.versionGroupDAO = versionGroupDAO; } diff --git a/zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java index 74f8b1bbc3..4ffb30e3dd 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java @@ -23,9 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.lock.Lock; @@ -41,9 +39,9 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("lockManagerServiceImpl") -@Scope(ScopeType.APPLICATION) -@Startup +@Named("lockManagerServiceImpl") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ public class LockManagerServiceImpl implements LockManagerService { /** * Maps locks to their owners' usernames diff --git a/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java index ba8929bd17..f49cc4e1db 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java @@ -27,10 +27,8 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.async.Async; import org.zanata.async.AsyncTaskResult; import org.zanata.async.ContainsAsyncMethods; @@ -56,28 +54,28 @@ * * @author Alex Eng aeng@redhat.com */ -@Name("mergeTranslationsServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("mergeTranslationsServiceImpl") +@javax.enterprise.context.Dependent @Slf4j @ContainsAsyncMethods public class MergeTranslationsServiceImpl implements MergeTranslationsService { - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private VersionStateCache versionStateCacheImpl; - @In + @Inject private TranslationStateCache translationStateCacheImpl; - @In + @Inject private LocaleService localeServiceImpl; private final static int TRANSLATION_BATCH_SIZE = 10; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java index 4287e4006b..3eb65e3e92 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java @@ -25,10 +25,8 @@ import javax.persistence.EntityManager; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.RunAsOperation; import org.jboss.seam.security.management.IdentityStore; import org.zanata.ApplicationConfiguration; @@ -49,28 +47,28 @@ import org.zanata.service.RegisterService; import org.zanata.util.HashUtil; -@Name("registerServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("registerServiceImpl") +@javax.enterprise.context.Dependent public class RegisterServiceImpl implements RegisterService { - @In + @Inject EntityManager entityManager; - @In + @Inject IdentityStore identityStore; - @In + @Inject AccountDAO accountDAO; - @In + @Inject PersonDAO personDAO; - @In + @Inject AccountRoleDAO accountRoleDAO; - @In + @Inject AccountActivationKeyDAO accountActivationKeyDAO; - @In + @Inject ApplicationConfiguration applicationConfiguration; /** diff --git a/zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java index eb6acd7547..1fd3817ba5 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java @@ -23,9 +23,11 @@ import javax.ws.rs.Path; import javax.ws.rs.QueryParam; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.security.Restrict; +import javax.inject.Inject; +import javax.inject.Named; +import org.zanata.security.annotations.CheckLoggedIn; +import org.zanata.security.annotations.CheckPermission; +import org.zanata.security.annotations.CheckRole; import org.zanata.exception.ZanataServiceException; import org.zanata.rest.dto.ReindexStatus; import org.zanata.service.SearchIndexManager; @@ -38,11 +40,11 @@ * href="mailto:camunoz@redhat.com">camunoz@redhat.com * @see org.zanata.action.ReindexAction */ -@Name("searchServiceImpl") +@Named("searchServiceImpl") @Path("/search") -@Restrict("#{s:hasRole('admin')}") +@CheckRole("admin") public class SearchServiceImpl implements SearchService { - @In + @Inject private SearchIndexManager searchIndexManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java index 160b11fa06..6ac1928dea 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java @@ -21,10 +21,8 @@ package org.zanata.service.impl; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.AuthorizationException; import org.zanata.common.EntityStatus; import org.zanata.dao.ProjectDAO; @@ -43,19 +41,19 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("securityServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("securityServiceImpl") +@javax.enterprise.context.Dependent public class SecurityServiceImpl implements SecurityService { - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java index fb4f6f0052..f899b50f03 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java @@ -22,10 +22,8 @@ import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.model.HProjectIteration; import org.zanata.model.SlugEntityBase; import org.zanata.service.SlugEntityService; @@ -37,10 +35,10 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("slugEntityServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("slugEntityServiceImpl") +@javax.enterprise.context.Dependent public class SlugEntityServiceImpl implements SlugEntityService { - @In + @Inject private Session session; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java b/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java index 15a31ecb38..7e4b24ecef 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityUpdatedListener.java @@ -4,11 +4,8 @@ import org.hibernate.event.spi.PostUpdateEvent; import org.hibernate.event.spi.PostUpdateEventListener; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; import org.zanata.events.ProjectIterationUpdate; @@ -17,7 +14,7 @@ import org.zanata.model.HProjectIteration; import org.zanata.model.SlugEntityBase; import org.zanata.service.IndexingService; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.util.ServiceLocator; import com.google.common.collect.Lists; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java index 9a77392a2c..5f400cf490 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java @@ -41,10 +41,8 @@ import org.hibernate.search.FullTextSession; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.FullTextQuery; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.common.LocaleId; import org.zanata.dao.DocumentDAO; @@ -72,18 +70,18 @@ * @author David Mason, damason@redhat.com */ -@Name("textFlowSearchServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("textFlowSearchServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class TextFlowSearchServiceImpl implements TextFlowSearchService { - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private FullTextSession session; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java index 90f8c251b4..32a47e659d 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java @@ -24,10 +24,8 @@ import java.util.List; import java.util.Map; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.dao.TextFlowDAO; import org.zanata.dao.TransMemoryUnitDAO; @@ -41,7 +39,7 @@ import org.zanata.service.TransMemoryMergeService; import org.zanata.service.TranslationMemoryService; import org.zanata.service.TranslationService; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.webtrans.server.rpc.TransMemoryMergeStatusResolver; import org.zanata.webtrans.shared.model.TransMemoryDetails; import org.zanata.webtrans.shared.model.TransMemoryResultItem; @@ -61,30 +59,30 @@ * @author Sean Flanigan sflaniga@redhat.com */ -@Name("transMemoryMergeServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("transMemoryMergeServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class TransMemoryMergeServiceImpl implements TransMemoryMergeService { - @In + @Inject private SecurityService securityServiceImpl; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TransMemoryUnitDAO transMemoryUnitDAO; - @In + @Inject private TranslationMemoryService translationMemoryServiceImpl; - @In + @Inject private TranslationService translationServiceImpl; - @In("event") + @Inject private Event textFlowTargetUpdateContextEvent; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java index 225596c5da..9d4b62d5b6 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java @@ -22,11 +22,8 @@ import com.google.common.base.Optional; import lombok.extern.slf4j.Slf4j; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.adapter.po.PoWriter2; import org.zanata.async.Async; import org.zanata.async.AsyncTaskHandle; @@ -64,33 +61,33 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("translationArchiveServiceImpl") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("translationArchiveServiceImpl") +@javax.enterprise.context.Dependent + @Slf4j @ContainsAsyncMethods public class TranslationArchiveServiceImpl implements TranslationArchiveService { - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private LocaleDAO localeDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private FileSystemService fileSystemServiceImpl; - @In + @Inject private ConfigurationService configurationServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java index 7ce6b0d3ee..94bdb9d611 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java @@ -26,9 +26,8 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.xml.sax.InputSource; import org.zanata.adapter.DTDAdapter; import org.zanata.adapter.FileFormatAdapter; @@ -88,8 +87,8 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("translationFileServiceImpl") -@Scope(STATELESS) +@Named("translationFileServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class TranslationFileServiceImpl implements TranslationFileService { private static Map> DOCTYPEMAP = @@ -124,10 +123,10 @@ private static Set buildSupportedExtensionSet() { return supported; } - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java index 852671e41e..c2f7a546ef 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java @@ -40,10 +40,8 @@ import org.apache.lucene.util.Version; import org.hibernate.search.jpa.FullTextEntityManager; import org.hibernate.search.jpa.FullTextQuery; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.ContentState; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; @@ -81,12 +79,12 @@ * @author Alex Eng aeng@redhat.com */ @Alternative -@Name("translationMemoryServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("translationMemoryServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class TranslationMemoryServiceImpl implements TranslationMemoryService { - @In + @Inject private FullTextEntityManager entityManager; private static final Version LUCENE_VERSION = Version.LUCENE_29; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java index ab85450740..8de17420ec 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationMergeServiceFactory.java @@ -1,10 +1,7 @@ package org.zanata.service.impl; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.MergeType; import org.zanata.dao.TextFlowTargetHistoryDAO; import org.zanata.model.HLocale; @@ -21,12 +18,12 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("translationMergeServiceFactory") -@AutoCreate -@Scope(ScopeType.STATELESS) +@Named("translationMergeServiceFactory") + +@javax.enterprise.context.Dependent @Slf4j public class TranslationMergeServiceFactory { - @In + @Inject private TextFlowTargetHistoryDAO textFlowTargetHistoryDAO; private TranslationMergeAuto translationMergeAuto; 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 index 3400c781e5..2fce91aa56 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java @@ -38,10 +38,8 @@ import org.apache.commons.lang.StringUtils; import org.hibernate.HibernateException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.TransactionPropagationType; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.core.Events; @@ -82,7 +80,7 @@ import org.zanata.service.TranslationMergeService; import org.zanata.service.TranslationService; import org.zanata.service.ValidationService; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.util.ShortString; import org.zanata.webtrans.shared.model.TransUnitId; import org.zanata.webtrans.shared.model.TransUnitUpdateInfo; @@ -95,57 +93,57 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -@Name("translationServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("translationServiceImpl") +@javax.enterprise.context.Dependent @Transactional @ContainsAsyncMethods @Slf4j public class TranslationServiceImpl implements TranslationService { - @In + @Inject private EntityManager entityManager; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private ResourceUtils resourceUtils; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private LockManagerService lockManagerServiceImpl; - @In + @Inject private ValidationService validationServiceImpl; - @In(value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION, + @Inject(value = JpaIdentityStore.AUTHENTICATED_USER, scope = ScopeType.SESSION, required = false) private HAccount authenticatedAccount; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationMergeServiceFactory translationMergeServiceFactory; - @In + @Inject private Messages msgs; - @In("event") + @Inject private Event documentUploadedEvent; - @In("event") + @Inject private Event textFlowTargetStateEvent; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java index 54dbf8e311..71c2cf0971 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java @@ -32,13 +32,10 @@ import lombok.Getter; import org.infinispan.manager.CacheContainer; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.cache.CacheWrapper; import org.zanata.cache.InfinispanCacheWrapper; import org.zanata.common.LocaleId; @@ -68,10 +65,10 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("translationStateCacheImpl") +@Named("translationStateCacheImpl") // TODO split into APPLICATION and STATELESS beans -@Scope(ScopeType.APPLICATION) -@AutoCreate +@javax.enterprise.context.ApplicationScoped + public class TranslationStateCacheImpl implements TranslationStateCache { private static final String BASE = TranslationStateCacheImpl.class.getName(); @@ -93,19 +90,19 @@ public class TranslationStateCacheImpl implements TranslationStateCache { private CacheWrapper> targetValidationCache; private CacheLoader> targetValidationLoader; - @In + @Inject private CacheContainer cacheContainer; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private LocaleDAO localeDAO; // constructor for Seam @@ -125,7 +122,7 @@ public TranslationStateCacheImpl( this.targetValidationLoader = targetValidationLoader; } - @Create + @PostConstruct public void create() { documentStatisticCache = InfinispanCacheWrapper.create(DOC_STATISTIC_CACHE_NAME, diff --git a/zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java b/zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java index b6276ff069..71755645bf 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java @@ -1,10 +1,8 @@ package org.zanata.service.impl; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.core.Events; import org.zanata.dao.TextFlowDAO; import org.zanata.events.DocumentStatisticUpdatedEvent; @@ -26,15 +24,15 @@ * * @author Alex Eng aeng@redhat.com */ -@Name("translationUpdatedManager") -@Scope(ScopeType.STATELESS) +@Named("translationUpdatedManager") +@javax.enterprise.context.Dependent @Slf4j public class TranslationUpdatedManager { - @In + @Inject private TranslationStateCache translationStateCacheImpl; - @In + @Inject private TextFlowDAO textFlowDAO; /** diff --git a/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java index 1001fbb00d..82c2587f93 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java @@ -29,10 +29,8 @@ import org.hibernate.Query; import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.AccountDAO; import org.zanata.dao.AccountResetPasswordKeyDAO; import org.zanata.dao.RoleAssignmentRuleDAO; @@ -47,20 +45,20 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("userAccountServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("userAccountServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class UserAccountServiceImpl implements UserAccountService { - @In + @Inject private Session session; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private AccountResetPasswordKeyDAO accountResetPasswordKeyDAO; - @In + @Inject private RoleAssignmentRuleDAO roleAssignmentRuleDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java index 4b0250a3d9..07e5c7de1a 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java @@ -12,10 +12,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.DocumentDAO; import org.zanata.dao.ProjectDAO; @@ -42,23 +40,23 @@ * @author Alex Eng aeng@redhat.com * */ -@Name("validationServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("validationServiceImpl") +@javax.enterprise.context.Dependent @Slf4j public class ValidationServiceImpl implements ValidationService { - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private TranslationStateCache translationStateCacheImpl; private ValidationFactory validationFactory; diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java index c769c03fdb..19f69c2575 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java @@ -25,10 +25,8 @@ import java.util.Map; import java.util.Set; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.EntityStatus; import org.zanata.common.LocaleId; import org.zanata.dao.ProjectIterationDAO; @@ -50,20 +48,20 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("versionGroupServiceImpl") -@Scope(ScopeType.STATELESS) +@Named("versionGroupServiceImpl") +@javax.enterprise.context.Dependent public class VersionGroupServiceImpl implements VersionGroupService { - @In + @Inject private VersionGroupDAO versionGroupDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private VersionStateCache versionStateCacheImpl; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java index 834c27111c..714fb6507d 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionManager.java @@ -2,12 +2,10 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; -@Name("versionManager") -@Scope(ScopeType.STATELESS) +@Named("versionManager") +@javax.enterprise.context.Dependent @Slf4j public class VersionManager { diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java index 390b51d71d..3b72dab5f0 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java @@ -24,13 +24,11 @@ import com.google.common.annotations.VisibleForTesting; import org.infinispan.manager.CacheContainer; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Create; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.zanata.cache.CacheWrapper; import org.zanata.cache.InfinispanCacheWrapper; import org.zanata.common.LocaleId; @@ -53,8 +51,8 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("versionStateCacheImpl") -@Scope(ScopeType.APPLICATION) +@Named("versionStateCacheImpl") +@javax.enterprise.context.ApplicationScoped public class VersionStateCacheImpl implements VersionStateCache { private static final String BASE = VersionStateCacheImpl.class.getName(); @@ -64,10 +62,10 @@ public class VersionStateCacheImpl implements VersionStateCache { private CacheWrapper versionStatisticCache; private CacheLoader versionStatisticLoader; - @In + @Inject private CacheContainer cacheContainer; - @In + @Inject private ServiceLocator serviceLocator; // constructor for Seam @@ -81,7 +79,7 @@ public VersionStateCacheImpl( this.versionStatisticLoader = versionStatisticLoader; } - @Create + @PostConstruct public void create() { versionStatisticCache = InfinispanCacheWrapper.create(VERSION_STATISTIC_CACHE_NAME, diff --git a/zanata-war/src/main/java/org/zanata/tmx/TMXParser.java b/zanata-war/src/main/java/org/zanata/tmx/TMXParser.java index 4c40a854dd..18e91e3015 100644 --- a/zanata-war/src/main/java/org/zanata/tmx/TMXParser.java +++ b/zanata-war/src/main/java/org/zanata/tmx/TMXParser.java @@ -41,9 +41,8 @@ import org.hibernate.CacheMode; import org.hibernate.FlushMode; import org.hibernate.Session; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Transactional; import org.jboss.seam.transaction.Transaction; import org.zanata.common.util.ElementBuilder; @@ -57,16 +56,16 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("tmxParser") -@AutoCreate +@Named("tmxParser") + @Slf4j public class TMXParser { // Batch size to commit in a new transaction for long files private static final int BATCH_SIZE = 100; - @In + @Inject private Session session; - @In + @Inject private TransMemoryAdapter transMemoryAdapter; @Transactional diff --git a/zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java b/zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java index ffae137e53..13d7fdead7 100644 --- a/zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java +++ b/zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java @@ -27,9 +27,8 @@ import nu.xom.Element; import nu.xom.Elements; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.TransMemoryDAO; import org.zanata.model.tm.TransMemoryUnitVariant; import org.zanata.model.tm.TransMemoryUnit; @@ -45,14 +44,14 @@ * href="mailto:sflaniga@redhat.com">sflaniga@redhat.com * */ -@Name("transMemoryAdapter") -@AutoCreate +@Named("transMemoryAdapter") + @NoArgsConstructor public class TransMemoryAdapter { - @In + @Inject private EntityManager entityManager; - @In + @Inject private TransMemoryDAO transMemoryDAO; /** diff --git a/zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java b/zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java index 8ebf15a1d5..9e0584b80d 100644 --- a/zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java +++ b/zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java @@ -23,11 +23,8 @@ package org.zanata.ui; import org.apache.commons.lang.StringEscapeUtils; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.ActivityType; import org.zanata.common.EntityStatus; import org.zanata.dao.DocumentDAO; @@ -58,22 +55,22 @@ * * @author Alex Eng aeng@redhat.com */ -@Name("activityEntry") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("activityEntry") +@javax.enterprise.context.Dependent + @NoArgsConstructor @AllArgsConstructor(access = AccessLevel.PROTECTED) public class ActivityEntry { - @In + @Inject private ActivityService activityServiceImpl; - @In + @Inject private UrlUtil urlUtil; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private Messages msgs; public String getActivityTypeIconClass(Activity activity) { diff --git a/zanata-war/src/main/java/org/zanata/ui/StatisticBar.java b/zanata-war/src/main/java/org/zanata/ui/StatisticBar.java index c3356f36dd..71e234818f 100644 --- a/zanata-war/src/main/java/org/zanata/ui/StatisticBar.java +++ b/zanata-war/src/main/java/org/zanata/ui/StatisticBar.java @@ -20,10 +20,7 @@ */ package org.zanata.ui; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.zanata.util.StatisticsUtil; /** @@ -31,9 +28,9 @@ * * @author Alex Eng aeng@redhat.com */ -@Name("statisticBar") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("statisticBar") +@javax.enterprise.context.Dependent + public class StatisticBar { public String formatPercentage(double percentage) { 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 index faae0c26c7..f35bf7d649 100644 --- a/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java +++ b/zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java @@ -34,11 +34,9 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.core.Interpolator; import org.zanata.i18n.Messages; @@ -51,11 +49,11 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Scope(ScopeType.CONVERSATION) -@Name("jsfMessages") +@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") -@AutoCreate + @BypassInterceptors public class FacesMessages { diff --git a/zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java b/zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java index cf7010af33..2ca3b57b57 100644 --- a/zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java +++ b/zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java @@ -22,10 +22,7 @@ import com.google.common.base.Throwables; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import javax.script.Invocable; import javax.script.ScriptEngine; @@ -40,9 +37,9 @@ /** * @author Sean Flanigan sflaniga@redhat.com */ -@AutoCreate -@Name("commonMarkRenderer") -@Scope(ScopeType.APPLICATION) + +@Named("commonMarkRenderer") +@javax.enterprise.context.ApplicationScoped @Slf4j public class CommonMarkRenderer { diff --git a/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java b/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java index 0a4dfb5141..a299d26f8f 100644 --- a/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java +++ b/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java @@ -9,12 +9,11 @@ import com.google.common.annotations.VisibleForTesting; import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Install; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import org.apache.deltaspike.core.api.exclude.Exclude; +import org.apache.deltaspike.core.api.projectstage.ProjectStage; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.Transactional; import org.zanata.ApplicationConfiguration; import org.zanata.common.LocaleId; @@ -31,24 +30,24 @@ * * @author Sean Flanigan */ -@Name("essentialDataCreator") -@Scope(ScopeType.STATELESS) +@Named("essentialDataCreator") +@javax.enterprise.context.Dependent @Slf4j -@Install(false) +@Exclude(ifProjectStage = ProjectStage.UnitTest.class) /* TODO [CDI] Set ProjectStage for unit tests */ public class EssentialDataCreator { - @In + @Inject private ApplicationConfiguration applicationConfiguration; private boolean prepared; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private AccountRoleDAO accountRoleDAO; - @In + @Inject private LocaleDAO localeDAO; public EssentialDataCreator() { diff --git a/zanata-war/src/main/java/org/zanata/util/Event.java b/zanata-war/src/main/java/org/zanata/util/Event.java index bd6d5beab5..9a66ccb093 100644 --- a/zanata-war/src/main/java/org/zanata/util/Event.java +++ b/zanata-war/src/main/java/org/zanata/util/Event.java @@ -20,10 +20,7 @@ */ package org.zanata.util; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.core.Events; import java.lang.reflect.Field; @@ -35,9 +32,9 @@ * @author Sean Flanigan sflaniga@redhat.com * @see javax.enterprise.event.Event */ -@AutoCreate -@Name("event") -@Scope(ScopeType.STATELESS) + +@Named("event") +@javax.enterprise.context.Dependent public class Event

{ public void fire(P payload) { diff --git a/zanata-war/src/main/java/org/zanata/util/UrlUtil.java b/zanata-war/src/main/java/org/zanata/util/UrlUtil.java index df3782252d..9756b3bf0d 100644 --- a/zanata-war/src/main/java/org/zanata/util/UrlUtil.java +++ b/zanata-war/src/main/java/org/zanata/util/UrlUtil.java @@ -32,10 +32,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.contexts.ServletLifecycle; import org.zanata.common.LocaleId; @@ -45,9 +42,9 @@ * * @author David Mason, damason@redhat.com */ -@AutoCreate -@Name("urlUtil") -@Scope(ScopeType.SESSION) + +@Named("urlUtil") +@javax.enterprise.context.SessionScoped @Slf4j public class UrlUtil implements Serializable { private static final long serialVersionUID = 1L; diff --git a/zanata-war/src/main/java/org/zanata/validation/ValidatorFactory.java b/zanata-war/src/main/java/org/zanata/validation/ValidatorFactory.java index b961e81ed8..c71a308b15 100644 --- a/zanata-war/src/main/java/org/zanata/validation/ValidatorFactory.java +++ b/zanata-war/src/main/java/org/zanata/validation/ValidatorFactory.java @@ -23,10 +23,8 @@ import javax.validation.Validation; import javax.validation.Validator; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.enterprise.inject.Produces; +import javax.inject.Named; /** * Singleton producer for Bean Validators. @@ -34,12 +32,12 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("validatorFactory") -@Scope(ScopeType.APPLICATION) +@Named("validatorFactory") +@javax.enterprise.context.ApplicationScoped public class ValidatorFactory { private javax.validation.ValidatorFactory beanValidatorFactory = Validation.buildDefaultValidatorFactory(); - @Factory(scope = ScopeType.EVENT, autoCreate = true) + @Produces(/* TODO [CDI] check this: migrated from @Factory */scope = ScopeType.EVENT, autoCreate = true) public Validator getValidator() { return beanValidatorFactory.getValidator(); } 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 index a9392c1094..b4f1862f45 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java @@ -16,9 +16,7 @@ import net.customware.gwt.dispatch.shared.Result; import net.customware.gwt.dispatch.shared.UnsupportedActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Named; import org.jboss.seam.annotations.Startup; import org.jboss.seam.deployment.HotDeploymentStrategy; import org.jboss.seam.deployment.StandardDeploymentStrategy; @@ -33,9 +31,9 @@ import com.google.common.collect.Maps; -@Name("seamDispatch") -@Scope(ScopeType.APPLICATION) -@Startup +@Named("seamDispatch") +@javax.enterprise.context.ApplicationScoped +/* TODO [CDI] Remove @PostConstruct from startup method and make it accept (@Observes @Initialized ServletContext context) */ @Slf4j public class SeamDispatch implements Dispatch { 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 index f1abd28ab4..a88a5fdb95 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java @@ -6,12 +6,9 @@ import org.hibernate.event.spi.PostInsertEventListener; import org.hibernate.event.spi.PostUpdateEvent; import org.hibernate.event.spi.PostUpdateEventListener; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.AutoCreate; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.util.Work; import org.jboss.seam.web.ServletContexts; import org.zanata.common.ContentState; @@ -23,7 +20,7 @@ import org.zanata.model.HProjectIteration; import org.zanata.model.HTextFlow; import org.zanata.model.HTextFlowTarget; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.util.ServiceLocator; import org.zanata.webtrans.server.rpc.TransUnitTransformer; import org.zanata.webtrans.shared.auth.EditorClientId; @@ -54,9 +51,9 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("translationUpdateListener") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("translationUpdateListener") +@javax.enterprise.context.ApplicationScoped + @Slf4j public class TranslationUpdateListener implements PostUpdateEventListener, PostInsertEventListener { @@ -68,13 +65,13 @@ public class TranslationUpdateListener implements PostUpdateEventListener, .expireAfterAccess(1, TimeUnit.SECONDS).maximumSize(1000) .build(); - @In(create = true) + @Inject private TranslationWorkspaceManager translationWorkspaceManager; - @In + @Inject private ServiceLocator serviceLocator; - @In("event") + @Inject private Event textFlowTargetUpdatedEvent; diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java b/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java index f8e5849ec5..3c1e86e180 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java @@ -10,11 +10,9 @@ import lombok.extern.slf4j.Slf4j; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.Name; +import javax.annotation.PreDestroy; +import javax.inject.Named; import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; import org.jboss.seam.util.Work; import org.jboss.seam.web.ServletContexts; import org.zanata.async.Async; @@ -63,8 +61,8 @@ import de.novanic.eventservice.service.registry.user.UserManager; import de.novanic.eventservice.service.registry.user.UserManagerFactory; -@Scope(ScopeType.APPLICATION) -@Name("translationWorkspaceManager") +@javax.enterprise.context.ApplicationScoped +@Named("translationWorkspaceManager") @Slf4j @ContainsAsyncMethods public class TranslationWorkspaceManagerImpl implements @@ -310,7 +308,7 @@ private boolean projectIterationIsActive(EntityStatus projectStatus, .equals(EntityStatus.ACTIVE)); } - @Destroy + @PreDestroy public void stop() { log.info("stopping..."); log.info("closing down {} workspaces: ", workspaceMap.size()); diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java index 1ab4aa6fa6..89f6741ffd 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java @@ -25,10 +25,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.security.management.JpaIdentityStore; import org.jboss.seam.web.ServletContexts; @@ -61,34 +59,34 @@ import org.zanata.webtrans.shared.rpc.LoadOptionsAction; import org.zanata.webtrans.shared.rpc.LoadOptionsResult; -@Name("webtrans.gwt.ActivateWorkspaceHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.ActivateWorkspaceHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(ActivateWorkspaceAction.class) @Slf4j public class ActivateWorkspaceHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; - @In + @Inject private GravatarService gravatarServiceImpl; - @In + @Inject private ProjectDAO projectDAO; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In(value = "webtrans.gwt.LoadOptionsHandler", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.LoadOptionsHandler", create = true) */ private LoadOptionsHandler loadOptionsHandler; - @In(value = "webtrans.gwt.GetValidationRulesHandler", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.GetValidationRulesHandler", create = true) */ private GetValidationRulesHandler getValidationRulesHandler; private static long nextEditorClientIdNum = 0; diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java index 7f033f6368..eb69976261 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java @@ -22,10 +22,8 @@ package org.zanata.webtrans.server.rpc; import org.apache.commons.lang.StringUtils; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.TextFlowTargetDAO; import org.zanata.dao.TextFlowTargetReviewCommentsDAO; @@ -55,31 +53,31 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("webtrans.gwt.AddReviewCommentHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.AddReviewCommentHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(AddReviewCommentAction.class) @Slf4j public class AddReviewCommentHandler extends AbstractActionHandler { - @In + @Inject private SecurityService securityServiceImpl; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; - @In + @Inject private TextFlowTargetReviewCommentsDAO textFlowTargetReviewCommentsDAO; - @In(value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; - @In + @Inject private ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java index ac20d831e0..5baebc3b4c 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java @@ -23,10 +23,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.Identity; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; @@ -45,22 +43,22 @@ * @author Alex Eng aeng@redhat.com * */ -@Name("webtrans.gwt.DownloadAllFilesHandler") -@Scope(ScopeType.CONVERSATION) +@Named("webtrans.gwt.DownloadAllFilesHandler") +@org.apache.deltaspike.core.api.scope.ViewAccessScoped /* TODO [CDI] check this: migrated from ScopeType.CONVERSATION */ @ActionHandlerFor(DownloadAllFilesAction.class) public class DownloadAllFilesHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private ProjectIterationDAO projectIterationDAO; - @In + @Inject private TranslationArchiveService translationArchiveServiceImpl; - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java index 2149da1abc..118f3b609c 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java @@ -3,10 +3,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.server.TranslationWorkspace; @@ -14,15 +12,15 @@ import org.zanata.webtrans.shared.rpc.EventServiceConnectedAction; import org.zanata.webtrans.shared.rpc.NoOpResult; -@Name("webtrans.gwt.EventServiceConnectedHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.EventServiceConnectedHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(EventServiceConnectedAction.class) public class EventServiceConnectedHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java index 13553d7372..ef1c2ab435 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ExitWorkspaceHandler.java @@ -3,10 +3,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.server.TranslationWorkspace; @@ -14,15 +12,15 @@ import org.zanata.webtrans.shared.rpc.ExitWorkspaceAction; import org.zanata.webtrans.shared.rpc.NoOpResult; -@Name("webtrans.gwt.ExitWorkspaceHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.ExitWorkspaceHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(ExitWorkspaceAction.class) public class ExitWorkspaceHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java index e8bd807b94..a679af7529 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java @@ -8,10 +8,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.ProjectType; import org.zanata.dao.DocumentDAO; import org.zanata.file.FilePersistService; @@ -30,21 +28,21 @@ import org.zanata.webtrans.shared.rpc.GetDocumentList; import org.zanata.webtrans.shared.rpc.GetDocumentListResult; -@Name("webtrans.gwt.GetDocsListHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetDocsListHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetDocumentList.class) public class GetDocumentListHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private DocumentDAO documentDAO; - @In + @Inject private TranslationFileService translationFileServiceImpl; - @In("filePersistService") + @Inject private FilePersistService filePersistService; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java index 50400e37d1..b1020aa743 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java @@ -3,10 +3,8 @@ import java.util.HashMap; import java.util.Map; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.rest.dto.stats.ContainerTranslationStatistics; import org.zanata.service.TranslationStateCache; import org.zanata.rest.service.StatisticsServiceImpl; @@ -20,15 +18,15 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -@Name("webtrans.gwt.GetDocumentStatsHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetDocumentStatsHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetDocumentStats.class) public class GetDocumentStatsHandler extends AbstractActionHandler { - @In + @Inject private StatisticsServiceImpl statisticsServiceImpl; - @In + @Inject private TranslationStateCache translationStateCacheImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java index cebf6d2647..b0a4bd0e6d 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java @@ -25,10 +25,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.async.AsyncTaskHandle; import org.zanata.async.AsyncTaskHandleManager; import org.zanata.webtrans.server.ActionHandlerFor; @@ -40,13 +38,13 @@ * @author Alex Eng aeng@redhat.com * */ -@Name("webtrans.gwt.GetDownloadAllFilesProgressHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetDownloadAllFilesProgressHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetDownloadAllFilesProgress.class) public class GetDownloadAllFilesProgressHandler extends AbstractActionHandler { - @In + @Inject private AsyncTaskHandleManager asyncTaskHandleManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java index 4abc42beb0..386f424622 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java @@ -3,10 +3,8 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.GlossaryDAO; import org.zanata.exception.ZanataServiceException; @@ -26,20 +24,20 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -@Name("webtrans.gwt.GetGlossaryDetailsHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetGlossaryDetailsHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetGlossaryDetailsAction.class) @Slf4j public class GetGlossaryDetailsHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private GlossaryDAO glossaryDAO; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java index d10dfc86ca..b6b15e10bc 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java @@ -28,10 +28,8 @@ import java.util.Map; import org.apache.lucene.queryParser.ParseException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.GlossaryDAO; import org.zanata.model.HGlossaryTerm; @@ -49,8 +47,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -@Name("webtrans.gwt.GetGlossaryHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetGlossaryHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetGlossary.class) @Slf4j public class GetGlossaryHandler extends @@ -61,10 +59,10 @@ public class GetGlossaryHandler extends private static final Comparator COMPARATOR = new GlossaryResultItemComparator(); - @In + @Inject private GlossaryDAO glossaryDAO; - @In + @Inject private ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java index 391801676b..9821bcf0b1 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java @@ -2,10 +2,8 @@ import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.model.HLocale; import org.zanata.security.ZanataIdentity; import org.zanata.service.LocaleService; @@ -20,15 +18,15 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -@Name("webtrans.gwt.GetLocaleListHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetLocaleListHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetLocaleList.class) public class GetLocaleListHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java index 2c45d1ca93..557e8f530a 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java @@ -24,10 +24,8 @@ import java.util.HashMap; import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.exception.ZanataServiceException; import org.zanata.model.HLocale; import org.zanata.model.HTextFlow; @@ -53,23 +51,23 @@ * @see GetProjectTransUnitLists * @author David Mason, damason@redhat.com */ -@Name("webtrans.gwt.GetProjectTransUnitListsHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetProjectTransUnitListsHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetProjectTransUnitLists.class) @Slf4j public class GetProjectTransUnitListsHandler extends AbstractActionHandler { - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private TextFlowSearchService textFlowSearchServiceImpl; - @In + @Inject private TransUnitTransformer transUnitTransformer; - @In + @Inject private ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandler.java index fc400be2b2..67f480c5f7 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTargetForLocaleHandler.java @@ -4,10 +4,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.TextFlowTargetDAO; import org.zanata.model.HLocale; import org.zanata.model.HTextFlowTarget; @@ -18,15 +16,15 @@ import org.zanata.webtrans.shared.rpc.GetTargetForLocale; import org.zanata.webtrans.shared.rpc.GetTargetForLocaleResult; -@Name("webtrans.gwt.GetTargetForLocaleHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTargetForLocaleHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetTargetForLocale.class) @Slf4j public class GetTargetForLocaleHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TextFlowTargetDAO textFlowTargetDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java index a424e6d32a..54a8f4cfd5 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java @@ -7,10 +7,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.dao.TextFlowDAO; import org.zanata.exception.ZanataServiceException; @@ -24,23 +22,23 @@ import org.zanata.webtrans.shared.rpc.GetTransMemoryDetailsAction; import org.zanata.webtrans.shared.rpc.TransMemoryDetailsList; -@Name("webtrans.gwt.GetTransMemoryDetailsHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTransMemoryDetailsHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetTransMemoryDetailsAction.class) @Slf4j public class GetTransMemoryDetailsHandler extends AbstractActionHandler { - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationMemoryService translationMemoryServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java index 179898339f..94fde98b09 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java @@ -26,10 +26,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.service.LocaleService; import org.zanata.service.TranslationMemoryService; @@ -39,17 +37,17 @@ import org.zanata.webtrans.shared.rpc.GetTranslationMemory; import org.zanata.webtrans.shared.rpc.GetTranslationMemoryResult; -@Name("webtrans.gwt.GetTransMemoryHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTransMemoryHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetTranslationMemory.class) @Slf4j public class GetTransMemoryHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationMemoryService translationMemoryServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java index be8e32d79e..0ba614acba 100755 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java @@ -26,10 +26,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; @@ -55,28 +53,28 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -@Name("webtrans.gwt.GetTransUnitListHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTransUnitListHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetTransUnitList.class) @Slf4j public class GetTransUnitListHandler extends AbstractActionHandler { - @In + @Inject private TransUnitTransformer transUnitTransformer; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private ZanataIdentity identity; - @In + @Inject private ValidationService validationServiceImpl; - @In(value = "webtrans.gwt.GetTransUnitsNavigationHandler", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.GetTransUnitsNavigationHandler", create = true) */ private GetTransUnitsNavigationService getTransUnitsNavigationService; private DateTimeFormatter dateFormatter = diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java index 7b50bbc3db..a85812616e 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java @@ -26,10 +26,8 @@ import java.util.Map; import org.hibernate.transform.ResultTransformer; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; import org.zanata.common.ContentState; @@ -45,12 +43,12 @@ import lombok.extern.slf4j.Slf4j; -@Name("webtrans.gwt.GetTransUnitsNavigationHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTransUnitsNavigationHandler") +@javax.enterprise.context.Dependent @Slf4j public class GetTransUnitsNavigationService { - @In + @Inject private TextFlowDAO textFlowDAO; protected GetTransUnitsNavigationResult getNavigationIndexes( diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java index cca7f2da74..4d205f7fb4 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java @@ -7,10 +7,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.TextFlowDAO; import org.zanata.dao.TextFlowTargetReviewCommentsDAO; import org.zanata.exception.ZanataServiceException; @@ -39,26 +37,26 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("webtrans.gwt.GetTranslationHistoryHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTranslationHistoryHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetTranslationHistoryAction.class) @Slf4j public class GetTranslationHistoryHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private LocaleService localeServiceImpl; - @In + @Inject private TextFlowDAO textFlowDAO; - @In + @Inject private TextFlowTargetReviewCommentsDAO textFlowTargetReviewCommentsDAO; - @In + @Inject private ResourceUtils resourceUtils; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java index e5b6f0442c..777f149d87 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java @@ -6,10 +6,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.AccountDAO; import org.zanata.model.HPerson; import org.zanata.security.ZanataIdentity; @@ -24,21 +22,21 @@ import org.zanata.webtrans.shared.rpc.GetTranslatorList; import org.zanata.webtrans.shared.rpc.GetTranslatorListResult; -@Name("webtrans.gwt.GetTranslatorListHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.GetTranslatorListHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(GetTranslatorList.class) public class GetTranslatorListHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private GravatarService gravatarServiceImpl; @Override 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 index 2bb661c858..0126fcdd94 100644 --- 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 @@ -38,13 +38,13 @@ * @author Alex Eng aeng@redhat.com * */ -@Name("webtrans.gwt.GetValidationRulesHandler") +@Named("webtrans.gwt.GetValidationRulesHandler") @ActionHandlerFor(GetValidationRulesAction.class) -@Scope(ScopeType.STATELESS) +@javax.enterprise.context.Dependent public class GetValidationRulesHandler extends AbstractActionHandler { - @In + @Inject private ValidationService validationServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java index 159a7ff546..d6f3ce0684 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java @@ -27,10 +27,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.AccountDAO; import org.zanata.model.HAccount; @@ -48,15 +46,15 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("webtrans.gwt.LoadOptionsHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.LoadOptionsHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(LoadOptionsAction.class) public class LoadOptionsHandler extends AbstractActionHandler { - @In(value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private AccountDAO accountDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java index e427acc720..e17f606f1e 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PreviewReplaceTextHandler.java @@ -23,10 +23,8 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.model.TransUnitUpdatePreview; @@ -44,12 +42,12 @@ * @author David Mason, damason@redhat.com * */ -@Name("webtrans.gwt.PreviewReplaceTextHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.PreviewReplaceTextHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(PreviewReplaceText.class) public class PreviewReplaceTextHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java index d6541e2e15..222c7fb826 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/PublishWorkspaceChatHandler.java @@ -27,10 +27,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.server.TranslationWorkspace; @@ -39,15 +37,15 @@ import org.zanata.webtrans.shared.rpc.PublishWorkspaceChat; import org.zanata.webtrans.shared.rpc.PublishWorkspaceChatAction; -@Name("webtrans.gwt.PublishWorkspaceChatHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.PublishWorkspaceChatHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(PublishWorkspaceChatAction.class) public class PublishWorkspaceChatHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandler.java index 908e510bc2..b42d3b4556 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RemoteLoggingHandler.java @@ -4,10 +4,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.rpc.NoOpResult; @@ -17,13 +15,13 @@ * @author Patrick Huang pahuang@redhat.com */ -@Name("webtrans.gwt.RemoteLoggingHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.RemoteLoggingHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(RemoteLoggingAction.class) @Slf4j public class RemoteLoggingHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java index 4ef816c7db..cd3c5cc2cb 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java @@ -24,10 +24,8 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.service.SecurityService; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.model.TransUnitUpdateRequest; @@ -39,16 +37,16 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -@Name("webtrans.gwt.ReplaceTextHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.ReplaceTextHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(ReplaceText.class) @Slf4j public class ReplaceTextHandler extends AbstractActionHandler { - @In(value = "webtrans.gwt.UpdateTransUnitHandler", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.UpdateTransUnitHandler", create = true) */ UpdateTransUnitHandler updateTransUnitHandler; - @In + @Inject SecurityService securityServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java index 85de6ac95b..dd667b3125 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java @@ -25,16 +25,14 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.core.Events; import org.zanata.events.TextFlowTargetUpdateContextEvent; import org.zanata.service.SecurityService; import org.zanata.service.TranslationService; import org.zanata.service.TranslationService.TranslationResult; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.model.TransUnitUpdateInfo; import org.zanata.webtrans.shared.rpc.RevertTransUnitUpdates; @@ -46,21 +44,21 @@ * * @see RevertTransUnitUpdates */ -@Name("webtrans.gwt.RevertTransUnitUpdatesHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.RevertTransUnitUpdatesHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(RevertTransUnitUpdates.class) public class RevertTransUnitUpdatesHandler extends AbstractActionHandler { - @In + @Inject private TranslationService translationServiceImpl; - @In + @Inject private SecurityService securityServiceImpl; - @In(value = "webtrans.gwt.TransUnitUpdateHelper", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.TransUnitUpdateHelper", create = true) */ private TransUnitUpdateHelper transUnitUpdateHelper; - @In("event") + @Inject private Event textFlowTargetUpdateContextEvent; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java index a13a2cf354..4bc475a475 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java @@ -6,22 +6,20 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.service.ValidationService; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.model.DocumentId; import org.zanata.webtrans.shared.rpc.RunDocValidationAction; import org.zanata.webtrans.shared.rpc.RunDocValidationResult; -@Name("webtrans.gwt.RunDocValidationHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.RunDocValidationHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(RunDocValidationAction.class) public class RunDocValidationHandler extends AbstractActionHandler { - @In + @Inject private ValidationService validationServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/SaveOptionsHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/SaveOptionsHandler.java index 21ef5e6d15..785710ccf6 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/SaveOptionsHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/SaveOptionsHandler.java @@ -25,10 +25,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.jboss.seam.security.management.JpaIdentityStore; import org.zanata.dao.AccountDAO; import org.zanata.dao.AccountOptionDAO; @@ -43,18 +41,18 @@ * @author Carlos Munoz camunoz@redhat.com */ -@Name("webtrans.gwt.SaveOptionsHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.SaveOptionsHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(SaveOptionsAction.class) public class SaveOptionsHandler extends AbstractActionHandler { - @In(value = JpaIdentityStore.AUTHENTICATED_USER) + @Inject /* TODO [CDI] check this: migrated from @In(value = JpaIdentityStore.AUTHENTICATED_USER) */ private HAccount authenticatedAccount; - @In + @Inject private AccountDAO accountDAO; - @In + @Inject private AccountOptionDAO accountOptionDAO; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java index 975692018f..b4134502f0 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java @@ -27,27 +27,25 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.service.TransMemoryMergeService; import org.zanata.service.TranslationService; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.rpc.TransMemoryMerge; import org.zanata.webtrans.shared.rpc.UpdateTransUnitResult; -@Name("webtrans.gwt.TransMemoryMergeHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.TransMemoryMergeHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(TransMemoryMerge.class) @Slf4j public class TransMemoryMergeHandler extends AbstractActionHandler { - @In + @Inject private TransMemoryMergeService transMemoryMergeServiceImpl; - @In(value = "webtrans.gwt.TransUnitUpdateHelper", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.TransUnitUpdateHelper", create = true) */ private TransUnitUpdateHelper transUnitUpdateHelper; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java index 3b798ebf40..9984bc7c1c 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitEditHandler.java @@ -24,10 +24,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.security.ZanataIdentity; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.server.TranslationWorkspace; @@ -36,15 +34,15 @@ import org.zanata.webtrans.shared.rpc.TransUnitEdit; import org.zanata.webtrans.shared.rpc.TransUnitEditAction; -@Name("webtrans.gwt.TransUnitEditHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.TransUnitEditHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(TransUnitEditAction.class) public class TransUnitEditHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private TranslationWorkspaceManager translationWorkspaceManager; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java index 51cd0e7d0b..2c26c26757 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java @@ -21,11 +21,8 @@ package org.zanata.webtrans.server.rpc; import java.util.ArrayList; -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; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.model.HLocale; import org.zanata.model.HSimpleComment; import org.zanata.model.HTextFlow; @@ -35,15 +32,15 @@ import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; -@Name("transUnitTransformer") -@Scope(ScopeType.STATELESS) -@AutoCreate +@Named("transUnitTransformer") +@javax.enterprise.context.Dependent + @NoArgsConstructor @AllArgsConstructor public class TransUnitTransformer { private static final int NULL_TARGET_VERSION_NUM = 0; - @In + @Inject private ResourceUtils resourceUtils; public TransUnit transform(HTextFlow hTextFlow, HLocale hLocale) { 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 index f09d2716b6..42df162559 100644 --- 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 @@ -47,12 +47,12 @@ /** * @author Alex Eng aeng@redhat.com */ -@Name("webtrans.gwt.TransUnitUpdateHelper") -@Scope(ScopeType.APPLICATION) -@AutoCreate +@Named("webtrans.gwt.TransUnitUpdateHelper") +@javax.enterprise.context.ApplicationScoped + public class TransUnitUpdateHelper { - @In + @Inject private ServiceLocator serviceLocator; private static Cache cache = CacheBuilder diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java index d5ac0e07f1..d6877d8d93 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java @@ -5,10 +5,8 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.dao.GlossaryDAO; import org.zanata.model.HGlossaryEntry; import org.zanata.model.HGlossaryTerm; @@ -21,19 +19,19 @@ import org.zanata.webtrans.shared.rpc.UpdateGlossaryTermAction; import org.zanata.webtrans.shared.rpc.UpdateGlossaryTermResult; -@Name("webtrans.gwt.UpdateGlossaryTermHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.UpdateGlossaryTermHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(UpdateGlossaryTermAction.class) public class UpdateGlossaryTermHandler extends AbstractActionHandler { - @In + @Inject private ZanataIdentity identity; - @In + @Inject private GlossaryDAO glossaryDAO; - @In + @Inject private LocaleService localeServiceImpl; @Override diff --git a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java index 48bc726e42..1b43859b52 100644 --- a/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java +++ b/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java @@ -22,16 +22,14 @@ import java.util.List; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; +import javax.inject.Inject; +import javax.inject.Named; import org.zanata.common.LocaleId; import org.zanata.events.TextFlowTargetUpdateContextEvent; import org.zanata.service.SecurityService; import org.zanata.service.TranslationService; import org.zanata.service.TranslationService.TranslationResult; -import org.zanata.util.Event; +import javax.enterprise.event.Event; import org.zanata.webtrans.server.ActionHandlerFor; import org.zanata.webtrans.shared.auth.EditorClientId; import org.zanata.webtrans.shared.model.TransUnitUpdateRequest; @@ -44,21 +42,21 @@ import net.customware.gwt.dispatch.server.ExecutionContext; import net.customware.gwt.dispatch.shared.ActionException; -@Name("webtrans.gwt.UpdateTransUnitHandler") -@Scope(ScopeType.STATELESS) +@Named("webtrans.gwt.UpdateTransUnitHandler") +@javax.enterprise.context.Dependent @ActionHandlerFor(UpdateTransUnit.class) public class UpdateTransUnitHandler extends AbstractActionHandler { - @In(value = "webtrans.gwt.TransUnitUpdateHelper", create = true) + @Inject /* TODO [CDI] check this: migrated from @In(value = "webtrans.gwt.TransUnitUpdateHelper", create = true) */ private TransUnitUpdateHelper transUnitUpdateHelper; - @In + @Inject private TranslationService translationServiceImpl; - @In + @Inject private SecurityService securityServiceImpl; - @In("event") + @Inject private Event textFlowTargetUpdateContextEvent; diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml index 67c4fa6e0e..4230fde5dd 100644 --- a/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml +++ b/zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml @@ -10,7 +10,7 @@

+ rendered="#{identity.loggedIn and identity.hasPermission(languageAction.locale, 'manage-language-team')}">

#{msgs['jsf.language.members.empty']}

+ rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}">

  • + class="#{identity.hasPermission(languageAction.locale, 'manage-language-team') ? 'list__item--actionable' : 'l--pad-all-quarter'}"> + rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}">
    #{msgs['jsf.Translator']} + rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}"> + rendered="#{not identity.hasPermission(languageAction.locale, 'manage-language-team')}"> @@ -118,12 +118,12 @@
  • #{msgs['jsf.Reviewer']} + rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}"> + rendered="#{not identity.hasPermission(languageAction.locale, 'manage-language-team')}"> @@ -136,12 +136,12 @@
  • #{msgs['jsf.Coordinator']} + rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}"> + rendered="#{not identity.hasPermission(languageAction.locale, 'manage-language-team')}"> @@ -168,7 +168,7 @@
    • + rendered="#{identity.hasPermission(languageAction.locale, 'manage-language-team')}"> diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml index abbb40a266..0c5d0baf79 100644 --- a/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml +++ b/zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml @@ -220,7 +220,7 @@ + rendered="#{identity.hasPermission(projectHome.instance, 'mark-obsolete')}"> + rendered="#{identity.hasPermission(projectHome.instance, 'update')}">
    @@ -89,7 +89,7 @@ rendered="#{empty projectHomeAction.projectVersions}">

    #{msgs['jsf.NoVersions']}

    + rendered="#{identity.hasPermission(projectHome.instance, 'update')}">