jvanzyl 01/08/28 09:28:35
Modified: src/java/org/apache/turbine/services/logging FileLogger.java
TurbineLoggingService.java
Log:
- make the file logger obey the application root
Revision Changes Path
1.2 +8 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/logging/FileLogger.java
Index: FileLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/logging/FileLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileLogger.java 2001/08/16 05:09:03 1.1
+++ FileLogger.java 2001/08/28 16:28:34 1.2
@@ -67,6 +67,7 @@
import java.util.Vector;
import javax.servlet.ServletContext;
import org.apache.turbine.util.RunData;
+import org.apache.turbine.Turbine;
/**
* This class implements Logger interface using simple file
@@ -75,7 +76,7 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:[EMAIL PROTECTED]";>Tomasz Zielinski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: FileLogger.java,v 1.1 2001/08/16 05:09:03 jvanzyl Exp $
+ * @version $Id: FileLogger.java,v 1.2 2001/08/28 16:28:34 jvanzyl Exp $
*/
public class FileLogger extends BaseLogger
{
@@ -116,9 +117,12 @@
for (Enumeration fileList = files.elements(); fileList.hasMoreElements(); )
{
String path = (String) fileList.nextElement();
- //resolves relative paths
- String pathTmp = ((ServletContext)loggingConfig.getServletContext())
- .getRealPath(path);
+
+ // Resolve relative paths using Turbine.getRealPath(s) so that
+ // the paths are translated against the applicationRoot which
+ // may be the webContext or the CVS layout of a Turbine application.
+ String pathTmp = Turbine.getRealPath(path);
+
if (pathTmp != null)
{
path = pathTmp;
1.2 +3 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java
Index: TurbineLoggingService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/logging/TurbineLoggingService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineLoggingService.java 2001/08/16 05:09:06 1.1
+++ TurbineLoggingService.java 2001/08/28 16:28:34 1.2
@@ -81,7 +81,7 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:[EMAIL PROTECTED]";>Tomasz Zielinski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: TurbineLoggingService.java,v 1.1 2001/08/16 05:09:06 jvanzyl Exp $
+ * @version $Id: TurbineLoggingService.java,v 1.2 2001/08/28 16:28:34 jvanzyl Exp $
*/
public class TurbineLoggingService
extends TurbineBaseService
@@ -116,7 +116,8 @@
* Inits the service using servlet parameters to obtain path to the
* configuration file. Change relatives paths.
*/
- public void init(ServletConfig config) throws InitializationException
+ public void init(ServletConfig config)
+ throws InitializationException
{
context = config.getServletContext();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
