Skip to content

Antti Väyrynen / Moya

Go to a project
Commit 970c39fa by Tuomas Riihimäki
Options

moved SessionHandler to its original name

1 parent cee10bf0
Inline Side-by-side
Showing with 57 additions and 60 deletions
code/LanBortalWeb/WebContent/resources/tools/role/list.xhtml
......@@ -2,56 +2,54 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
</composite:interface>
<composite:implementation>
<h:form>
<tools:canRead target="roleManagement">
<h:dataTable
border="1"
id="user"
value="#{roleView.roles}"
var="role">
<h:column>
<f:facet name="header">
<h:outputText value="#" />
</f:facet>
<h:outputText value="#{role.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['role.name']}" />
</f:facet>
<h:outputText value="#{role.name}" />
</h:column>
<tools:canWrite target="roleManagement">
<h:column>
<f:facet name="header">
<h:outputText value="Edit" />
</f:facet>
<h:commandButton
action="#{roleView.edit()}"
value="Edit" />
</h:column>
</tools:canWrite>
</h:dataTable>
</tools:canRead>
</h:form>
</tools:authorization>
</composite:implementation>
xmlns="http://www.w3.org/1999/xhtml"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:composite="http://java.sun.com/jsf/composite"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:tools="http://java.sun.com/jsf/composite/tools">
<composite:interface>
</composite:interface>
<composite:implementation>
<h:form>
<tools:canRead target="roleManagement">
<h:dataTable
border="1"
id="user"
value="#{roleView.roles}"
var="role">
<h:column>
<f:facet name="header">
<h:outputText value="#" />
</f:facet>
<h:outputText value="#{role.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['role.name']}" />
</f:facet>
<h:outputText value="#{role.name}" />
</h:column>
<tools:canWrite target="roleManagement">
<h:column>
<f:facet name="header">
<h:outputText value="Edit" />
</f:facet>
<h:commandButton
action="#{roleView.edit()}"
value="Edit" />
</h:column>
</tools:canWrite>
</h:dataTable>
</tools:canRead>
</h:form>
</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;
}
}
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!