moved SessionHandler to its original name

code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml

@@ -11,10 +11,10 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/tools">
 
 
-    <composite:interface>
-    </composite:interface>
+<composite:interface>
+</composite:interface>
 
-    <composite:implementation>
+<composite:implementation>
 
 
 	<h:form>
@@ -49,9 +49,7 @@
 			</h:dataTable>
 		</tools:canRead>
 	</h:form>
-        </tools:authorization>
 
-
-    </composite:implementation>
+</composite:implementation>
 </html>
 

code/LanBortalWeb/src/fi/insomnia/bortal/handler/BortalSessionHandler.java → code/LanBortalWeb/src/fi/insomnia/bortal/handler/SessionHandler.java

@@ -15,15 +15,14 @@ import fi.insomnia.bortal.HostnameFilter;
 import fi.insomnia.bortal.beans.RolePermission;
 import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.model.User;
-import javax.faces.bean.SessionScoped;
 
 /**
  * 
  * @author tuukka
  */
-@ManagedBean(name = "bortalSessionHandler")
+@ManagedBean(name = "sessionHandler")
 @SessionScoped
-public class BortalSessionHandler {
+public class SessionHandler {
 
     @EJB
     private SessionHandlerBeanLocal handlerbean;
@@ -32,7 +31,7 @@ public class BortalSessionHandler {
     private String password = "";
 
     /** Creates a new instance of SessionHandler */
-    public BortalSessionHandler() {
+    public SessionHandler() {
     }
 
     public boolean hasPermission(String target, String permission) {

code/LanBortalWeb/src/fi/insomnia/bortal/view/UserView.java

@@ -18,15 +18,15 @@ import fi.insomnia.bortal.beans.SecurityBeanLocal;
 import fi.insomnia.bortal.beans.SessionHandlerBeanLocal;
 import fi.insomnia.bortal.beans.UserBeanLocal;
 import fi.insomnia.bortal.exceptions.PermissionDeniedException;
-import fi.insomnia.bortal.handler.BortalSessionHandler;
+import fi.insomnia.bortal.handler.SessionHandler;
 import fi.insomnia.bortal.model.User;
 
 @ManagedBean(name = "userView")
 @SessionScoped
 public class UserView {
     
-    @ManagedProperty("#{bortalSessionHandler}")
-    private BortalSessionHandler sessionhandler;
+    @ManagedProperty("#{sessionHandler}")
+    private SessionHandler sessionhandler;
     
     @EJB
     private SessionHandlerBeanLocal sessionbean;
@@ -111,11 +111,11 @@ public class UserView {
     public User getUser() {
         return user;
     }
-    public void setSessionhandler(BortalSessionHandler sessionhandler) {
+    public void setSessionhandler(SessionHandler sessionhandler) {
         this.sessionhandler = sessionhandler;
     }
 
-    public BortalSessionHandler getSessionhandler() {
+    public SessionHandler getSessionhandler() {
         return sessionhandler;
     }
 }