Update Scopes and packages which changed on jee6 -> jee8

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/UserSshKeyManagementBean.java

@@ -15,8 +15,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -35,7 +35,7 @@ import edu.kit.scc.webreg.ssh.SshPubKeyBlacklistedException;
 import edu.kit.scc.webreg.ssh.UnsupportedKeyTypeException;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class UserSshKeyManagementBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/UserSshKeyManagementOldBean.java

@@ -15,8 +15,8 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -37,7 +37,7 @@ import edu.kit.scc.webreg.ssh.OpenSshPublicKeyOld;
 import edu.kit.scc.webreg.ssh.UnsupportedKeyTypeException;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class UserSshKeyManagementOldBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/AttributeQueryBean.java

@@ -14,8 +14,8 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
 
 import org.opensaml.saml.saml2.core.Assertion;
@@ -32,7 +32,7 @@ import edu.kit.scc.webreg.service.saml.AttributeQueryHelper;
 import edu.kit.scc.webreg.service.saml.Saml2AssertionService;
 import edu.kit.scc.webreg.service.saml.SamlHelper;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class AttributeQueryBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/FindIdentityBean.java

@@ -16,8 +16,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
@@ -29,7 +29,7 @@ import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.service.UserService;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class FindIdentityBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ImageGalleryBean.java

@@ -15,8 +15,8 @@ import java.io.Serializable;
 import java.util.List;
 
 import javax.faces.application.FacesMessage;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
@@ -33,7 +33,7 @@ import edu.kit.scc.webreg.entity.ServiceEntity;
 import edu.kit.scc.webreg.service.ImageService;
 import edu.kit.scc.webreg.service.ServiceService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ImageGalleryBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ListAdminUserBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -23,7 +23,7 @@ import edu.kit.scc.webreg.entity.AdminUserEntity;
 import edu.kit.scc.webreg.model.GenericLazyDataModelImpl;
 import edu.kit.scc.webreg.service.AdminUserService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ListAdminUserBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ListUserBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -23,7 +23,7 @@ import edu.kit.scc.webreg.entity.UserEntity;
 import edu.kit.scc.webreg.model.GenericLazyDataModelImpl;
 import edu.kit.scc.webreg.service.UserService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ListUserBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ShowAdminIdentityBean.java

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean.admin;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -24,7 +24,7 @@ import edu.kit.scc.webreg.service.UserService;
 import edu.kit.scc.webreg.service.identity.IdentityService;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ShowAdminIdentityBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ShowAdminUserBean.java

@@ -19,8 +19,8 @@ import java.security.Security;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -34,7 +34,7 @@ import edu.kit.scc.webreg.service.AdminUserService;
 import edu.kit.scc.webreg.service.RoleService;
 import edu.kit.scc.webreg.service.reg.PasswordUtil;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ShowAdminUserBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ShowRegistryBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -26,7 +26,7 @@ import edu.kit.scc.webreg.service.reg.RegisterUserService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ShowRegistryBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/ShowUserBean.java

@@ -16,8 +16,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -51,7 +51,7 @@ import edu.kit.scc.webreg.service.UserService;
 import edu.kit.scc.webreg.service.oidc.client.OidcUserService;
 import edu.kit.scc.webreg.session.SessionManager;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ShowUserBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/StatisticsBean.java

@@ -15,8 +15,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -32,7 +32,7 @@ import edu.kit.scc.webreg.entity.SamlIdpMetadataEntity;
 import edu.kit.scc.webreg.entity.ServiceEntity;
 import edu.kit.scc.webreg.service.StatisticsService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class StatisticsBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/UserEventsBean.java

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean.admin;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -24,7 +24,7 @@ import edu.kit.scc.webreg.entity.UserEventEntity;
 import edu.kit.scc.webreg.service.JobClassService;
 import edu.kit.scc.webreg.service.UserEventService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class UserEventsBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/as/AddAttributeSourceBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin.as;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -21,7 +21,7 @@ import edu.kit.scc.webreg.entity.as.AttributeSourceEntity;
 import edu.kit.scc.webreg.service.AttributeSourceService;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class AddAttributeSourceBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/as/EditAttributeSourceBean.java

@@ -14,8 +14,8 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -23,7 +23,7 @@ import edu.kit.scc.webreg.entity.as.AttributeSourceEntity;
 import edu.kit.scc.webreg.service.AttributeSourceService;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class EditAttributeSourceBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/as/ListAttributeSourceBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin.as;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -23,7 +23,7 @@ import edu.kit.scc.webreg.entity.as.AttributeSourceEntity;
 import edu.kit.scc.webreg.model.GenericLazyDataModelImpl;
 import edu.kit.scc.webreg.service.AttributeSourceService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ListAttributeSourceBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/as/ShowAttributeSourceBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin.as;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -26,7 +26,7 @@ import edu.kit.scc.webreg.service.AttributeSourceService;
 import edu.kit.scc.webreg.service.UserService;
 import edu.kit.scc.webreg.service.reg.AttributeSourceQueryService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ShowAttributeSourceBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/audit/ListAuditBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin.audit;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -23,7 +23,7 @@ import edu.kit.scc.webreg.audit.AuditEntryService;
 import edu.kit.scc.webreg.entity.audit.AuditEntryEntity;
 import edu.kit.scc.webreg.model.GenericLazyDataModelImpl;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ListAuditBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/brule/AddRulePackageBean.java

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean.admin.brule;
 
 import java.io.Serializable;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -21,7 +21,7 @@ import edu.kit.scc.webreg.entity.BusinessRulePackageEntity;
 import edu.kit.scc.webreg.service.BusinessRulePackageService;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class AddRulePackageBean implements Serializable {
 

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/admin/brule/EditBusinessRuleBean.java

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean.admin.brule;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
 
@@ -24,7 +24,7 @@ import edu.kit.scc.webreg.service.BusinessRulePackageService;
 import edu.kit.scc.webreg.service.BusinessRuleService;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class EditBusinessRuleBean implements Serializable {