Update sed script

zanata · Jun 26, 2015 · da620bd · da620bd
1 parent 2995b03
commit da620bd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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