You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jt...@apache.org on 2002/04/09 19:29:35 UTC
cvs commit: jakarta-turbine-3/src/tool/org/apache/turbine/tool UIManager.java
jtaylor 02/04/09 10:29:35
Modified: . build-maven.xml build-test.xml build.xml
default.properties project.xml
src/java/org/apache/turbine Turbine.java TurbineConfig.java
src/java/org/apache/turbine/modules ModuleLoader.java
src/java/org/apache/turbine/modules/actions
AccessController.java LoginUser.java
src/java/org/apache/turbine/pipeline ConditionalValve.java
DefaultACLCreationValve.java
DefaultActionValve.java DefaultLoginValve.java
DefaultResolver.java
DefaultSessionTimeoutValve.java
DefaultSessionValidationValve.java
DefaultTargetValve.java DetermineActionValve.java
DetermineTargetValve.java DirectRenderer.java
DirectTargetValve.java JGenRenderer.java
JGenRendererValve.java JspRenderer.java
JspRendererValve.java ModuleRunner.java
Renderer.java RunModulesValve.java
TargetExtensionConditionalValve.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
src/tool/org/apache/turbine/tool UIManager.java
Removed: src/java/org/apache/turbine Log.java
Log:
First pass at moving to commons-logging. All uses of turbine.Log and all uses
of log4j.Category have been replaced with commons.logging.Log. The only
remaining dependence on log4j is the initialization of it in Turbine. I had
hoped to remove this, and allow logging to be initialized by a component, but
we need to think more about that since it is important that logging be
initialized very early.
However, while not complete this does eliminate any dependence on deprecated
stuff from log4j 1.1, such as Category, so it should resolve Jon's problems
moving to log4j 1.2 (not taking into account any similar problems which may
exist in torque or fulcrum)
The Log class has been moved to the misc directory, so that it might later
be incorporated in a turbine 2 compatibility layer.
Both the old and mavenized build systems have been updated, hopefully I made
all the right changes in both places. It is getting a little confusing =]
Revision Changes Path
1.2 +5 -0 jakarta-turbine-3/build-maven.xml
Index: build-maven.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-maven.xml 18 Mar 2002 01:55:09 -0000 1.1
+++ build-maven.xml 9 Apr 2002 17:29:34 -0000 1.2
@@ -22,6 +22,11 @@
name="maven:site">
<ant antfile="${maven.home}/build-docs.xml" target="site"/>
</target>
+
+ <target
+ name="maven:pdf">
+ <ant antfile="${maven.home}/build-docs.xml" target="docs:pdf"/>
+ </target>
<target
name="maven:jar">
1.17 +2 -0 jakarta-turbine-3/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build-test.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build-test.xml 18 Mar 2002 13:19:32 -0000 1.16
+++ build-test.xml 9 Apr 2002 17:29:34 -0000 1.17
@@ -19,6 +19,7 @@
<pathelement location="${commons-util.jar}"/>
<pathelement location="${commons-io.jar}"/>
<pathelement location="${commons-lang.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${fulcrum.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${stratum.jar}"/>
@@ -237,6 +238,7 @@
<copy file="${commons-collections.jar}" todir="${build.dir}/rttest/lib"/>
<copy file="${commons-io.jar}" todir="${build.dir}/rttest/lib"/>
<copy file="${commons-lang.jar}" todir="${build.dir}/rttest/lib"/>
+ <copy file="${commons-logging.jar}" todir="${build.dir}/rttest/lib"/>
<copy file="${dom4j.jar}" todir="${build.dir}/rttest/lib"/>
<copy file="${fulcrum.jar}" todir="${build.dir}/rttest/lib"/>
<copy file="${junit.jar}" todir="${build.dir}/rttest/lib"/>
1.28 +1 -0 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 7 Mar 2002 23:46:44 -0000 1.27
+++ build.xml 9 Apr 2002 17:29:34 -0000 1.28
@@ -26,6 +26,7 @@
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-lang.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-http.jar}"/>
<pathelement location="${dom4j.jar}"/>
<pathelement location="${fulcrum.jar}"/>
1.21 +1 -0 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- default.properties 24 Mar 2002 21:50:40 -0000 1.20
+++ default.properties 9 Apr 2002 17:29:34 -0000 1.21
@@ -41,6 +41,7 @@
xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.0.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
+commons-logging.jar = ${lib.repo}/commons-logging-1.0.jar
commons-io.jar = ${lib.repo}/commons-io.jar
commons-http.jar = ${lib.repo}/commons-http.jar
stratum.jar = ${lib.repo}/stratum-1.0-b2-dev.jar
1.19 +33 -89 jakarta-turbine-3/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 29 Mar 2002 14:56:16 -0000 1.18
+++ project.xml 9 Apr 2002 17:29:34 -0000 1.19
@@ -1,34 +1,21 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <version>2</version>
<name>jakarta-turbine-3</name>
<id>turbine</id>
<currentVersion>3.0alpha</currentVersion>
<organization>Apache Software Foundation</organization>
<inceptionYear>2000</inceptionYear>
<package>org.apache.turbine</package>
-
- <!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
-
- <shortDescription>
- A servlet based framework.
- </shortDescription>
-
- <description>
- Turbine is a servlet based framework that allows experienced Java
- developers to quickly build secure web applications. Parts of
- Turbine can also be used independently of the web portion of Turbine
- as well. In other words, we strive to make portions of Turbine
- easily available for use in other applications.
- </description>
-
+ <shortDescription>A servlet based framework.</shortDescription>
+ <description>Turbine is a servlet based framework that allows experienced Java developers to quickly build secure web applications. Parts of Turbine can also be used independently of the web portion of Turbine as well. In other words, we strive to make portions of Turbine easily available for use in other applications.</description>
<url>http://jakarta.apache.org/turbine/turbine-3/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-3/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org:8080/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/turbine-3/</siteDirectory>
-
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -43,277 +30,234 @@
<archive>http://nagoya.apache.org:8080/eyebrowse/SummarizeList?listName=turbine-dev@jakarta.apache.org</archive>
</mailingList>
</mailingLists>
-
<developers>
-
<developer>
<name>Jeff Brekke</name>
<id>brekke</id>
<email>ekkerbj@yahoo.com</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>Eric Dobbs</name>
<id>dobbs</id>
<email>eric@dobbse.net</email>
- <organization></organization>
+ <organization/>
</developer>
-
<developer>
<name>John McNally</name>
<id>jmcnally</id>
<email>jmcnally@collab.net</email>
<organization>CollabNet</organization>
</developer>
-
<developer>
<name>Martin Poeschl</name>
<id>mpoeschl</id>
<email>mpoeschl@marmot.at</email>
<organization>Zenplex</organization>
</developer>
-
<developer>
<name>Daniel Rall</name>
<id>dlr</id>
<email>dlr@finemaltcoding.com</email>
<organization>CollabNet</organization>
</developer>
-
<developer>
<name>Jon Scott Stevens</name>
<id>jon</id>
<email>jon@latchkey.com</email>
<organization>CollabNet, Inc.</organization>
</developer>
-
+ <developer>
+ <name>James Taylor</name>
+ <id>jtaylor</id>
+ <email>james@jamestaylor.org</email>
+ <organization/>
+ </developer>
<developer>
<name>Jason van Zyl</name>
<id>jvanzyl</id>
<email>jason@zenplex.com</email>
<organization>Zenplex</organization>
</developer>
-
</developers>
-
- <!-- Need to mark these as compile-time/run-time -->
-
<dependencies>
-
<dependency>
<name>jaf</name>
<type>required</type>
<version>1.0.1</version>
<jar>activation-1.0.1.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-cactus-framework-12</name>
<type>required</type>
<version>1.2</version>
<jar>cactus.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-cactus-ant</name>
<type>required</type>
<version>1.2</version>
<jar>cactus-ant.jar</jar>
</dependency>
-
<dependency>
<name>commons-beanutils</name>
<type>required</type>
<version>1.0</version>
<jar>commons-beanutils.jar</jar>
</dependency>
-
<dependency>
<name>commons-collections</name>
<type>required</type>
<version>1.0</version>
<jar>commons-collections.jar</jar>
</dependency>
-
<dependency>
<name>commons-lang</name>
<type>required</type>
<version>0.1</version>
<jar>commons-lang-0.1-dev.jar</jar>
</dependency>
-
+ <dependency>
+ <name>commons-logging</name>
+ <type>required</type>
+ <version>1.0</version>
+ <jar>commons-logging-1.0.jar</jar>
+ </dependency>
<dependency>
<name>commons-io</name>
<type>required</type>
<version>0.1</version>
<jar>commons-io.jar</jar>
</dependency>
-
<dependency>
<name>commons-http</name>
<type>required</type>
<version>1.1</version>
<jar>commons-http.jar</jar>
</dependency>
-
<dependency>
<name>dom4j</name>
<type>required</type>
<version>1.3</version>
<jar>dom4j-1.3.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-turbine-fulcrum</name>
<type>required</type>
<version>3.0-b2-dev</version>
<jar>fulcrum-3.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>commons-httpclient</name>
<type>required</type>
<version>1.0</version>
<jar>httpclient.jar</jar>
</dependency>
-
<dependency>
<name>httpunit</name>
<type>required</type>
<version>1.3</version>
<jar>httpunit.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-regexp</name>
<type>required</type>
<version>1.3-dev</version>
<jar>jakarta-regexp-1.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>junit</name>
<type>required</type>
<version>3.7</version>
<jar>junit-3.7.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-log4j</name>
<type>required</type>
<version>1.1.3</version>
<jar>log4j-1.1.3.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-servletapi</name>
<type>required</type>
<version>2.2</version>
<jar>servlet-2.2.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-turbine-stratum</name>
<type>required</type>
<version>1.0-b2-dev</version>
<jar>stratum-1.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>jtidy</name>
<type>required</type>
<version>04aug2001-r7-dev</version>
<jar>tidy.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-turbine-torque</name>
<type>required</type>
<version>3.0-b2-dev</version>
<jar>torque-3.0-b2-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-velocity</name>
<type>required</type>
<version>1.3-dev</version>
<jar>velocity-1.3-dev.jar</jar>
</dependency>
-
<dependency>
<name>jakarta-velocity-dvsl</name>
<type>documentation</type>
<version>0.43</version>
<jar>velocity-dvsl-0.43.jar</jar>
</dependency>
-
<dependency>
<name>xml-xerces</name>
<type>required</type>
<version>2.0.0</version>
<jar>xercesImpl-2.0.0.jar</jar>
</dependency>
-
<dependency>
<name>xml-apis</name>
<type>required</type>
<version>2.0.0</version>
<jar>xmlParserAPIs-2.0.0.jar</jar>
</dependency>
-
<dependency>
<name>commons-jxpath</name>
<type>required</type>
<version>0.1-dev</version>
<jar>commons-jxpath-0.1-dev.jar</jar>
</dependency>
-
<dependency>
<name>jgen</name>
<type>required</type>
<version>1.4-dev</version>
<jar>jgen-1.4-dev.jar</jar>
</dependency>
-
</dependencies>
-
<build>
-
<sourceDirectories>
<sourceDirectory>src/java</sourceDirectory>
<sourceDirectory>src/tool</sourceDirectory>
</sourceDirectories>
-
- <testSourceDirectories>
- <testSourceDirectory>src/test</testSourceDirectory>
- <testSourceDirectory>src/rttest</testSourceDirectory>
- </testSourceDirectories>
-
- <aspectSourceDirectories>
- </aspectSourceDirectories>
-
- <!-- Unit test classes -->
- <unitTestClassEntries>
- <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = **/*ServletTest.class</unitTestClassEntry>
- <unitTestClassEntry>exclude = org/mycompany/newapp/modules/screens/JGenTest.class</unitTestClassEntry>
- </unitTestClassEntries>
-
- <!-- Integration unit test classes -->
- <integrationUnitTestClassEntries>
- <integrationUnitTestClassEntry>include = **/*ServletTest.class</integrationUnitTestClassEntry>
- </integrationUnitTestClassEntries>
-
- <!-- J A R R E S O U R C E S -->
- <!-- Resources that are packaged up inside the JAR file -->
-
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+ <integrationUnitTestSourceDirectory>src/rttest</integrationUnitTestSourceDirectory>
+ <aspectSourceDirectories></aspectSourceDirectories>
+ <unitTestPatterns>
+ <unitTestPattern>include = **/*Test.java</unitTestPattern>
+ <unitTestPattern>exclude = **/*ServletTest.java</unitTestPattern>
+ <unitTestPattern>exclude = org/mycompany/newapp/modules/screens/JGenTest.java</unitTestPattern>
+ </unitTestPatterns>
+ <integrationUnitTestPatterns>
+ <integrationUnitTestPattern>include = **/*ServletTest.java</integrationUnitTestPattern>
+ </integrationUnitTestPatterns>
<jarResources>
- <jarResource>conf/**/*pipeline.xml</jarResource>
- <jarResource>conf/**/*valve.xml</jarResource>
+ <jarResource>conf/**/*pipeline.xml</jarResource>
+ <jarResource>conf/**/*valve.xml</jarResource>
</jarResources>
-
- <jars>
- </jars>
+ <jars></jars>
</build>
</project>
1.34 +47 -41 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Turbine.java 2 Apr 2002 01:48:09 -0000 1.33
+++ Turbine.java 9 Apr 2002 17:29:34 -0000 1.34
@@ -55,33 +55,31 @@
*/
import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.io.FileInputStream;
-import java.util.Enumeration;
+import java.io.IOException;
import java.util.Date;
-import java.util.Properties;
-import java.util.Vector;
import java.util.Iterator;
-import java.util.Hashtable;
+import java.util.Properties;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.Strings;
+
import org.apache.commons.http.HttpUtils;
+import org.apache.commons.lang.Strings;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
import org.apache.fulcrum.ServiceManager;
import org.apache.fulcrum.TurbineServices;
-import org.apache.log4j.Category;
import org.apache.stratum.configuration.Configuration;
import org.apache.stratum.configuration.PropertiesConfiguration;
import org.apache.stratum.xo.Mapper;
import org.apache.turbine.modules.ModuleLoader;
-import org.apache.turbine.pipeline.DefaultTargetValve;
import org.apache.turbine.pipeline.TurbinePipeline;
import org.apache.turbine.services.rundata.RunDataService;
+import org.apache.log4j.PropertyConfigurator;
/**
* Turbine is the main servlet for the entire system. It is <code>final</code>
@@ -123,12 +121,15 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: Turbine.java,v 1.33 2002/04/02 01:48:09 jon Exp $
+ * @version $Id: Turbine.java,v 1.34 2002/04/09 17:29:34 jtaylor Exp $
*/
public class Turbine
extends HttpServlet
implements TurbineConstants
{
+ private static final Log log
+ = LogFactory.getLog( Turbine.class );
+
/**
* In certain situations the init() method is called more than once,
* somtimes even concurrently. This causes bad things to happen,
@@ -168,7 +169,7 @@
{
if (!firstInit)
{
- Log.warn("Double initializaton of Turbine was attempted!");
+ log.warn("Double initializaton of Turbine was attempted!");
return;
}
// executing init will trigger some static initializers, so we have
@@ -186,10 +187,10 @@
// save the exception to complain loudly later :-)
initFailure = e;
System.err.println(Strings.stackTrace(e));
- Log.info("Turbine: init() failed: " + Strings.stackTrace(e));
+ log.info("init failed: " + Strings.stackTrace(e));
return;
}
- Log.info("Turbine: init() Ready to Rumble!");
+ log.info("init complete, Ready to Rumble!");
}
}
@@ -231,7 +232,7 @@
TurbineServices.getInstance().shutdownServices();
System.gc();
- Log.info("Turbine: Done shutting down!");
+ log.info("Done shutting down!");
}
/**
@@ -353,7 +354,7 @@
}
catch (Exception e)
{
- Log.debug("Turbine.closeOutputStream: " + e.getMessage());
+ log.debug("closeOutputStream: " + e.getMessage());
}
}
@@ -367,8 +368,9 @@
* on the screen.
*
* @param data A Turbine RunData object.
+ * @param req Servlet request.
* @param res Servlet response.
- * @param e The exception to report.
+ * @param t The exception to report.
*/
private final void handleException(RunData data,
HttpServletRequest req,
@@ -377,8 +379,8 @@
throws ServletException
{
// make sure that the stack trace makes it the log
- Log.error("Turbine.handleException: " + t.getMessage());
- Log.error(t);
+ log.error("handleException: " + t.getMessage());
+ log.error(t);
if ( INTEGRATED.equals(configuration.getString(MODE)) ||
req.getAttribute(INTEGRATED_REQUEST_KEY) != null )
@@ -394,7 +396,7 @@
}
catch (Exception f)
{
- Log.error( "Failed to dispatch to exception handler", f );
+ log.error( "Failed to dispatch to exception handler", f );
String mimeType = "text/plain";
@@ -427,8 +429,8 @@
}
catch (IOException ignored) {}
- Log.info ( data.getStackTrace() );
- Log.error ( e.getMessage(), e );
+ log.info ( data.getStackTrace() );
+ log.error ( e.getMessage(), e );
}
// Attempt to do *something* at this point...
catch ( Throwable reallyScrewedNow )
@@ -452,7 +454,7 @@
catch (Exception ignored)
{
}
- Log.error(reallyScrewedNow.getMessage(), reallyScrewedNow);
+ log.error(reallyScrewedNow.getMessage(), reallyScrewedNow);
}
}
}
@@ -590,10 +592,14 @@
p.load(new FileInputStream(propsPath));
p.setProperty(APPLICATION_ROOT, getApplicationRoot());
- // We are still using our Log facade but we
- // should move toward using log4j correctly.
- Log.setProperties(p);
- Log.init();
+ // FIXME: Configures log4j directly with the supplied properties. The
+ // plan is to eliminate this, and instead allow logging to be
+ // initialized by a component, which could init any logging
+ // mechanism supported by commons-logging. However it is
+ // important that logging be intialized early, so we will need
+ // to address that in the component loader.
+
+ PropertyConfigurator.configure(p);
// We want to save the ServletConfig and
// ServletContext so that we can share these objects
@@ -648,7 +654,7 @@
resolverClass = configuration.getString(RESOLVER,
"org.apache.turbine.pipeline.DefaultResolver");
- Log.debug("[Turbine] Using Resolver: " + resolverClass);
+ log.debug("Using Resolver: " + resolverClass);
resolver = (Resolver) Class.forName(resolverClass).newInstance();
resolver.init();
@@ -670,7 +676,7 @@
{
String name = (String) k.next();
String value = systemProperties.getString(name);
- Log.debug("[Turbine] System Property: " + name + " => " + value);
+ log.debug("System Property: " + name + " => " + value);
System.getProperties().setProperty(name, value);
}
}
@@ -681,7 +687,7 @@
Class pipelineClass = Class.forName
(configuration.getString("pipeline.default", STANDARD_PIPELINE));
- Log.debug("[Turbine] Using Pipeline: " + pipelineClass.getName());
+ log.debug("Using Pipeline: " + pipelineClass.getName());
if (TurbinePipeline.class.isAssignableFrom(pipelineClass))
{
// Turbine's standard Pipeline implementation uses
@@ -689,7 +695,7 @@
String descriptorPath = configuration.getString(
"pipeline.default.descriptor", TurbinePipeline.CLASSIC_PIPELINE);
- Log.debug("[Turbine] Using descriptor path: " + descriptorPath);
+ log.debug("Using descriptor path: " + descriptorPath);
Mapper m = new Mapper();
pipeline = (Pipeline) m.map(descriptorPath,pipelineClass.getName());
}
@@ -701,19 +707,19 @@
pipeline = (Pipeline) pipelineClass.newInstance();
}
- Log.debug("[Turbine] initialize pipeline");
+ log.debug("Initializing pipeline");
pipeline.initialize();
- Log.debug("[Turbine] Getting rundataservice: ");
+ log.debug("Getting rundataservice: ");
// Setup the RunData service for the application
runDataService = (RunDataService) TurbineServices.getInstance()
.getService(RunDataService.SERVICE_NAME);
- Log.debug("[Turbine] rundataservice: " + runDataService);
+ log.debug("RunDataService: " + runDataService);
}
catch (Throwable e)
{
e.printStackTrace();
- Log.error(e);
+ log.error(e);
throw new TurbineException(e);
}
}
@@ -772,7 +778,7 @@
* it can be utilized by object instances that do not
* have direct access to RunData.
*
- * @param RunData
+ * @param data
*/
public static synchronized void saveServletInfo(RunData data)
{
@@ -785,11 +791,11 @@
/**
* Set the application root for the webapp.
*
- * @param String app root
+ * @param val New app root.
*/
- public static void setApplicationRoot(String v)
+ public static void setApplicationRoot(String val)
{
- applicationRoot = v;
+ applicationRoot = val;
}
/**
@@ -805,7 +811,7 @@
/**
* Get the expanded path relative to the app root.
*
- * @param String path.
+ * @param path Relative path to translate.
*/
public static String getRealPath(String path)
{
@@ -857,7 +863,7 @@
/**
* Set the servlet config for this turbine webapp.
*
- * @param ServletConfig
+ * @param s New servlet config
*/
public static void setTurbineServletConfig(ServletConfig s)
{
@@ -877,7 +883,7 @@
/**
* Set the servlet context for this turbine webapp.
*
- * @param ServletContext
+ * @param s New servlet context.
*/
public static void setTurbineServletContext(ServletContext s)
{
1.5 +7 -4 jakarta-turbine-3/src/java/org/apache/turbine/TurbineConfig.java
Index: TurbineConfig.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/TurbineConfig.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TurbineConfig.java 9 Feb 2002 21:39:29 -0000 1.4
+++ TurbineConfig.java 9 Apr 2002 17:29:34 -0000 1.5
@@ -59,10 +59,8 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
-import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -74,6 +72,8 @@
import javax.servlet.ServletContext;
import org.apache.turbine.Turbine;
import org.apache.turbine.RunData;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
* A class used for initalization of Turbine without a servlet container.
@@ -100,10 +100,13 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: TurbineConfig.java,v 1.4 2002/02/09 21:39:29 dlr Exp $
+ * @version $Id: TurbineConfig.java,v 1.5 2002/04/09 17:29:34 jtaylor Exp $
*/
public class TurbineConfig implements ServletConfig, ServletContext
{
+ private static final Log log
+ = LogFactory.getLog( TurbineConfig.class );
+
/**
* Servlet initialization parameter name for the path to the
* TurbineResources.properties file (<code>properties</code>).
@@ -183,7 +186,7 @@
String msg = "TurbineConfig: Initialization failed";
try
{
- Log.error(msg, e);
+ log.error(msg, e);
}
catch (Throwable t)
{
1.10 +6 -4 jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java
Index: ModuleLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/ModuleLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ModuleLoader.java 20 Mar 2002 01:55:28 -0000 1.9
+++ ModuleLoader.java 9 Apr 2002 17:29:34 -0000 1.10
@@ -63,7 +63,8 @@
import org.apache.turbine.TurbineException;
import org.apache.commons.collections.FastArrayList;
import org.apache.commons.collections.FastHashMap;
-import org.apache.turbine.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
import org.apache.turbine.pipeline.PipelineUtil;
@@ -72,10 +73,11 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: ModuleLoader.java,v 1.9 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: ModuleLoader.java,v 1.10 2002/04/09 17:29:34 jtaylor Exp $
*/
public class ModuleLoader
{
+ private static final Log log = LogFactory.getLog( ModuleLoader.class );
/**
* Module packages for this module loader.
*/
@@ -215,9 +217,9 @@
try
{
- Log.debug("[ModuleLoader] Looking for " + moduleClass);
+ log.debug("Looking for " + moduleClass);
module = (Module) Class.forName(moduleClass).newInstance();
- Log.debug("[ModuleLoader] " + name + " => " + moduleClass);
+ log.debug("Mapped " + name + " to " + moduleClass);
break;
}
catch (Exception ignored)
1.5 +1 -3 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/AccessController.java
Index: AccessController.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/AccessController.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AccessController.java 28 Dec 2001 02:05:41 -0000 1.4
+++ AccessController.java 9 Apr 2002 17:29:34 -0000 1.5
@@ -56,11 +56,9 @@
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Action;
-import org.apache.turbine.Log;
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.fulcrum.security.util.AccessControlList;
-
/**
* This action doPerforms an Access Control List and places it into
* the RunData object, so it is easily available to modules. The ACL
@@ -91,7 +89,7 @@
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
* @author <a href="mailto:bmclaugh@algx.net">Brett McLaughlin</a>
- * @version $Id: AccessController.java,v 1.4 2001/12/28 02:05:41 dlr Exp $
+ * @version $Id: AccessController.java,v 1.5 2002/04/09 17:29:34 jtaylor Exp $
*/
public class AccessController
extends Action
1.4 +7 -4 jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/LoginUser.java
Index: LoginUser.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/modules/actions/LoginUser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoginUser.java 8 Oct 2001 21:11:45 -0000 1.3
+++ LoginUser.java 9 Apr 2002 17:29:34 -0000 1.4
@@ -59,9 +59,10 @@
import org.apache.turbine.modules.Action;
import org.apache.fulcrum.security.TurbineSecurity;
import org.apache.fulcrum.security.entity.User;
-import org.apache.turbine.Log;
import org.apache.fulcrum.security.util.DataBackendException;
import org.apache.fulcrum.security.util.TurbineSecurityException;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
* This is where we authenticate the user logging into the system
@@ -69,11 +70,13 @@
* that users last login time will be updated.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: LoginUser.java,v 1.3 2001/10/08 21:11:45 dlr Exp $
+ * @version $Id: LoginUser.java,v 1.4 2002/04/09 17:29:34 jtaylor Exp $
*/
public class LoginUser
extends Action
{
+ private static final Log log = LogFactory.getLog( LoginUser.class );
+
/**
* Updates the user's LastLogin timestamp, sets their state to
* "logged in" and calls RunData.setUser() . If the user cannot
@@ -86,7 +89,7 @@
* method</em></p>
*
* @param data Turbine information.
- * @exception Exception, a generic exception.
+ * @exception Exception a generic exception.
*/
public void doPerform( RunData data )
throws Exception
@@ -135,7 +138,7 @@
{
if(e instanceof DataBackendException)
{
- Log.error(e);
+ log.error(e);
}
data.setMessage(Turbine.getConfiguration().getString(
1.2 +4 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ConditionalValve.java
Index: ConditionalValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ConditionalValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConditionalValve.java 11 Feb 2002 23:58:05 -0000 1.1
+++ ConditionalValve.java 9 Apr 2002 17:29:34 -0000 1.2
@@ -62,7 +62,8 @@
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Valve that conditionally executes a set of valves (internally
@@ -70,13 +71,12 @@
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: ConditionalValve.java,v 1.1 2002/02/11 23:58:05 jtaylor Exp $
+ * @version $Id: ConditionalValve.java,v 1.2 2002/04/09 17:29:34 jtaylor Exp $
*/
public abstract class ConditionalValve
extends BranchPointValve
{
- private static final Category log =
- Category.getInstance( ConditionalValve.class );
+ private static final Log log = LogFactory.getLog( ConditionalValve.class );
/**
* Sets up our <code>TurbinePipeline</code> instance.
1.5 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java
Index: DefaultACLCreationValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultACLCreationValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultACLCreationValve.java 20 Mar 2002 01:55:28 -0000 1.4
+++ DefaultACLCreationValve.java 9 Apr 2002 17:29:34 -0000 1.5
@@ -56,8 +56,6 @@
import java.io.IOException;
-import org.apache.log4j.Category;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
@@ -72,15 +70,12 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: DefaultACLCreationValve.java,v 1.4 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DefaultACLCreationValve.java,v 1.5 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultACLCreationValve
extends AbstractValve
implements TurbineConstants
{
- private static final Category log =
- Category.getInstance(DefaultACLCreationValve.class);
-
protected AccessController accessController = null;
/**
1.10 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java
Index: DefaultActionValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultActionValve.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultActionValve.java 20 Mar 2002 01:55:28 -0000 1.9
+++ DefaultActionValve.java 9 Apr 2002 17:29:34 -0000 1.10
@@ -56,8 +56,6 @@
import java.io.IOException;
-import org.apache.log4j.Category;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
@@ -74,15 +72,12 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: DefaultActionValve.java,v 1.9 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DefaultActionValve.java,v 1.10 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultActionValve
extends AbstractValve
implements TurbineConstants
{
- private static final Category log =
- Category.getInstance(DefaultActionValve.class);
-
/**
* Here we can setup objects that are thread safe and can be
* reused. We setup the session validator and the access
1.6 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java
Index: DefaultLoginValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultLoginValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultLoginValve.java 20 Mar 2002 01:55:28 -0000 1.5
+++ DefaultLoginValve.java 9 Apr 2002 17:29:34 -0000 1.6
@@ -58,8 +58,6 @@
import java.util.Enumeration;
-import org.apache.log4j.Category;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
@@ -73,15 +71,12 @@
* cycle.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: DefaultLoginValve.java,v 1.5 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DefaultLoginValve.java,v 1.6 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultLoginValve
extends AbstractValve
implements TurbineConstants
{
- private static final Category log =
- Category.getInstance(DefaultLoginValve.class);
-
/**
* Here we can setup objects that are thread safe and can be
* reused. We setup the session validator and the access
1.16 +5 -5 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java
Index: DefaultResolver.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultResolver.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultResolver.java 22 Mar 2002 02:03:58 -0000 1.15
+++ DefaultResolver.java 9 Apr 2002 17:29:34 -0000 1.16
@@ -61,7 +61,8 @@
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.Resolver;
import org.apache.turbine.modules.Module;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
// Renderers and context builders
// We need to match up the target template with sibling
@@ -132,13 +133,12 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
- * @version $Id: DefaultResolver.java,v 1.15 2002/03/22 02:03:58 jtaylor Exp $
+ * @version $Id: DefaultResolver.java,v 1.16 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultResolver
implements Resolver, TurbineConstants
{
- private static final Category log =
- Category.getInstance(DefaultResolver.class);
+ private static final Log log = LogFactory.getLog(DefaultResolver.class);
protected String defaultTemplate;
@@ -190,7 +190,7 @@
throws Exception
{
StringBuffer sb = new StringBuffer();
- int i = PipelineUtil.parseTemplatePath(targetTemplate, sb);
+ PipelineUtil.parseTemplatePath(targetTemplate, sb);
Iterator j = getPossibleTemplates(sb.toString());
while (j.hasNext())
1.6 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java
Index: DefaultSessionTimeoutValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionTimeoutValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultSessionTimeoutValve.java 1 Apr 2002 19:07:06 -0000 1.5
+++ DefaultSessionTimeoutValve.java 9 Apr 2002 17:29:34 -0000 1.6
@@ -55,7 +55,6 @@
*/
import java.io.IOException;
-import java.util.Enumeration;
import org.apache.stratum.configuration.Configuration;
import org.apache.turbine.Turbine;
@@ -64,7 +63,6 @@
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
-import org.apache.log4j.Category;
/**
* Implements the action portion of the "Turbine classic" processing
@@ -72,15 +70,12 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: DefaultSessionTimeoutValve.java,v 1.5 2002/04/01 19:07:06 jmcnally Exp $
+ * @version $Id: DefaultSessionTimeoutValve.java,v 1.6 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultSessionTimeoutValve
extends AbstractValve
implements TurbineConstants
{
- private static final Category log =
- Category.getInstance(DefaultSessionTimeoutValve.class);
-
protected Integer timeout = null;
/**
1.5 +1 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java
Index: DefaultSessionValidationValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultSessionValidationValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultSessionValidationValve.java 20 Mar 2002 01:55:28 -0000 1.4
+++ DefaultSessionValidationValve.java 9 Apr 2002 17:29:34 -0000 1.5
@@ -56,8 +56,6 @@
import java.io.IOException;
-import org.apache.log4j.Category;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.Resolver;
@@ -72,15 +70,12 @@
* pipeline (from the Turbine 2.x series).
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: DefaultSessionValidationValve.java,v 1.4 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DefaultSessionValidationValve.java,v 1.5 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultSessionValidationValve
extends AbstractValve
implements TurbineConstants
{
- private static final Category log =
- Category.getInstance(DefaultSessionValidationValve.class);
-
protected SessionValidator sessionValidator = null;
/**
1.14 +5 -11 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
Index: DefaultTargetValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- DefaultTargetValve.java 5 Mar 2002 01:32:34 -0000 1.13
+++ DefaultTargetValve.java 9 Apr 2002 17:29:34 -0000 1.14
@@ -55,22 +55,17 @@
*/
import java.io.IOException;
-import java.util.Enumeration;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.security.util.AccessControlList;
import org.apache.stratum.configuration.Configuration;
-import org.apache.turbine.DynamicURI;
-import org.apache.turbine.Turbine;
-import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
-import org.apache.turbine.Resolver;
import org.apache.turbine.TemplateContext;
+import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
import org.apache.turbine.modules.Module;
-import org.apache.turbine.modules.actions.AccessController;
-import org.apache.log4j.Category;
/**
* Implements the RunData target portion of the "Turbine classic"
@@ -82,13 +77,12 @@
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
* @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @version $Id: DefaultTargetValve.java,v 1.13 2002/03/05 01:32:34 jon Exp $
+ * @version $Id: DefaultTargetValve.java,v 1.14 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DefaultTargetValve
extends AbstractValve
{
- private static final Category log =
- Category.getInstance(DefaultTargetValve.class);
+ private static final Log log = LogFactory.getLog(DefaultTargetValve.class);
protected static final String DEFAULT_MODULE_TYPE = "screens";
1.3 +4 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineActionValve.java
Index: DetermineActionValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineActionValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DetermineActionValve.java 24 Jan 2002 03:55:26 -0000 1.2
+++ DetermineActionValve.java 9 Apr 2002 17:29:34 -0000 1.3
@@ -55,13 +55,13 @@
*/
import java.io.IOException;
-import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* This valve is responsible for setting the 'action' property of RunData based
@@ -73,8 +73,8 @@
public class DetermineActionValve
extends AbstractValve
{
- private static final Category log =
- Category.getInstance( DetermineActionValve.class );
+ private static final Log log
+ = LogFactory.getLog( DetermineActionValve.class );
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
1.3 +4 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java
Index: DetermineTargetValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DetermineTargetValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DetermineTargetValve.java 24 Jan 2002 03:55:26 -0000 1.2
+++ DetermineTargetValve.java 9 Apr 2002 17:29:34 -0000 1.3
@@ -56,12 +56,12 @@
import java.io.IOException;
import org.apache.turbine.Turbine;
-import org.apache.turbine.TurbineConstants;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* This valve is responsible for setting the 'target' property of the RunData.
@@ -77,8 +77,8 @@
public class DetermineTargetValve
extends AbstractValve
{
- private static final Category log =
- Category.getInstance( DetermineTargetValve.class );
+ private static final Log log
+ = LogFactory.getLog( DetermineTargetValve.class );
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
1.7 +4 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectRenderer.java
Index: DirectRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DirectRenderer.java 20 Mar 2002 01:55:28 -0000 1.6
+++ DirectRenderer.java 9 Apr 2002 17:29:34 -0000 1.7
@@ -58,7 +58,8 @@
import org.apache.turbine.modules.Module;
import org.apache.turbine.TemplateContext;
import org.apache.turbine.TurbineException;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Helper class for rendering templates. Unlike its parent, it renders directly
@@ -68,13 +69,12 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:jmcnally@collab.net">John McNally</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: DirectRenderer.java,v 1.6 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DirectRenderer.java,v 1.7 2002/04/09 17:29:34 jtaylor Exp $
*/
public class DirectRenderer
extends Renderer
{
- private static final Category log =
- Category.getInstance(DirectRenderer.class);
+ private static final Log log = LogFactory.getLog(DirectRenderer.class);
private static final String EMPTY = "";
1.6 +4 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectTargetValve.java
Index: DirectTargetValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DirectTargetValve.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DirectTargetValve.java 20 Mar 2002 01:55:28 -0000 1.5
+++ DirectTargetValve.java 9 Apr 2002 17:29:34 -0000 1.6
@@ -56,7 +56,8 @@
import org.apache.turbine.RunData;
import org.apache.turbine.TemplateContext;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* This <code>Valve</code> overrides the <code>render()</code> method
@@ -68,14 +69,13 @@
* @author <a href="mailto:jmcnally@apache.org">John McNally</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: DirectTargetValve.java,v 1.5 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: DirectTargetValve.java,v 1.6 2002/04/09 17:29:34 jtaylor Exp $
* @see org.apache.turbine.pipeline.ClassicPipeline
*/
public class DirectTargetValve
extends DefaultTargetValve
{
- private static final Category log =
- Category.getInstance(DirectTargetValve.class);
+ private static final Log log = LogFactory.getLog(DirectTargetValve.class);
/**
* Renders and writes result to the output stream in an
1.4 +5 -7 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JGenRenderer.java
Index: JGenRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JGenRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JGenRenderer.java 7 Mar 2002 23:46:44 -0000 1.3
+++ JGenRenderer.java 9 Apr 2002 17:29:34 -0000 1.4
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
import java.io.IOException;
import java.util.Iterator;
@@ -65,13 +64,13 @@
import javax.servlet.ServletException;
import org.apache.turbine.TemplateContext;
-import org.apache.turbine.Log;
import org.apache.turbine.RunData;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineException;
import org.apache.turbine.modules.Module;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import com.iv.flash.util.Util;
import com.iv.flash.context.Context;
@@ -85,7 +84,7 @@
* context. The template context is wrapped in a JGenerator BeanContext.
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: JGenRenderer.java,v 1.3 2002/03/07 23:46:44 jmcnally Exp $
+ * @version $Id: JGenRenderer.java,v 1.4 2002/04/09 17:29:34 jtaylor Exp $
*/
public class JGenRenderer
{
@@ -101,8 +100,7 @@
Util.init( Turbine.getRealPath( "/WEB-INF/conf" ) );
}
- private static final Category log =
- Category.getInstance( JGenRenderer.class );
+ private static final Log log = LogFactory.getLog( JGenRenderer.class );
/**
* RunData of the request this Renderer is for.
@@ -120,7 +118,7 @@
/**
* Process the request
*
- * @param String the filename of the template.
+ * @param target the filename of the template.
* @throws TurbineException Any exception trown while processing will be
* wrapped into a TurbineException and rethrown.
*/
1.2 +4 -7 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JGenRendererValve.java
Index: JGenRendererValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JGenRendererValve.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JGenRendererValve.java 11 Feb 2002 23:58:05 -0000 1.1
+++ JGenRendererValve.java 9 Apr 2002 17:29:34 -0000 1.2
@@ -55,27 +55,24 @@
*/
import java.io.IOException;
-import java.util.Enumeration;
-import org.apache.turbine.Turbine;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.turbine.RunData;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
-import org.apache.log4j.Category;
/**
* Valve that delegates to JGenRenderer to produce a view based on a SWT (flash
* movie template)
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: JGenRendererValve.java,v 1.1 2002/02/11 23:58:05 jtaylor Exp $
+ * @version $Id: JGenRendererValve.java,v 1.2 2002/04/09 17:29:34 jtaylor Exp $
*/
public class JGenRendererValve
extends AbstractValve
{
- private static final Category log =
- Category.getInstance( JGenRendererValve.class );
+ private static final Log log = LogFactory.getLog( JGenRendererValve.class );
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
1.3 +10 -19 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRenderer.java
Index: JspRenderer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JspRenderer.java 7 Mar 2002 23:46:44 -0000 1.2
+++ JspRenderer.java 9 Apr 2002 17:29:35 -0000 1.3
@@ -54,42 +54,33 @@
* <http://www.apache.org/>.
*/
-import java.io.File;
-import java.io.IOException;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import org.apache.turbine.Log;
+import org.apache.commons.lang.Strings;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.turbine.RunData;
-import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineException;
-import org.apache.log4j.Category;
-import org.apache.commons.lang.Strings;
-
/**
* Valve to call the JspRenderer.
*
* @author <a href="mailto:jvanzyl@zenplex.com">Jason van Zyl</a>
- * @version $Id: JspRenderer.java,v 1.2 2002/03/07 23:46:44 jmcnally Exp $
+ * @version $Id: JspRenderer.java,v 1.3 2002/04/09 17:29:35 jtaylor Exp $
*/
public class JspRenderer
{
+ private static final Log log = LogFactory.getLog(JspRenderer.class);
+
/** The base path[s] prepended to filenames given in arguments */
private String[] templatePaths;
-
+
/** The relative path[s] prepended to filenames */
private String[] relativeTemplatePaths;
/** The buffer size for the output stream. */
private int bufferSize;
- private static final Category log =
- Category.getInstance(JspRenderer.class);
-
/**
* RunData of the request this Renderer is for.
*/
@@ -105,7 +96,7 @@
/**
* The buffer size
- *
+ *
*/
public int getDefaultBufferSize()
{
@@ -114,8 +105,8 @@
/**
* Process the request
- *
- * @param RunData
+ *
+ * @param RunData
* @param String the filename of the template.
* @throws TurbineException Any exception trown while processing will be
* wrapped into a TurbineException and rethrown.
1.4 +4 -4 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRendererValve.java
Index: JspRendererValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/JspRendererValve.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspRendererValve.java 20 Mar 2002 01:55:28 -0000 1.3
+++ JspRendererValve.java 9 Apr 2002 17:29:35 -0000 1.4
@@ -60,20 +60,20 @@
import org.apache.turbine.TurbineException;
import org.apache.turbine.Valve;
import org.apache.turbine.ValveContext;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Valve that delegates to JspRenderer to produce a view
* based on JSP.
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: JspRendererValve.java,v 1.3 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: JspRendererValve.java,v 1.4 2002/04/09 17:29:35 jtaylor Exp $
*/
public class JspRendererValve
extends AbstractValve
{
- private static final Category log =
- Category.getInstance(JspRendererValve.class);
+ private static final Log log = LogFactory.getLog(JspRendererValve.class);
/**
* @see org.apache.turbine.Valve#invoke(RunData, ValveContext)
1.4 +6 -5 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ModuleRunner.java
Index: ModuleRunner.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/ModuleRunner.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModuleRunner.java 20 Mar 2002 01:55:28 -0000 1.3
+++ ModuleRunner.java 9 Apr 2002 17:29:35 -0000 1.4
@@ -58,16 +58,18 @@
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Module;
import org.apache.turbine.TurbineException;
-import org.apache.turbine.Log;
-
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
* This class is used execute the module chain.
*
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
- * @version $Id: ModuleRunner.java,v 1.3 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: ModuleRunner.java,v 1.4 2002/04/09 17:29:35 jtaylor Exp $
*/
public class ModuleRunner
{
+ private static final Log log = LogFactory.getLog( ModuleRunner.class );
+
public void run(String moduleType, RunData data)
throws TurbineException,Exception
{
@@ -78,8 +80,7 @@
target = getTarget(data);
while(! oldTarget.equals(target))
{
- Log.debug("[ClassicPipeline] module to run => " +
- moduleType + ":" + target);
+ log.debug("Module to run: " + moduleType + ":" + target);
module = Turbine.getResolver().getModule(moduleType, target);
module.execute(data);
1.8 +4 -5 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/Renderer.java
Index: Renderer.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/Renderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Renderer.java 19 Jan 2002 03:23:26 -0000 1.7
+++ Renderer.java 9 Apr 2002 17:29:35 -0000 1.8
@@ -55,12 +55,12 @@
*/
import org.apache.turbine.Turbine;
-import org.apache.turbine.Resolver;
import org.apache.turbine.RunData;
import org.apache.turbine.modules.Module;
import org.apache.turbine.TurbineException;
import org.apache.turbine.TemplateContext;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Helper class for rendering templates. This is used by valves to render
@@ -75,12 +75,11 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:mikeh@apache.org">Mike Haberman</a>
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: Renderer.java,v 1.7 2002/01/19 03:23:26 jvanzyl Exp $
+ * @version $Id: Renderer.java,v 1.8 2002/04/09 17:29:35 jtaylor Exp $
*/
public class Renderer
{
- private static final Category log =
- Category.getInstance(Renderer.class);
+ private static final Log log = LogFactory.getLog(Renderer.class);
/**
* RunData of the request this Renderer is for.
1.7 +4 -7 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java
Index: RunModulesValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/RunModulesValve.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RunModulesValve.java 20 Mar 2002 01:55:28 -0000 1.6
+++ RunModulesValve.java 9 Apr 2002 17:29:35 -0000 1.7
@@ -64,7 +64,8 @@
import org.apache.turbine.Resolver;
import org.apache.turbine.modules.Module;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Valve which determines the target for a request and runs the modules
@@ -73,16 +74,12 @@
* release 2
*
* @author <a href="mailto:jtaylor@apache.org">James Taylor</a>
- * @version $Id: RunModulesValve.java,v 1.6 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: RunModulesValve.java,v 1.7 2002/04/09 17:29:35 jtaylor Exp $
*/
public class RunModulesValve
extends AbstractValve
{
- /**
- * Log4j category used for logging.
- */
- private static final Category log =
- Category.getInstance( RunModulesValve.class );
+ private static final Log log = LogFactory.getLog( RunModulesValve.class );
/**
* The default target module used for building up the
1.3 +5 -6 jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TargetExtensionConditionalValve.java
Index: TargetExtensionConditionalValve.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/TargetExtensionConditionalValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TargetExtensionConditionalValve.java 20 Mar 2002 01:55:28 -0000 1.2
+++ TargetExtensionConditionalValve.java 9 Apr 2002 17:29:35 -0000 1.3
@@ -54,24 +54,23 @@
* <http://www.apache.org/>.
*/
-import java.io.IOException;
-
import org.apache.turbine.RunData;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* Conditional valve that tests if the extentsion of the target (if it exists)
* matches a given value.
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: TargetExtensionConditionalValve.java,v 1.2 2002/03/20 01:55:28 brekke Exp $
+ * @version $Id: TargetExtensionConditionalValve.java,v 1.3 2002/04/09 17:29:35 jtaylor Exp $
*/
public class TargetExtensionConditionalValve
extends ConditionalValve
{
- private static final Category log =
- Category.getInstance( TargetExtensionConditionalValve.class );
+ private static final Log log
+ = LogFactory.getLog( TargetExtensionConditionalValve.class );
/** Value to require */
private String extension;
1.12 +11 -10 jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultTurbineRunData.java 5 Mar 2002 01:32:34 -0000 1.11
+++ DefaultTurbineRunData.java 9 Apr 2002 17:29:35 -0000 1.12
@@ -64,7 +64,6 @@
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.turbine.RunData;
import org.apache.turbine.Turbine;
import org.apache.turbine.ParameterParser;
import org.apache.fulcrum.security.util.AccessControlList;
@@ -73,10 +72,10 @@
import org.apache.fulcrum.localization.Localization;
import org.apache.fulcrum.mimetype.TurbineMimeTypes;
import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.template.TurbineTemplate;
import org.apache.fulcrum.util.parser.CookieParser;
import org.apache.commons.collections.FastHashMap;
-import org.apache.log4j.Category;
+import org.apache.commons.logging.LogFactory;
+import org.apache.commons.logging.Log;
/**
* DefaultTurbineRunData is the default implementation of the
@@ -97,13 +96,16 @@
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
* @author <a href="mailto:bhoeneis@ee.ethz.ch">Bernie Hoeneisen</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: DefaultTurbineRunData.java,v 1.11 2002/03/05 01:32:34 jon Exp $
+ * @version $Id: DefaultTurbineRunData.java,v 1.12 2002/04/09 17:29:35 jtaylor Exp $
*/
public class DefaultTurbineRunData
extends RecyclableSupport
implements TurbineRunData,
Recyclable
{
+ private static final Log log
+ = LogFactory.getLog( DefaultTurbineRunData.class );
+
/**
* The default locale.
*/
@@ -607,17 +609,15 @@
}
catch (ClassCastException e)
{
- Category category = Category.getInstance(
- "org.apache.turbine.services.rundata.DefaultTurbineRunData");
String message = "User object did not implement User interface. "
+ "if you are sure the interface is implemented, the user " +
"object in the session and this class may be loaded from " +
"different classloaders. This has been known to happen " +
"when using multiple turbine apps in tomcat that interact " +
"through the use of RequestDispatcher.include or forward.";
- if ( category != null )
+ if ( log != null )
{
- category.error(message, e);
+ log.error(message, e);
}
else
{
@@ -729,9 +729,10 @@
}
/**
- * Gets the print writer. *
+ * Gets the print writer.
+ *
* @return a print writer.
- * @throws IOException.
+ * @throws IOException
*/
public PrintWriter getOut()
throws IOException
1.3 +10 -8 jakarta-turbine-3/src/tool/org/apache/turbine/tool/UIManager.java
Index: UIManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/UIManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- UIManager.java 3 Sep 2001 02:01:59 -0000 1.2
+++ UIManager.java 9 Apr 2002 17:29:35 -0000 1.3
@@ -55,14 +55,14 @@
*/
import java.io.FileInputStream;
-import java.util.Hashtable;
import java.util.Properties;
import org.apache.turbine.Turbine;
-import org.apache.turbine.Log;
import org.apache.turbine.RunData;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.services.pull.TurbinePull;
import org.apache.fulcrum.security.entity.User;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* UIManager.java
@@ -100,10 +100,12 @@
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
* @author <a href="mailto:james_coltman@majorband.co.uk">James Coltman</a>
- * @version $Id: UIManager.java,v 1.2 2001/09/03 02:01:59 jvanzyl Exp $
+ * @version $Id: UIManager.java,v 1.3 2002/04/09 17:29:35 jtaylor Exp $
*/
public class UIManager implements ApplicationTool
{
+ private static final Log log = LogFactory.getLog( UIManager.class );
+
/**
* The location of the skins within the application
* resources directory.
@@ -185,17 +187,17 @@
if (data == null)
{
- Log.debug("UI Manager scope is global");
+ log.debug("UI Manager scope is global");
setSkin();
}
else if (data instanceof RunData)
{
- Log.debug("UI Manager scope is request");
+ log.debug("UI Manager scope is request");
setSkin((RunData) data);
}
else if (data instanceof User)
{
- Log.debug("UI Manager scope is session");
+ log.debug("UI Manager scope is session");
setSkin((User) data);
}
@@ -214,7 +216,7 @@
*/
public void refresh()
{
- Log.debug("Refreshing UI manager");
+ log.debug("Refreshing UI manager");
loadSkin();
}
@@ -368,7 +370,7 @@
}
catch (Exception e)
{
- Log.error("Cannot load skin: " + skinName);
+ log.error("Cannot load skin: " + skinName);
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>