From da620bd0cbbfc1146b94ee520291e29960128ba9 Mon Sep 17 00:00:00 2001 From: Sean Flanigan Date: Fri, 26 Jun 2015 13:51:07 +1000 Subject: [PATCH] Update sed script --- etc/scripts/seam2cdi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/scripts/seam2cdi.sh b/etc/scripts/seam2cdi.sh index 97650ae204..3a408c6c51 100755 --- a/etc/scripts/seam2cdi.sh +++ b/etc/scripts/seam2cdi.sh @@ -68,7 +68,7 @@ sed -i "$@" -f - <<-EOF s/@In$/@Inject/g # Name -> Named - s/org.jboss.seam.annotations.Name/javax.inject.Named/g + s/org.jboss.seam.annotations.Name;/javax.inject.Named;/g s/@Name(/@Named(/g # Seam scopes -> CDI/DeltaSpike scopes @@ -112,10 +112,10 @@ sed -i "$@" -f - <<-EOF # @RequestParameter -> @HttpParam s/import org.jboss.seam.annotations.web.RequestParameter;\?/import org.zanata.servlet.annotations.HttpParam;/g - s|@RequestParameter|@Inject @HttpParam(/* TODO [CDI] fill in name */)|g + s|@RequestParameter|@Inject @HttpParam|g # @Restrict -> @CheckLoggedIn/@CheckRole/@CheckPermission - s/import org.jboss.seam.annotations.security.Restrict;\?/import org.zanata.security.CheckLoggedIn;\nimport org.zanata.security.CheckPermission;\nimport org.zanata.security.CheckRole;/g + s/import org.jboss.seam.annotations.security.Restrict;\?/import org.zanata.security.annotations.CheckLoggedIn;\nimport org.zanata.security.annotations.CheckPermission;\nimport org.zanata.security.annotations.CheckRole;/g s/@Restrict("#{identity.loggedIn}")/@CheckLoggedIn/g s/@Restrict("#{s:hasRole('admin')}")/@CheckRole("admin")/g s/@Restrict("#{s:hasPermission('', '\(.*\)')}")/@CheckPermission("\1")/g