CVS conflicts in
src/java/com/opensymphony/webwork/views/velocity/WebWorkVelocityServlet.java
.
They prohibit compilation:
java:
[javac] Compiling 51 source files to
/usr/home/as/java/webwork2/build/java
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:93: illegal start of expression
[javac] <<<<<<< WebWorkVelocityServlet.java
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:108: illegal start of expression
[javac] =======
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:110: illegal start of expression
[javac] >>>>>>> 1.12
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:110: ';' expected
[javac] >>>>>>> 1.12
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:95: cannot resolve symbol
[javac] symbol : variable Velocity
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] p.setProperty(Velocity.FILE_RESOURCE_LOADER_PATH,
servletConfig.getServletContext().getRealPath(""));
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:95: cannot resolve symbol
[javac] symbol : variable p
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] p.setProperty(Velocity.FILE_RESOURCE_LOADER_PATH,
servletConfig.getServletContext().getRealPath(""));
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:103: cannot resolve symbol
[javac] symbol : variable Velocity
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] p.setProperty(Velocity.RESOURCE_LOADER, "file,class");
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:103: cannot resolve symbol
[javac] symbol : variable p
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] p.setProperty(Velocity.RESOURCE_LOADER, "file,class");
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:104: cannot resolve symbol
[javac] symbol : variable p
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] p.setProperty("class.resource.loader.description",
"Velocity Classpath Resource Loader");
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:105: cannot resolve symbol
[javac] symbol : variable p
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] p.setProperty("class.resource.loader.class",
"com.opensymphony.webwork.views.velocity.WebWorkResourceLoader");
[javac] ^
[javac]
/usr/home/as/java/webwork2/src/java/com/opensymphony/webwork/views/velocity/
WebWorkVelocityServlet.java:107: cannot resolve symbol
[javac] symbol : variable p
[javac] location: class
com.opensymphony.webwork.views.velocity.WebWorkVelocityServlet
[javac] return p;
[javac] ^
[javac] 11 errors
BUILD FAILED
Blake
-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps
_______________________________________________
Opensymphony-webwork mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/opensymphony-webwork
