geirm 01/12/10 04:06:58
Modified: examples/app_example1 example.bat example.sh
examples/app_example2 example2.bat example2.sh
examples/logger_example logger_example.bat logger_example.sh
examples/servlet_example2 SampleServlet2.java
Log:
updates from 1.2 to HEAD
Revision Changes Path
1.2 +1 -0 jakarta-velocity/examples/app_example1/example.bat
Index: example.bat
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/app_example1/example.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example.bat 2001/04/10 12:15:38 1.1
+++ example.bat 2001/12/10 12:06:58 1.2
@@ -2,6 +2,7 @@
set VELCP=.
for %%i in (..\..\bin\*.jar) do set VELCP=%VELCP%;%%i
+for %%i in (..\..\build\lib\*.jar) do set VELCP=%VELCP%;%%i
echo Using classpath: %VELCP%
1.4 +5 -0 jakarta-velocity/examples/app_example1/example.sh
Index: example.sh
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/app_example1/example.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- example.sh 2001/05/10 10:56:30 1.3
+++ example.sh 2001/12/10 12:06:58 1.4
@@ -7,6 +7,11 @@
_VELCP=$_VELCP:"$i"
done
+for i in ../../build/lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
_VELCP=`cygpath --path --windows "$_VELCP"`
1.2 +1 -0 jakarta-velocity/examples/app_example2/example2.bat
Index: example2.bat
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/app_example2/example2.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- example2.bat 2001/04/10 12:16:48 1.1
+++ example2.bat 2001/12/10 12:06:58 1.2
@@ -2,6 +2,7 @@
set VELCP=.
for %%i in (..\..\bin\*.jar) do set VELCP=%VELCP%;%%i
+for %%i in (..\..\build\lib\*.jar) do set VELCP=%VELCP%;%%i
echo Using classpath: %VELCP%
1.4 +6 -1 jakarta-velocity/examples/app_example2/example2.sh
Index: example2.sh
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/app_example2/example2.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- example2.sh 2001/05/10 10:56:37 1.3
+++ example2.sh 2001/12/10 12:06:58 1.4
@@ -7,10 +7,15 @@
_VELCP=$_VELCP:"$i"
done
+for i in ../../build/lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
_VELCP=`cygpath --path --windows "$_VELCP"`
fi
java -cp $_VELCP Example2
-
\ No newline at end of file
+
1.2 +1 -0 jakarta-velocity/examples/logger_example/logger_example.bat
Index: logger_example.bat
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/logger_example/logger_example.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logger_example.bat 2001/04/10 12:17:44 1.1
+++ logger_example.bat 2001/12/10 12:06:58 1.2
@@ -2,6 +2,7 @@
set VELCP=.
for %%i in (..\..\bin\*.jar) do set VELCP=%VELCP%;%%i
+for %%i in (..\..\build\lib\*.jar) do set VELCP=%VELCP%;%%i
echo Using classpath: %VELCP%
1.4 +5 -0 jakarta-velocity/examples/logger_example/logger_example.sh
Index: logger_example.sh
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/logger_example/logger_example.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- logger_example.sh 2001/05/10 10:56:44 1.3
+++ logger_example.sh 2001/12/10 12:06:58 1.4
@@ -7,6 +7,11 @@
_VELCP=$_VELCP:"$i"
done
+for i in ../../build/lib/*.jar
+do
+ _VELCP=$_VELCP:"$i"
+done
+
# convert the unix path to windows
if [ "$OSTYPE" = "cygwin32" ] || [ "$OSTYPE" = "cygwin" ] ; then
_VELCP=`cygpath --path --windows "$_VELCP"`
1.3 +5 -8 jakarta-velocity/examples/servlet_example2/SampleServlet2.java
Index: SampleServlet2.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/examples/servlet_example2/SampleServlet2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SampleServlet2.java 2001/05/22 03:23:33 1.2
+++ SampleServlet2.java 2001/12/10 12:06:58 1.3
@@ -60,6 +60,8 @@
import java.util.Vector;
import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;
@@ -82,7 +84,7 @@
*
* @author Dave Bryson
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
- * @version $Id: SampleServlet2.java,v 1.2 2001/05/22 03:23:33 geirm Exp $
+ * @version $Id: SampleServlet2.java,v 1.3 2001/12/10 12:06:58 geirm Exp $
*/
public class SampleServlet2 extends VelocityServlet
{
@@ -159,19 +161,14 @@
* VelocityServlet, your responsibility as programmer
* is to simply return a valid Template
* </p>
- * <p>
- * Note : this is the deprecated version of handleRequest() and
- * is here for compatibility with Velocity 1.0
- * Velocity 1.1 has a new method handleRequest( HttpServletRequest,
- * HttpServletResponse, Context) that allows you to return null.
- * </p>
*
* @param ctx a Velocity Context object to be filled with
* data. Will be used for rendering this
* template
* @return Template to be used for request
*/
- public Template handleRequest( Context ctx )
+ public Template handleRequest( HttpServletRequest request,
+ HttpServletResponse response, Context ctx )
{
/*
* set up some data to put into the context
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
