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/03/08 00:46:44 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine/pipeline JGenRenderer.java JspRenderer.java
jmcnally 02/03/07 15:46:44
Modified: . build.xml default.properties deps.list
src/java/org/apache/turbine Turbine.java
TurbineException.java TurbineRuntimeException.java
src/java/org/apache/turbine/exception
DefaultExceptionHandler.java
src/java/org/apache/turbine/pipeline JGenRenderer.java
JspRenderer.java
Log:
classes moved from commons-util to commons-lang and commons-http
Revision Changes Path
1.27 +26 -10 jakarta-turbine-3/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 17 Feb 2002 06:41:26 -0000 1.26
+++ build.xml 7 Mar 2002 23:46:44 -0000 1.27
@@ -25,7 +25,8 @@
<path id="classpath">
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-util.jar}"/>
+ <pathelement location="${commons-lang.jar}"/>
+ <pathelement location="${commons-http.jar}"/>
<pathelement location="${dom4j.jar}"/>
<pathelement location="${fulcrum.jar}"/>
<pathelement location="${jaf.jar}"/>
@@ -38,7 +39,6 @@
<pathelement location="${xerces.jar}"/>
<pathelement location="${xmlParserAPIs.jar}"/>
<pathelement location="${commons-collections.jar}"/>
- <pathelement location="${commons-util.jar}"/>
<pathelement location="${stratum.jar}"/>
<pathelement location="${dvsl.jar}"/>
<pathelement location="${jgen.jar}"/>
@@ -91,7 +91,8 @@
<echo message="commons-beanutils.jar = ${commons-beanutils.jar}"/>
<echo message="commons-collections.jar = ${commons-collections.jar}"/>
- <echo message="commons-util.jar = ${commons-util.jar}"/>
+ <echo message="commons-lang.jar = ${commons-lang.jar}"/>
+ <echo message="commons-http.jar = ${commons-http.jar}"/>
<echo message="dom4j.jar = ${dom4j.jar}"/>
<echo message="fulcrum.jar = ${fulcrum.jar}"/>
<echo message="jaf.jar = ${jaf.jar}"/>
@@ -185,8 +186,14 @@
/>
<available
- classname="org.apache.commons.util.exception.NestableException"
- property="commons-util.present"
+ classname="org.apache.commons.lang.exception.NestableException"
+ property="commons-lang.present"
+ classpathref="classpath"
+ />
+
+ <available
+ classname="org.apache.commons.http.HttpUtils"
+ property="commons-http.present"
classpathref="classpath"
/>
@@ -284,13 +291,21 @@
</antcall>
</target>
- <target name="check.commons-util" unless="commons-util.present">
+ <target name="check.commons-lang" unless="commons-lang.present">
<antcall target="property-warning">
- <param name="name" value="commons-util.jar"/>
- <param name="value" value="${commons-util.jar}"/>
+ <param name="name" value="commons-lang.jar"/>
+ <param name="value" value="${commons-lang.jar}"/>
</antcall>
</target>
+ <target name="check.commons-http" unless="commons-http.present">
+ <antcall target="property-warning">
+ <param name="name" value="commons-http.jar"/>
+ <param name="value" value="${commons-http.jar}"/>
+ </antcall>
+ </target>
+
+
<target name="check.stratum" unless="stratum.present">
<antcall target="property-warning">
<param name="name" value="stratum.jar"/>
@@ -323,9 +338,10 @@
<target name="prepare"
depends="env,
check.commons-beanutils,check.commons-collections,
- check.commons-util,check.dom4j,check.jaf,check.log4j,
+ check.commons-lang,check.dom4j,check.jaf,check.log4j,
check.fulcrum,check.regexp,check.servlet,check.stratum,
- check.torque,check.xerces,check.velocity">
+ check.torque,check.xerces,check.velocity,
+ check.commons-http">
<mkdir dir="${build.dir}"/>
<mkdir dir="${build.dest}"/>
1.19 +2 -1 jakarta-turbine-3/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/default.properties,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- default.properties 4 Mar 2002 23:45:35 -0000 1.18
+++ default.properties 7 Mar 2002 23:46:44 -0000 1.19
@@ -40,8 +40,9 @@
xerces.jar = ${lib.repo}/xercesImpl-2.0.0.jar
xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.0.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
+commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
commons-io.jar = ${lib.repo}/commons-io.jar
+commons-http.jar = ${lib.repo}/commons-http.jar
stratum.jar = ${lib.repo}/stratum-0.1-dev.jar
dom4j.jar = ${lib.repo}/dom4j-1.1.jar
commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
1.9 +2 -1 jakarta-turbine-3/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/deps.list,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- deps.list 4 Mar 2002 23:45:35 -0000 1.8
+++ deps.list 7 Mar 2002 23:46:44 -0000 1.9
@@ -3,8 +3,9 @@
cactus.jar
commons-beanutils.jar
commons-collections.jar
-commons-util-0.1-dev.jar
+commons-0.1-lang-dev.jar
commons-io.jar
+commons-http.jar
dom4j-1.1.jar
fulcrum-1.0.jar
httpclient.jar
1.30 +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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Turbine.java 4 Mar 2002 23:45:35 -0000 1.29
+++ Turbine.java 7 Mar 2002 23:46:44 -0000 1.30
@@ -70,8 +70,8 @@
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.util.StringUtils;
-import org.apache.commons.util.http.HttpUtils;
+import org.apache.commons.lang.Strings;
+import org.apache.commons.http.HttpUtils;
import org.apache.fulcrum.ServiceManager;
import org.apache.fulcrum.TurbineServices;
import org.apache.log4j.Category;
@@ -123,7 +123,7 @@
* @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.29 2002/03/04 23:45:35 jtaylor Exp $
+ * @version $Id: Turbine.java,v 1.30 2002/03/07 23:46:44 jmcnally Exp $
*/
public class Turbine
extends HttpServlet
@@ -185,8 +185,8 @@
{
// save the exception to complain loudly later :-)
initFailure = e;
- System.err.println(StringUtils.stackTrace(e));
- Log.info("Turbine: init() failed: " + StringUtils.stackTrace(e));
+ System.err.println(Strings.stackTrace(e));
+ Log.info("Turbine: init() failed: " + Strings.stackTrace(e));
return;
}
Log.info("Turbine: init() Ready to Rumble!");
@@ -400,7 +400,7 @@
{
// TODO: Make output formatting more flexible --
// what's below was to remove the use of ECS.
- String trace = StringUtils.stackTrace(t);
+ String trace = Strings.stackTrace(t);
data.setStackTrace(trace,t);
data.getResponse().setContentType(data.getContentType());
data.getResponse().setStatus(data.getStatusCode());
@@ -717,7 +717,7 @@
*/
private static void createRuntimeDirectories(String path)
{
- if (StringUtils.isEmpty(path))
+ if (Strings.isEmpty(path))
{
path = "/logs";
}
1.2 +1 -1 jakarta-turbine-3/src/java/org/apache/turbine/TurbineException.java
Index: TurbineException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/TurbineException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineException.java 16 Aug 2001 04:41:34 -0000 1.1
+++ TurbineException.java 7 Mar 2002 23:46:44 -0000 1.2
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.util.exception.NestableException;
+import org.apache.commons.lang.exception.NestableException;
/**
* The base class of all regular exceptions thrown by Torque.
1.2 +1 -1 jakarta-turbine-3/src/java/org/apache/turbine/TurbineRuntimeException.java
Index: TurbineRuntimeException.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/TurbineRuntimeException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineRuntimeException.java 16 Aug 2001 04:41:34 -0000 1.1
+++ TurbineRuntimeException.java 7 Mar 2002 23:46:44 -0000 1.2
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.util.exception.NestableRuntimeException;
+import org.apache.commons.lang.exception.NestableRuntimeException;
/**
* This is a base class of runtime exeptions thrown by Turbine.
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultExceptionHandler.java 5 Mar 2002 00:58:46 -0000 1.2
+++ DefaultExceptionHandler.java 7 Mar 2002 23:46:44 -0000 1.3
@@ -59,7 +59,7 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.ValveContext;
import org.apache.turbine.pipeline.DefaultTargetValve;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
/**
* The default exception handler for {@link Turbine}. Populates the RunData
@@ -67,7 +67,7 @@
* by the 'template.error' configuration property.
*
* @author <a href="mailto:james@jamestaylor.org">James Taylor</a>
- * @version $Id: DefaultExceptionHandler.java,v 1.2 2002/03/05 00:58:46 jtaylor Exp $
+ * @version $Id: DefaultExceptionHandler.java,v 1.3 2002/03/07 23:46:44 jmcnally Exp $
*/
public class DefaultExceptionHandler implements ExceptionHandler
{
@@ -80,7 +80,7 @@
data.setTarget( Turbine.getConfiguration()
.getString( "template.error", "/Error.vm" ) );
- data.setStackTrace( StringUtils.stackTrace( throwable ), throwable );
+ data.setStackTrace( Strings.stackTrace( throwable ), throwable );
// Simulate a minimal Pipeline here to run the target.
1.3 +1 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JGenRenderer.java 12 Feb 2002 02:32:16 -0000 1.2
+++ JGenRenderer.java 7 Mar 2002 23:46:44 -0000 1.3
@@ -72,7 +72,6 @@
import org.apache.turbine.modules.Module;
import org.apache.log4j.Category;
-import org.apache.commons.util.StringUtils;
import com.iv.flash.util.Util;
import com.iv.flash.context.Context;
@@ -86,7 +85,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.2 2002/02/12 02:32:16 jtaylor Exp $
+ * @version $Id: JGenRenderer.java,v 1.3 2002/03/07 23:46:44 jmcnally Exp $
*/
public class JGenRenderer
{
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JspRenderer.java 22 Jan 2002 13:50:46 -0000 1.1
+++ JspRenderer.java 7 Mar 2002 23:46:44 -0000 1.2
@@ -68,13 +68,13 @@
import org.apache.turbine.TurbineException;
import org.apache.log4j.Category;
-import org.apache.commons.util.StringUtils;
+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.1 2002/01/22 13:50:46 jvanzyl Exp $
+ * @version $Id: JspRenderer.java,v 1.2 2002/03/07 23:46:44 jmcnally Exp $
*/
public class JspRenderer
{
@@ -172,7 +172,7 @@
}
catch(Exception e)
{
- log.error(StringUtils.stackTrace(e));
+ log.error(Strings.stackTrace(e));
}
}
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>