[teiid-commits] teiid SVN: r604 - trunk/soap/src/main/java/com/metamatrix/soap/servlet.

Author: tejones Date: 2009-03-19 17:23:41 -0400 (Thu, 19 Mar 2009) New Revision: 604 Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java Log: TEIID-422 - Updated logging to log4j and changed file location for JBossAS. Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java 2009-03-19 21:23:14 UTC (rev 603) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMDiscoverWSDLServlet.java 2009-03-19 21:23:41 UTC (rev 604) @@ -30,6 +30,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; import com.metamatrix.admin.api.exception.AdminException; import com.metamatrix.api.exception.security.LogonException; @@ -64,11 +66,6 @@ synchronized public void init( ServletConfig config ) throws ServletException { super.init(config); - String logFile = getServletContext().getInitParameter("logfile"); //$NON-NLS-1$ - File log = new File(logFile); - logWriter = new FileLogWriter(log); - platformLog.getPlatformLog().addListener(logWriter); - mmServer = getServletContext().getInitParameter("mmServer"); //$NON-NLS-1$ mmProtocol = getServletContext().getInitParameter("mmProtocol"); //$NON-NLS-1$ } @@ -94,13 +91,13 @@ getServletConfig().getServletContext().getRequestDispatcher("/wsdlurls.jsp").forward(req, resp); //$NON-NLS-1$ } catch (LogonException e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage()); + log.error(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2"), e); resp.getOutputStream().println(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2") + e.getMessage()); //$NON-NLS-1$ } catch (AdminException e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage()); + log.error(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2"), e); resp.getOutputStream().println(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.2") + e.getMessage()); //$NON-NLS-1$ } catch (Exception e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage()); + log.error(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.1"), e); resp.getOutputStream().println(SOAPPlugin.Util.getString("MMDiscoverWSDLServlet.1") + e.getMessage()); //$NON-NLS-1$ } } Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java 2009-03-19 21:23:14 UTC (rev 603) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceServlet.java 2009-03-19 21:23:41 UTC (rev 604) @@ -45,6 +45,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.log4j.Logger; + import com.metamatrix.common.api.MMURL; import com.metamatrix.common.util.WSDLServletUtil; import com.metamatrix.core.CoreConstants; @@ -81,19 +83,14 @@ /** DataService Endpoint */ private String dataServiceEndpoint = StringUtil.Constants.EMPTY_STRING; - protected LogListener newListener = null; - protected FileLogWriter logWriter = null; - - MMGetVDBResourcePlatformLog platformLog=MMGetVDBResourcePlatformLog.getInstance(); - + static Logger log = Logger.getLogger(MMGetVDBResourceServlet.class); + public MMGetVDBResourceServlet() { } synchronized public void init(ServletConfig config) throws ServletException { super.init(config); - String logFile=getServletContext().getInitParameter("logfile"); //$NON-NLS-1$ - /* Check for override of Data Service endpoint. This is to allow for backwards compatibility * of WSDL for pre-5.5 data services. */ @@ -101,10 +98,6 @@ if (dataServiceEndpoint==null || dataServiceEndpoint.equals(StringUtil.Constants.EMPTY_STRING)){ dataServiceEndpoint=DATASERVICE; } - - File log = new File(logFile); - logWriter=new FileLogWriter(log); - platformLog.getPlatformLog().addListener(logWriter); } @@ -146,9 +139,7 @@ SOAPPlugin.Util.getString("MMGetVDBResourceServlet.Application_Name")); //$NON-NLS-1$ } catch (Exception e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, - e, - e.getMessage()); + log.error(e); resp.getOutputStream().println(e.getMessage()); return; } @@ -157,8 +148,7 @@ connection = getConnection(WebServiceUtil.WSDLUSER, WebServiceUtil.WSDLPASSWORD, vdbName, vdbVersion, serverURL); } catch (Exception e) { String message = SOAPPlugin.Util.getString(ErrorMessageKeys.SERVICE_0006); //; - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, - e, message); + log.error(message, e); resp.getOutputStream().println(message); return; } @@ -202,22 +192,16 @@ } catch (SQLException se) { resp.getOutputStream().println(se.getMessage()); - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, - se, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7"), se); } catch (Exception e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, - e, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8"), e); resp.getOutputStream().println(e.getMessage()); } finally { try { //Cleanup our connection connection.close(); } catch (SQLException e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, - e, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0"), e); resp.setHeader(WSDL_ERROR, WSDL_ERROR); resp.getOutputStream().println(e.getMessage()); } @@ -302,7 +286,7 @@ rs = statement.getResultSet(); }else { String message = SOAPPlugin.Util.getString("MMGetVDBResourceServlet.12"); //$NON-NLS-1$ - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, message); + log.error(message); resp.getOutputStream().println(message); return; } @@ -311,7 +295,7 @@ clob = rs.getClob(1); }else { String message = SOAPPlugin.Util.getString("MMGetVDBResourceServlet.14"); //$NON-NLS-1$ - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, message); + log.error(message); resp.getOutputStream().println(message); return; } @@ -426,9 +410,7 @@ // make sure to encode the parameter values so they do not violate URL protocols. parameterValue = URLEncoder.encode(((String[])parameterMap.get(keyString))[0], "UTF-8"); //$NON-NLS-1$ } catch (UnsupportedEncodingException err) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, - err, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.15")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.15", err)); } } suffixString = suffixString + keyString + "=" + parameterValue; //$NON-NLS-1$ Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java 2009-03-19 21:23:14 UTC (rev 603) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetWSDLServlet.java 2009-03-19 21:23:41 UTC (rev 604) @@ -31,6 +31,8 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; import com.metamatrix.common.util.WSDLServletUtil; import com.metamatrix.core.log.FileLogWriter; @@ -51,7 +53,8 @@ /** MM Server host/port/protocol */ private String mmServer = StringUtil.Constants.EMPTY_STRING; - private String mmProtocol = StringUtil.Constants.EMPTY_STRING; + private String mmProtocol = StringUtil.Constants.EMPTY_STRING; + static Logger log = Logger.getLogger(MMGetVDBResourceServlet.class); public MMGetWSDLServlet() { } @@ -59,11 +62,6 @@ synchronized public void init(ServletConfig config) throws ServletException { super.init(config); - String logFile = getServletContext().getInitParameter("logfile"); //$NON-NLS-1$ - File log = new File(logFile); - logWriter = new FileLogWriter(log); - platformLog.getPlatformLog().addListener(logWriter); - mmServer = getServletContext().getInitParameter("mmServer"); //$NON-NLS-1$ mmProtocol = getServletContext().getInitParameter("mmProtocol"); //$NON-NLS-1$ } @@ -117,8 +115,7 @@ } catch (Exception e) { String message = SOAPPlugin.Util .getString(ErrorMessageKeys.SERVICE_0006); // ; - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log( - MessageLevel.ERROR, e, message); + log.error(message, e); resp.getOutputStream().println(message); return; } @@ -169,22 +166,16 @@ } catch (SQLException se) { resp.getOutputStream().println(se.getMessage()); - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log( - MessageLevel.ERROR, se, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.7"), se); } catch (Exception e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log( - MessageLevel.ERROR, e, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.8"), e); resp.getOutputStream().println(e.getMessage()); } finally { try { // Cleanup our connection connection.close(); } catch (SQLException e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log( - MessageLevel.ERROR, e, - SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0")); //$NON-NLS-1$ + log.error(SOAPPlugin.Util.getString("MMGetVDBResourceServlet.0"), e); resp.setHeader(WSDL_ERROR, WSDL_ERROR); resp.getOutputStream().println(e.getMessage()); } Modified: trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java 2009-03-19 21:23:14 UTC (rev 603) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/WSDLURLGenerator.java 2009-03-19 21:23:41 UTC (rev 604) @@ -40,6 +40,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; import com.metamatrix.common.util.WSDLServletUtil; import com.metamatrix.core.log.FileLogWriter; @@ -54,21 +56,12 @@ * * @since 4.2 */ -public class WSDLURLGenerator extends HttpServlet { +public class WSDLURLGenerator extends HttpServlet { + + static Logger log = Logger.getLogger(WSDLURLGenerator.class); - public LogListener newListener = null; - public FileLogWriter logWriter = null; - - MMGetVDBResourcePlatformLog platformLog = MMGetVDBResourcePlatformLog.getInstance(); - synchronized public void init(ServletConfig config) throws ServletException { super.init(config); - - String logFile = getServletContext().getInitParameter("logfile"); //$NON-NLS-1$ - - File log = new File(logFile); - logWriter = new FileLogWriter(log); - platformLog.getPlatformLog().addListener(logWriter); } public void doGet(HttpServletRequest req, @@ -102,7 +95,7 @@ checkFormValue(targetHost, WSDLServletUtil.TARGET_HOST_KEY); } catch (Exception e) { - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, e, e.getMessage()); + log.error(e); resp.getOutputStream().println(e.getMessage()); return; } @@ -142,7 +135,7 @@ } } catch (MalformedURLException mue) { String message = SOAPPlugin.Util.getString(ErrorMessageKeys.SERVICE_0021, mmServerHost); - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, mue, message); + log.error(message, mue); resp.getOutputStream().println(message); return; } @@ -182,7 +175,7 @@ error.append((char)c); } String message = SOAPPlugin.Util.getString(ErrorMessageKeys.SERVICE_0022, servletPath, error.toString()); - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, message); + log.error(message); resp.getOutputStream().println(message); } finally { reader.close(); @@ -208,7 +201,7 @@ } } catch (NumberFormatException nfe) { String message = SOAPPlugin.Util.getString(error_key, integer); - MMGetVDBResourcePlatformLog.getInstance().getLogFile().log(MessageLevel.ERROR, nfe, message); + log.error(message, nfe); resp.getOutputStream().println(message); return false; }