taylor 2004/10/24 12:33:43
Modified: portal/src/java/org/apache/jetspeed/velocity
JetspeedPowerTool.java
portal/src/webapp/WEB-INF web.xml
Added: portal/src/java/org/apache/jetspeed/velocity
JetspeedVelocityViewServlet.java
Log:
- completed decoupling of Velocity bridge from Jetspeed and Pluto dependencies
- added a Jetspeed Velocity view servlet for the jetspeed-specifc layouts inheriting
from bridge servlet
Revision Changes Path
1.32 +2 -8
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java
Index: JetspeedPowerTool.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedPowerTool.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JetspeedPowerTool.java 22 Oct 2004 22:41:52 -0000 1.31
+++ JetspeedPowerTool.java 24 Oct 2004 19:33:43 -0000 1.32
@@ -75,7 +75,7 @@
import org.apache.velocity.io.VelocityWriter;
import org.apache.velocity.tools.view.context.ViewContext;
import org.apache.velocity.tools.view.tools.ViewTool;
-import org.apache.portals.bridges.velocity.JetspeedVelocityViewServlet;
+
/**
* <p>
@@ -509,12 +509,6 @@
}
catch (TemplateLocatorException e)
{
- log.warn(e.toString(), e);
- return null;
- }
- catch (IOException e)
- {
-
log.warn(e.toString(), e);
return null;
}
1.8 +9 -101
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/velocity/JetspeedVelocityViewServlet.java
1.18 +1 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- web.xml 22 Oct 2004 22:41:16 -0000 1.17
+++ web.xml 24 Oct 2004 19:33:43 -0000 1.18
@@ -119,7 +119,7 @@
<!-- Define Velocity template compiler -->
<servlet>
<servlet-name>velocity</servlet-name>
-
<servlet-class>org.apache.portals.bridges.velocity.JetspeedVelocityViewServlet</servlet-class>
+
<servlet-class>org.apache.jetspeed.velocity.JetspeedVelocityViewServlet</servlet-class>
<init-param>
<param-name>org.apache.velocity.toolbox</param-name>
<param-value>/WEB-INF/toolbox.xml</param-value>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
