ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Renamed lang references, switched to zutil UserMessageManager

Browse source
This commit is contained in:
Ziver Koc 2018-08-06 18:53:40 +02:00
parent b84f583d1c
commit 9c91d96ce7
27 changed files with 245 additions and 295 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/zall/Zallery.java
View file

@ -9,12 +9,13 @@ import javax.naming.NamingException;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import zutil.db.DBConnection;
import zutil.log.LogUtil;
import zutil.ui.UserMessageManager;
@WebServlet(value = "/init", loadOnStartup = 1)
public class Zallery extends HttpServlet{
@ -39,7 +40,7 @@ public class Zallery extends HttpServlet{
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
// java:comp/env
logger.info("Setting up Zallery environment.");
ROOT_PATH = config.getServletContext().getRealPath("/");
try {
Context context = new InitialContext();
@ -47,18 +48,20 @@ public class Zallery extends HttpServlet{
if (((String) context.lookup("java:comp/env/DATA_PATH")).isEmpty())
throw new ServletException("Zallery has not been properly configured, set proper configuration in Zallery.xml context file.");
WEBSITE_NAME = (String)context.lookup("java:comp/env/WEBSITE_NAME");
WEBSITE_URL = (String)context.lookup("java:comp/env/WEBSITE_URL");
WEBSITE_NAME = (String) context.lookup("java:comp/env/WEBSITE_NAME");
WEBSITE_URL = (String) context.lookup("java:comp/env/WEBSITE_URL");
if( WEBSITE_URL.charAt(WEBSITE_URL.length()-1) != '/')
WEBSITE_URL += "/";
ADMIN_EMAIL = (String)context.lookup("java:comp/env/ADMIN_EMAIL");
ADMIN_EMAIL_NICE = (String)context.lookup("java:comp/env/ADMIN_EMAIL_NICE");
SMTP_HOST = (String)context.lookup("java:comp/env/SMTP_HOST");
DATA_PATH = (String)context.lookup("java:comp/env/DATA_PATH");
ADMIN_EMAIL = (String) context.lookup("java:comp/env/ADMIN_EMAIL");
ADMIN_EMAIL_NICE = (String) context.lookup("java:comp/env/ADMIN_EMAIL_NICE");
SMTP_HOST = (String) context.lookup("java:comp/env/SMTP_HOST");
DATA_PATH = (String) context.lookup("java:comp/env/DATA_PATH");
LogUtil.setLevel("zall", Level.FINEST);
//LogUtil.setLevel("zutil", Level.FINEST);
LogUtil.setLevel("zall", Level.parse((String) context.lookup("java:comp/env/LOGGING_ZALL")));
LogUtil.setLevel("zutil", Level.parse((String) context.lookup("java:comp/env/LOGGING_ZUTIL")));
logger.info("Zallery ready to be used.");
} catch (NamingException e) {
throw new ServletException(e);
}
@ -68,6 +71,7 @@ public class Zallery extends HttpServlet{
}
public static DBConnection getDB() throws ServletException{
try {
return new DBConnection("jdbc/mysql");
@ -76,4 +80,9 @@ public class Zallery extends HttpServlet{
}
}
public static UserMessageManager getUserMessage(HttpSession session) {
if (session.getAttribute(ZalleryConstants.SESSION_KEY_USER_MSG) == null)
session.setAttribute(ZalleryConstants.SESSION_KEY_USER_MSG, new UserMessageManager());
return (UserMessageManager) session.getAttribute(ZalleryConstants.SESSION_KEY_USER_MSG);
}
}