[teiid-commits] teiid SVN: r601 - in trunk/soap/src/main: webapp/WEB-INF and 1 other directories.

Author: tejones Date: 2009-03-19 17:22:07 -0400 (Thu, 19 Mar 2009) New Revision: 601 Removed: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java Modified: trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties trunk/soap/src/main/webapp/WEB-INF/web.xml Log: TEIID-422 - Updated logging to log4j and changed file location for JBossAS. Deleted: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java 2009-03-19 21:18:23 UTC (rev 600) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourceLog.java 2009-03-19 21:22:07 UTC (rev 601) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.soap.servlet; - -import com.metamatrix.internal.core.log.PlatformLog; - -/** - * MMSoapLog - */ -public class MMGetVDBResourceLog extends PlatformLog -{ - /** - * Constructor - */ - public MMGetVDBResourceLog() - { - super(); - } -} Deleted: trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java =================================================================== --- trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java 2009-03-19 21:18:23 UTC (rev 600) +++ trunk/soap/src/main/java/com/metamatrix/soap/servlet/MMGetVDBResourcePlatformLog.java 2009-03-19 21:22:07 UTC (rev 601) @@ -1,97 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package com.metamatrix.soap.servlet; - -import com.metamatrix.core.log.Logger; -import com.metamatrix.internal.core.log.*; -import com.metamatrix.soap.SOAPPlugin; -import com.metamatrix.soap.log.MMSOAPLog; - -/** - * Logger class (Singleton). It is initialized in the main servlet - * of the application. The Logger file name is loaded from - * the web.xml file in ModuleServlet. - */ -public class MMGetVDBResourcePlatformLog -{ - - // ========================================================================= - // Static Members - // ========================================================================= - private static final MMGetVDBResourcePlatformLog INSTANCE = new MMGetVDBResourcePlatformLog(); - PlatformLog platformLog = new PlatformLog("MetaMatrix SOAP log"); //$NON-NLS-1$ - - Logger logFile = new MMSOAPLog(SOAPPlugin.PLUGIN_ID,platformLog); - - /** - * Private constructor - */ - private MMGetVDBResourcePlatformLog() - { - } - - /** - * Get an instance of this class. - */ - public static MMGetVDBResourcePlatformLog getInstance() { - return INSTANCE; - } - - /** - * Get the platform log. - * @return PlatformLog - */ - public PlatformLog getPlatformLog() - { - return platformLog; - } - - /** - * Set the platform log. - * @param log PlatformLog - */ - public void setPlatformLog(PlatformLog log) - { - platformLog = log; - } - - /** - * Get the Logger. - * @return Logger - */ - public Logger getLogFile() - { - return logFile; - } - - /** - * Set the Logger. - * @param logger - */ - public void setLogFile(Logger logger) - { - logFile = logger; - } -} - - Modified: trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties =================================================================== --- trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties 2009-03-19 21:18:23 UTC (rev 600) +++ trunk/soap/src/main/webapp/WEB-INF/classes/log4j.properties 2009-03-19 21:22:07 UTC (rev 601) @@ -21,7 +21,7 @@ # LOGFILE is set to be a File appender using a PatternLayout. log4j.appender.LOGFILE=org.apache.log4j.FileAppender -log4j.appender.LOGFILE.File=../../log/MetaMatrixWebServices.log +log4j.appender.LOGFILE.File=../log/JBEDSPWebServices.log log4j.appender.LOGFILE.Append=true log4j.appender.LOGFILE.Threshold=INFO log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout Modified: trunk/soap/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/soap/src/main/webapp/WEB-INF/web.xml 2009-03-19 21:18:23 UTC (rev 600) +++ trunk/soap/src/main/webapp/WEB-INF/web.xml 2009-03-19 21:22:07 UTC (rev 601) @@ -24,11 +24,6 @@ --> <web-app> - <context-param> - <param-name>logfile</param-name> - <param-value>../../log/MetaMatrixWebServices.log</param-value> - </context-param> - <!-- The optional BasicAuthInterceptor filter is for use with HTTP Basic authentication. It allows circumvention of preemptive authentication which may not always be desired. Comment/uncomment the filter and it's mapping accordingly to achieve the preferred behavior. --> @@ -62,7 +57,7 @@ <!-- * mmServer and mmProtocol parameters are used to obtain the WSDL from Web Service VDBs. - * They should be set accordingly to your environment. + * They should be set accordingly for your environment. * * mmServer is the target Metamatrix host and port. For a clustered environment, comma delimit server/port combinations * mmProtocol should be set to "mms" if the target MetaMatrix server or cluster has SSL enabled.