Skip to content

Max Mecklin / Moya

Go to a project
Commit 6782e323 by Tuomas Riihimäki
Options

Muutettu glassfishin versio eclipsessä 3.1.1 -> 3.1.2

1 parent 153ca4f8
Inline Side-by-side
Showing with 102 additions and 111 deletions
code/LanBortalAuthModule/.classpath
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanBortalAuthModuleClient"/> <classpathentry combineaccessrules="false" exported="true" kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry combineaccessrules="false" kind="src" path="/lib-AuthModule-depends"/> <classpathentry combineaccessrules="false" kind="src" path="/lib-AuthModule-depends"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"/> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalAuthModule/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.6"/>
</faceted-project> </faceted-project>
code/LanBortalAuthModuleClient/.classpath
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalAuthModuleClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/LanBortalBeans/.classpath
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<classpath> <classpath>
<classpathentry kind="src" path="ejbModule"/> <classpathentry kind="src" path="ejbModule"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.ejb"/> <attribute name="owner.project.facets" value="jst.ejb"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalBeans/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.ejb"/> <fixed facet="jst.ejb"/>
<installed facet="java" version="1.6"/> <installed facet="java" version="1.6"/>
......
code/LanBortalBeansClient/.classpath
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<classpathentry kind="src" path="/LanBortalDatabase"/> <classpathentry kind="src" path="/LanBortalDatabase"/>
<classpathentry kind="src" path="/LanBortalUtilities"/> <classpathentry kind="src" path="/LanBortalUtilities"/>
<classpathentry kind="src" path="/LanBortalAuthModuleClient"/> <classpathentry kind="src" path="/LanBortalAuthModuleClient"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalBeansClient/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
......
code/LanBortalDatabase/.classpath
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="src" path="/LanBortalUtilities"/> <classpathentry kind="src" path="/LanBortalUtilities"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jpt.jpa"/> <fixed facet="jpt.jpa"/>
......
code/LanBortalUtilities/.classpath
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.utility"/> <attribute name="owner.project.facets" value="jst.utility"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalUtilities/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="jst.java"/> <fixed facet="jst.java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.java" version="6.0"/> <installed facet="jst.java" version="6.0"/>
......
code/LanBortalUtilities/src/fi/insomnia/bortal/utilities/BillUtils.java
...@@ -6,18 +6,23 @@ public class BillUtils { ...@@ -6,18 +6,23 @@ public class BillUtils {
/** /**
* Calculates and return the reference number calculated from the given base * Calculates and return the reference number calculated from the given base
*
* @param base * @param base
* @return * @return
*/ */
public static Integer createReferenceNumber(Integer base) { public static Integer createReferenceNumber(Integer base) {
return base * 10 + calculateChecksum(base); return base * 10 + calculateChecksum(base);
} }
/** /**
* This function will calculate the checksum for the bills checksum * This function will calculate the checksum for the bills checksum nuber
* nuber for the given checksum base * for the given checksum base
* @param base The base of the checksum *
* @return checksum integer in the range of 0-9 calculated from the given base * @param base
* The base of the checksum
* @return checksum integer in the range of 0-9 calculated from the given
* base
*/ */
public static Integer calculateChecksum(Integer base) public static Integer calculateChecksum(Integer base)
{ {
......
code/LanBortalWeb/.classpath
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.1"> <classpathentry kind="con" path="org.eclipse.jst.server.core.container/com.sun.enterprise.jst.server.runtimeTarget/GlassFish 3.1.2">
<attributes> <attributes>
<attribute name="owner.project.facets" value="jst.web"/> <attribute name="owner.project.facets" value="jst.web"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)">
<attributes> <attributes>
<attribute name="owner.project.facets" value="java"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
......
code/LanBortalWeb/.settings/org.eclipse.wst.common.project.facet.core.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="GlassFish 3.1.1"/> <runtime name="GlassFish 3.1.2"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
<fixed facet="jst.web"/> <fixed facet="jst.web"/>
......
code/LanBortalWeb/src/fi/insomnia/bortal/servlet/UserImageServlet.java
...@@ -14,6 +14,7 @@ import fi.insomnia.bortal.model.UserImage; ...@@ -14,6 +14,7 @@ import fi.insomnia.bortal.model.UserImage;
/** /**
* Servlet implementation class UploadServlet * Servlet implementation class UploadServlet
*/ */
public class UserImageServlet extends GenericImageServlet { public class UserImageServlet extends GenericImageServlet {
/** /**
...@@ -39,10 +40,10 @@ public class UserImageServlet extends GenericImageServlet { ...@@ -39,10 +40,10 @@ public class UserImageServlet extends GenericImageServlet {
ImageMover ret = new ImageMover(); ImageMover ret = new ImageMover();
UserImage image = userbean.findUserimageFORCE(super.getIdParam("imageid")); UserImage image = userbean.findUserimageFORCE(super.getIdParam("imageid"));
if (image != null) { // && if (image != null) { // &&
// if (permbean.isCurrentUser(image.getUser()) || // if (permbean.isCurrentUser(image.getUser()) ||
// permbean.hasPermission(UserPermission.MODIFY) || // permbean.hasPermission(UserPermission.MODIFY) ||
// lhMatcher.matcher(request.getLocalAddr()).matches()) // lhMatcher.matcher(request.getLocalAddr()).matches())
// { // {
ret.setData(image.getImageData()); ret.setData(image.getImageData());
ret.setImagetype(image.getMimeType()); ret.setImagetype(image.getMimeType());
// } // }
......
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/menu/MenuView.java → code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/menu/MenuDataView.java
...@@ -3,46 +3,44 @@ package fi.insomnia.bortal.web.cdiview.menu; ...@@ -3,46 +3,44 @@ package fi.insomnia.bortal.web.cdiview.menu;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.MissingResourceException; import java.util.MissingResourceException;
import java.util.ResourceBundle; import java.util.ResourceBundle;
import javax.ejb.EJB; import javax.ejb.EJB;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.SessionScoped;
import javax.faces.context.FacesContext; import javax.faces.context.FacesContext;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import javax.servlet.http.HttpServletRequest;
import fi.insomnia.bortal.beans.PermissionBeanLocal; import fi.insomnia.bortal.beans.PermissionBeanLocal;
import fi.insomnia.bortal.beans.SitePageBeanLocal; import fi.insomnia.bortal.beans.SitePageBeanLocal;
import fi.insomnia.bortal.enums.apps.BillPermission; import fi.insomnia.bortal.enums.apps.BillPermission;
import fi.insomnia.bortal.enums.apps.IAppPermission;
import fi.insomnia.bortal.enums.apps.MapPermission; import fi.insomnia.bortal.enums.apps.MapPermission;
import fi.insomnia.bortal.enums.apps.PollPermission; import fi.insomnia.bortal.enums.apps.PollPermission;
import fi.insomnia.bortal.enums.apps.UserPermission; import fi.insomnia.bortal.enums.apps.UserPermission;
import fi.insomnia.bortal.model.SitePage; import fi.insomnia.bortal.model.SitePage;
@RequestScoped @SessionScoped
@Named @Named
public class MenuView { public class MenuDataView {
private ArrayList<JsfMenuitem> topmenu;
private ArrayList<JsfMenuitem> submenu;
private Integer pagegroupId;
private PageGroup currentPagegroup;
private static List<MenuGroup> PAGEGROUPS;
@Inject @Inject
private FacesContext context; private FacesContext context;
private String pagename;
@EJB @EJB
private PermissionBeanLocal permbean; private PermissionBeanLocal permbean;
@EJB @EJB
private SitePageBeanLocal sitePageBean; private SitePageBeanLocal sitePageBean;
private ArrayList<JsfMenuitem> topmenu;
private ArrayList<JsfMenuitem> submenu;
private ResourceBundle rb; private ResourceBundle rb;
private static final Map<String, Menuitem> PAGES;
private static List<PageGroup> PAGEGROUPS;
private String localize(String key) { private String localize(String key) {
String value = null; String value = null;
...@@ -69,61 +67,52 @@ public class MenuView { ...@@ -69,61 +67,52 @@ public class MenuView {
return rb; return rb;
} }
static { public List<PageGroup> getPagegroups()
{
Map<String, Menuitem> temppages = new HashMap<String, Menuitem>(); return PAGEGROUPS;
MenuGroup frontpage = new MenuGroup("frontpage");
MenuGroup user = new MenuGroup("user");
MenuGroup placemap = new MenuGroup("placemap");
MenuGroup shop = new MenuGroup("shop");
MenuGroup poll = new MenuGroup("poll");
PAGEGROUPS = Collections.unmodifiableList(Arrays.asList(frontpage, user, placemap, shop, poll));
addPage(temppages, "/index", frontpage, UserPermission.ANYUSER);
addPage(temppages, "/user/create", frontpage, UserPermission.CREATE_NEW);
addPage(temppages, "/auth/sendResetMail", frontpage, UserPermission.LOGIN);
addPage(temppages, "/user/edit", user, UserPermission.VIEW_SELF).setHeader("submenu.user.userlinks");
addPage(temppages, "/user/changePassword", user, null);
addPage(temppages, "/user/accountEvents", user, null);
addPage(temppages, "/place/myGroups", user, null);
addPage(temppages, "/place/insertToken", user, null);
addPage(temppages, "/user/sendPicture", user, null);
addPage(temppages, "/user/list", user, UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
addPage(temppages, "/user/create", user, UserPermission.VIEW_ALL);
addPage(temppages, "/role/list", user, UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
addPage(temppages, "/role/create", user, UserPermission.WRITE_ROLES);
addPage(temppages, "/user/listCardTemplates", user, UserPermission.READ_ROLES);
addPage(temppages, "/user/createCardTemplate", user, UserPermission.WRITE_ROLES);
addPage(temppages, "/place/placemap", placemap, MapPermission.VIEW);
addPage(temppages, "/shop/createBill", shop, BillPermission.CREATE_BILL);
addPage(temppages, "/bill/list", shop, BillPermission.VIEW_OWN);
addPage(temppages, "/poll/index", poll, PollPermission.ANSWER);
PAGES = Collections.unmodifiableMap(temppages);
} }
public String getPagename() { static {
if (pagename == null) {
HttpServletRequest req = (HttpServletRequest) context.getExternalContext().getRequest(); PageGroup userpages = new PageGroup("userpages");
String[] splitted = req.getServletPath().split("\\."); PageGroup adminpages = new PageGroup("adminpages");
if (splitted.length > 0) {
pagename = splitted[0]; PAGEGROUPS = Collections.unmodifiableList(Arrays.asList(userpages, adminpages));
}
} // Frontpage
return pagename; userpages.initMenugroup("frontpage");
} userpages.addPage("/index", UserPermission.ANYUSER);
userpages.addPage("/user/create", UserPermission.CREATE_NEW);
userpages.addPage("/auth/sendResetMail", UserPermission.LOGIN);
// User
userpages.initMenugroup("user");
userpages.addPage("/user/edit", UserPermission.VIEW_SELF).setHeader("submenu.user.userlinks");
userpages.addPage("/user/changePassword", null);
userpages.addPage("/user/accountEvents", null);
userpages.addPage("/place/myGroups", null);
userpages.addPage("/place/insertToken", null);
userpages.addPage("/user/sendPicture", null);
userpages.addPage("/user/list", UserPermission.VIEW_ALL).setHeader("submenu.user.manageuserlinks");
userpages.addPage("/user/create", UserPermission.VIEW_ALL);
userpages.addPage("/role/list", UserPermission.READ_ROLES).setHeader("submenu.user.rolelinks");
userpages.addPage("/role/create", UserPermission.WRITE_ROLES);
userpages.addPage("/user/listCardTemplates", UserPermission.READ_ROLES);
userpages.addPage("/user/createCardTemplate", UserPermission.WRITE_ROLES);
// Placemap
userpages.initMenugroup("placemap");
userpages.addPage("/place/placemap", MapPermission.VIEW);
// Shop
userpages.initMenugroup("shop");
userpages.addPage("/shop/createBill", BillPermission.CREATE_BILL);
userpages.addPage("/bill/list", BillPermission.VIEW_OWN);
// Poll
userpages.initMenugroup("poll");
userpages.addPage("/poll/index", PollPermission.ANSWER);
private static Menuitem addPage(Map<String, Menuitem> temppages, String url, MenuGroup group, IAppPermission perm) {
Menuitem ret = new Menuitem(url, group, perm);
temppages.put(url, ret);
return ret;
} }
public void setContext(FacesContext context) { public void setContext(FacesContext context) {
...@@ -139,7 +128,7 @@ public class MenuView { ...@@ -139,7 +128,7 @@ public class MenuView {
if (topmenu == null) { if (topmenu == null) {
topmenu = new ArrayList<JsfMenuitem>(); topmenu = new ArrayList<JsfMenuitem>();
Menuitem currentPage = PAGES.get(getPagename()); Menuitem currentPage = PAGEGROUPS.get(getPagename());
MenuGroup currentGroup = null; MenuGroup currentGroup = null;
if (currentPage != null) { if (currentPage != null) {
currentGroup = currentPage.getGroup(); currentGroup = currentPage.getGroup();
...@@ -183,7 +172,7 @@ public class MenuView { ...@@ -183,7 +172,7 @@ public class MenuView {
public ArrayList<JsfMenuitem> getSubmenu() { public ArrayList<JsfMenuitem> getSubmenu() {
if (submenu == null) { if (submenu == null) {
Menuitem currentPage = PAGES.get(getPagename()); Menuitem currentPage = PAGEGROUPS.get(getPagename());
if (currentPage != null) { if (currentPage != null) {
MenuGroup currentGroup = currentPage.getGroup(); MenuGroup currentGroup = currentPage.getGroup();
...@@ -202,4 +191,4 @@ public class MenuView { ...@@ -202,4 +191,4 @@ public class MenuView {
} }
return submenu; return submenu;
} }
} }
\ No newline at end of file
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/menu/MenuGroup.java
...@@ -3,6 +3,8 @@ package fi.insomnia.bortal.web.cdiview.menu; ...@@ -3,6 +3,8 @@ package fi.insomnia.bortal.web.cdiview.menu;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import fi.insomnia.bortal.enums.apps.IAppPermission;
public class MenuGroup { public class MenuGroup {
private final List<Menuitem> items = new ArrayList<Menuitem>(); private final List<Menuitem> items = new ArrayList<Menuitem>();
...@@ -12,10 +14,6 @@ public class MenuGroup { ...@@ -12,10 +14,6 @@ public class MenuGroup {
groupname = name; groupname = name;
} }
public void add(Menuitem menuitem) {
getItems().add(menuitem);
}
public String getGroupname() { public String getGroupname() {
return groupname; return groupname;
} }
...@@ -24,4 +22,9 @@ public class MenuGroup { ...@@ -24,4 +22,9 @@ public class MenuGroup {
return items; return items;
} }
public Menuitem addPage(String url, IAppPermission perm) {
Menuitem ret = new Menuitem(url, this, perm);
items.add(ret);
return ret;
}
} }
code/LanBortalWeb/src/fi/insomnia/bortal/web/cdiview/menu/Menuitem.java
...@@ -13,7 +13,6 @@ public class Menuitem { ...@@ -13,7 +13,6 @@ public class Menuitem {
this.url = url; this.url = url;
this.permission = perm; this.permission = perm;
this.group = group; this.group = group;
group.add(this);
} }
public String getUrl() { public String getUrl() {
......
muutSoftat/RemoteRfidReader/bin/client.policy deleted 100644 → 0
grant {
permission java.security.AllPermission;
};
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!