diff --git a/hsarback/conf/WEB-INF/prod-web.xml b/hsarback/conf/WEB-INF/prod-web.xml index d3f7dda..4899424 100644 --- a/hsarback/conf/WEB-INF/prod-web.xml +++ b/hsarback/conf/WEB-INF/prod-web.xml @@ -11,6 +11,14 @@ Queue Status Servlet de.hsadmin.core.qserv.QueueStatusReceiverServlet + + proxyValidateUrl + https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate + + + proxyServiceUrl + https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend + 1 @@ -21,14 +29,6 @@ enabledForExtensions true - - proxyValidateUrl - https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate - - - proxyServiceUrl - https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend - diff --git a/hsarback/conf/WEB-INF/test-web.xml b/hsarback/conf/WEB-INF/test-web.xml index 873935a..47c2dd5 100644 --- a/hsarback/conf/WEB-INF/test-web.xml +++ b/hsarback/conf/WEB-INF/test-web.xml @@ -11,6 +11,14 @@ Queue Status Servlet de.hsadmin.core.qserv.QueueStatusReceiverServlet + + proxyValidateUrl + https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate + + + proxyServiceUrl + https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend + 1 @@ -21,14 +29,6 @@ enabledForExtensions true - - proxyValidateUrl - https://@LOGIN_HOST@:@LOGIN_PORT@/cas/proxyValidate - - - proxyServiceUrl - https://@CONFIG_HOST@:@CONFIG_PORT@/hsar/backend - diff --git a/hsarback/src/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java b/hsarback/src/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java index af52c92..1d70163 100644 --- a/hsarback/src/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java +++ b/hsarback/src/de/hsadmin/core/qserv/QueueStatusReceiverServlet.java @@ -18,12 +18,14 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import javax.persistence.EntityManager; +import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import de.hsadmin.core.model.TechnicalException; +import de.hsadmin.core.model.TicketValidator; import de.hsadmin.core.model.Transaction; import de.hsadmin.core.util.Config; @@ -43,6 +45,10 @@ public class QueueStatusReceiverServlet extends HttpServlet @Override public void init() throws ServletException { + final ServletConfig cfg = getServletConfig(); + final String validateURL = cfg.getInitParameter("proxyValidateUrl"); + final String serviceURL = cfg.getInitParameter("proxyServiceUrl"); + TicketValidator.getInstance().initialize(validateURL, serviceURL); isConnected = false; messageCount = 0; errorCount = 0; diff --git a/hsarback/src/de/hsadmin/remote/HSXmlRpcServlet.java b/hsarback/src/de/hsadmin/remote/HSXmlRpcServlet.java index bd2d961..30adf65 100644 --- a/hsarback/src/de/hsadmin/remote/HSXmlRpcServlet.java +++ b/hsarback/src/de/hsadmin/remote/HSXmlRpcServlet.java @@ -1,28 +1,15 @@ package de.hsadmin.remote; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; - import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.metadata.XmlRpcSystemImpl; import org.apache.xmlrpc.server.PropertyHandlerMapping; import org.apache.xmlrpc.server.XmlRpcHandlerMapping; import org.apache.xmlrpc.webserver.XmlRpcServlet; -import de.hsadmin.core.model.TicketValidator; - public class HSXmlRpcServlet extends XmlRpcServlet { private static final long serialVersionUID = 1L; - @Override - public void init() throws ServletException { - super.init(); - final ServletConfig cfg = getServletConfig(); - final String validateURL = cfg.getInitParameter("proxyValidateUrl"); - final String serviceURL = cfg.getInitParameter("proxyServiceUrl"); - TicketValidator.getInstance().initialize(validateURL, serviceURL); } - @Override protected XmlRpcHandlerMapping newXmlRpcHandlerMapping() throws XmlRpcException {