Update Scopes and packages which changed on jee6 -> jee8

bwreg-webapp/src/main/java/edu/kit/scc/webreg/bean/ApprovalListBean.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;
 
@@ -29,7 +29,7 @@ import edu.kit.scc.webreg.sec.AuthorizationBean;
 import edu.kit.scc.webreg.service.RegistryService;
 import edu.kit.scc.webreg.service.ServiceService;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ApprovalListBean implements Serializable {
 

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

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean;
 
 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;
 
@@ -30,7 +30,7 @@ import edu.kit.scc.webreg.service.RegistryService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ApproveUserBean implements Serializable {
 

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

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean;
 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;
 
@@ -33,7 +33,7 @@ import edu.kit.scc.webreg.service.identity.IdentityService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class CheckAccessBean implements Serializable {
 

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

@@ -14,8 +14,8 @@ import java.io.IOException;
 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.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -30,7 +30,7 @@ import edu.kit.scc.webreg.service.oidc.OidcRpConfigurationService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ConnectAccountBean implements Serializable {
 

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

@@ -17,8 +17,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.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -42,7 +42,7 @@ import edu.kit.scc.webreg.service.oidc.client.OidcUserCreateService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class ConnectAccountOidcBean implements Serializable {
 

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

@@ -14,8 +14,8 @@ import java.io.IOException;
 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.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
@@ -30,7 +30,7 @@ import edu.kit.scc.webreg.service.identity.IdentityService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class DeleteAllPersonalDataBean implements Serializable {
 

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

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean;
 
 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;
 
@@ -33,7 +33,7 @@ import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.BBCodeConverter;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class DeregisterServiceBean implements Serializable {
 

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

@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -46,7 +46,7 @@ import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.CookieHelper;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class DiscoveryLoginBean implements Serializable {
 

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

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean;
 import java.io.IOException;
 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.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
 import javax.inject.Inject;
@@ -25,7 +25,7 @@ import edu.kit.scc.webreg.entity.identity.IdentityEntity;
 import edu.kit.scc.webreg.service.identity.IdentityService;
 import edu.kit.scc.webreg.session.SessionManager;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class LocalLogoutBean implements Serializable {
 

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

@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -44,7 +44,7 @@ import edu.kit.scc.webreg.service.oidc.client.OidcUserCreateService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class RegisterOidcUserBean implements Serializable {
 

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

@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 
 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.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -57,7 +57,7 @@ import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 import edu.kit.scc.webreg.util.ViewIds;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class RegisterServiceBean implements Serializable {
 

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

@@ -18,8 +18,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -40,7 +40,7 @@ import edu.kit.scc.webreg.service.impl.AttributeMapHelper;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class RegisterUserBean implements Serializable {
 

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

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean;
 
 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;
 
@@ -38,7 +38,7 @@ import edu.kit.scc.webreg.service.reg.RegisterUserService;
 import edu.kit.scc.webreg.service.reg.RegisterUserWorkflow;
 import edu.kit.scc.webreg.session.SessionManager;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class RegistryDetailBean implements Serializable {
 

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

@@ -12,8 +12,8 @@ package edu.kit.scc.webreg.bean;
 
 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;
 
@@ -34,7 +34,7 @@ import edu.kit.scc.webreg.service.reg.SetPasswordCapable;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class SetServicePasswordBean implements Serializable {
 

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

@@ -13,10 +13,10 @@ package edu.kit.scc.webreg.bean;
 import java.io.Serializable;
 import java.util.List;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
 import javax.faces.event.ComponentSystemEvent;
+import javax.faces.view.ViewScoped;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import edu.kit.scc.webreg.entity.RegistryEntity;
 import edu.kit.scc.webreg.entity.RegistryStatus;
@@ -38,7 +38,7 @@ import edu.kit.scc.webreg.service.ssh.SshPubKeyService;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class SetServiceSshPubKeyBean implements Serializable {
 

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

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean;
 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;
 
@@ -26,7 +26,7 @@ import edu.kit.scc.webreg.service.ServiceService;
 import edu.kit.scc.webreg.service.ssh.SshPubKeyRegistryService;
 import edu.kit.scc.webreg.session.SessionManager;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class SshPubKeyApprovalListBean implements Serializable {
 

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

@@ -14,8 +14,8 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.time.Instant;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.ViewScoped;
+import javax.inject.Named;
+import javax.faces.view.ViewScoped;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ComponentSystemEvent;
@@ -36,7 +36,7 @@ import edu.kit.scc.webreg.service.twofa.linotp.LinotpTokenResultList;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class TwoFaLoginBean implements Serializable {
 

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

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean;
 import java.io.Serializable;
 import java.time.Instant;
 
-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;
 
@@ -33,7 +33,7 @@ import edu.kit.scc.webreg.service.twofa.linotp.LinotpTokenResultList;
 import edu.kit.scc.webreg.session.SessionManager;
 import edu.kit.scc.webreg.util.FacesMessageGenerator;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class TwoFaUserBean implements Serializable {
 

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

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean;
 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;
 
@@ -28,7 +28,7 @@ import edu.kit.scc.webreg.service.UserService;
 import edu.kit.scc.webreg.service.identity.IdentityService;
 import edu.kit.scc.webreg.session.SessionManager;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class UserAttributeSourcesBean implements Serializable {
 

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

@@ -13,8 +13,8 @@ package edu.kit.scc.webreg.bean;
 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;
 
@@ -36,7 +36,7 @@ import net.minidev.json.JSONObject;
 import net.minidev.json.parser.JSONParser;
 import net.minidev.json.parser.ParseException;
 
-@ManagedBean
+@Named
 @ViewScoped
 public class UserPropertiesBean implements Serializable {