You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2002/07/23 20:09:10 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/pipeline JspRenderer.java
jmcnally 2002/07/23 11:09:10
Modified: . project.xml
src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/exception
DefaultExceptionHandler.java
src/java/org/apache/turbine/pipeline JspRenderer.java
Log:
updating commons-lang
Revision Changes Path
1.33 +1 -1 jakarta-turbine-3/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/project.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- project.xml 4 Jun 2002 00:53:07 -0000 1.32
+++ project.xml 23 Jul 2002 18:09:10 -0000 1.33
@@ -126,7 +126,7 @@
</dependency>
<dependency>
<id>commons-lang</id>
- <version>1.0-dev</version>
+ <version>1.0-dev-20020716</version>
</dependency>
<dependency>
<id>commons-logging</id>
1.42 +7 -7 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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- Turbine.java 11 Jun 2002 02:24:02 -0000 1.41
+++ Turbine.java 23 Jul 2002 18:09:10 -0000 1.42
@@ -68,7 +68,7 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.http.HttpUtils;
-import org.apache.commons.lang.Strings;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.xo.Mapper;
@@ -191,8 +191,8 @@
{
// save the exception to complain loudly later :-)
initFailure = e;
- System.err.println(Strings.stackTrace(e));
- log.info("init failed: " + Strings.stackTrace(e));
+ System.err.println(StringUtils.stackTrace(e));
+ log.info("init failed: " + StringUtils.stackTrace(e));
return;
}
log.info("init complete, Ready to Rumble!");
@@ -393,7 +393,7 @@
{
// TODO: Make output formatting more flexible --
// what's below was to remove the use of ECS.
- String trace = Strings.stackTrace(t);
+ String trace = StringUtils.stackTrace(t);
data.setStackTrace(trace,t);
data.getResponse().setContentType(data.getContentType());
data.getResponse().setStatus(data.getStatusCode());
@@ -766,10 +766,10 @@
while (true)
{
path = config.getInitParameter(name);
- if (Strings.isEmpty(path))
+ if (StringUtils.isEmpty(path))
{
path = context.getInitParameter(name);
- if (Strings.isEmpty(path))
+ if (StringUtils.isEmpty(path))
{
// The named parameter didn't yield a value.
if (usingNamespace)
1.4 +3 -3 jakarta-turbine-3/src/java/org/apache/turbine/exception/DefaultExceptionHandler.java
Index: DefaultExceptionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/exception/DefaultExceptionHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultExceptionHandler.java 7 Mar 2002 23:46:44 -0000 1.3
+++ DefaultExceptionHandler.java 23 Jul 2002 18:09:10 -0000 1.4
@@ -59,7 +59,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.ValveContext;
import org.apache.turbine.pipeline.DefaultTargetValve;
-import org.apache.commons.lang.Strings;
+import org.apache.commons.lang.StringUtils;
/**
* The default exception handler for {@link Turbine}. Populates the RunData
@@ -80,7 +80,7 @@
data.setTarget( Turbine.getConfiguration()
.getString( "template.error", "/Error.vm" ) );
- data.setStackTrace( Strings.stackTrace( throwable ), throwable );
+ data.setStackTrace( StringUtils.stackTrace( throwable ), throwable );
// Simulate a minimal Pipeline here to run the target.
1.4 +3 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JspRenderer.java 9 Apr 2002 17:29:35 -0000 1.3
+++ JspRenderer.java 23 Jul 2002 18:09:10 -0000 1.4
@@ -56,7 +56,7 @@
import javax.servlet.RequestDispatcher;
-import org.apache.commons.lang.Strings;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.turbine.RunData;
@@ -163,7 +163,7 @@
}
catch(Exception e)
{
- log.error(Strings.stackTrace(e));
+ log.error(StringUtils.stackTrace(e));
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>