CVS: plexus-components/summit/src/java/org/apache/plexus/summit/renderer AbstractRenderer.java,1.1.1.1,1.2 JspRenderer.java,1.1.1.1,1.2 Renderer.java,1.1.1.1,1.2 VelocityContextAdapter.java,1.1.1.1,1.2 VelocityRenderer.java,1.1.1.1,1.2
[email protected] Thu, 1 May 2003 14:28:43 -0500
| Newsgroups | gmane.comp.java.plexus.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/renderer
In directory eng.werken.com:/tmp/cvs-serv17379/src/java/org/apache/plexus/summit/renderer
Modified Files:
AbstractRenderer.java JspRenderer.java Renderer.java
VelocityContextAdapter.java VelocityRenderer.java
Log Message:
o Removed the multiple View notion.
o Using a service manager instead of the components being service managers.
Index: AbstractRenderer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/renderer/AbstractRenderer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- AbstractRenderer.java 15 Feb 2003 03:55:51 -0000 1.1.1.1
+++ AbstractRenderer.java 1 May 2003 19:28:40 -0000 1.2
@@ -73,14 +73,14 @@
extends AbstractSummitComponent
implements Renderer
{
- /** @see org.apache.plexus.summit.Renderer#render(RunData,String) */
- public abstract String render(RunData data, String view)
+ /** @see org.apache.plexus.summit.renderer.Renderer#render(RunData,String) */
+ public abstract String render( RunData data, String view )
throws SummitException, Exception;
- /** @see org.apache.plexus.summit.Renderer#render(RunData,String,Writer) */
- public abstract void render(RunData data, String view, Writer writer)
+ /** @see org.apache.plexus.summit.renderer.Renderer#render(RunData,String,Writer) */
+ public abstract void render( RunData data, String view, Writer writer )
throws SummitException, Exception;
- /** @see org.apache.plexus.summit.Renderer#viewExists(String) */
- public abstract boolean viewExists(String view);
+ /** @see org.apache.plexus.summit.renderer.Renderer#viewExists(String) */
+ public abstract boolean viewExists( String view );
}
Index: JspRenderer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/renderer/JspRenderer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- JspRenderer.java 15 Feb 2003 03:55:51 -0000 1.1.1.1
+++ JspRenderer.java 1 May 2003 19:28:40 -0000 1.2
@@ -60,9 +60,8 @@
import org.apache.plexus.summit.rundata.RunData;
import org.apache.plexus.summit.exception.SummitException;
-
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.plexus.logging.AbstractLogEnabled;
+import org.apache.plexus.util.ExceptionUtils;
/**
* <p>A <code>Renderer</code> that can process a JSP.</p>
@@ -70,10 +69,11 @@
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
* @version $Id$
*/
-public class JspRenderer extends AbstractLogEnabled
-{
+public class JspRenderer
+ extends AbstractLogEnabled
+{
/** The buffer size for the output stream. */
- private int bufferSize;
+ private int bufferSize = 8192;
/** * RunData of the request this Renderer is for. */
protected RunData data = null;
@@ -81,79 +81,62 @@
/**
* Construct a renderer for the given RunData.
*/
- public JspRenderer(RunData data)
+ public JspRenderer( RunData data )
{
this.data = data;
}
/**
* The buffer size
- *
+ *
*/
public int getDefaultBufferSize()
{
return bufferSize;
}
- /**
- * Process the request
- *
- * @param RunData
- * @param String the filename of the template.
- * @throws SummitException Any exception trown while processing will be
- * wrapped into a SummitException and rethrown.
- */
- public void render(String jsp)
+ public void render( String jsp )
throws SummitException
{
- render(jsp, false);
+ render( jsp, false );
}
-
- /**
- * Process the request
- *
- * @param RunData
- * @param String the filename of the template.
- * @param boolean whether to perform a forward or include.
- * @throws SummitException Any exception trown while processing will be
- * wrapped into a SummitException and rethrown.
- */
- public void render(String jsp, boolean isForward)
+
+ public void render( String jsp, boolean isForward )
throws SummitException
{
// This obviously can be improved.
String jspPath = "/templates/jsp/" + jsp;
-
- getLogger().debug("Jsp to render: " + jspPath);
-
- if (jspPath == null)
+
+ getLogger().debug( "Jsp to render: " + jspPath );
+
+ if ( jspPath == null )
{
throw new SummitException(
- "JSP " + jsp + " not found in specified paths");
+ "JSP " + jsp + " not found in specified paths" );
}
-
+
// get the RequestDispatcher for the JSP
- RequestDispatcher dispatcher =
- data.getServletConfig().getServletContext().getRequestDispatcher(jspPath);
-
- data.getResponse().setBufferSize(8192);
- data.getResponse().setContentType("text/html");
-
+ RequestDispatcher dispatcher =
+ data.getServletConfig().getServletContext().getRequestDispatcher( jspPath );
+
+ data.getResponse().setBufferSize( bufferSize );
+ data.getResponse().setContentType( "text/html" );
+
try
{
- if (isForward)
+ if ( isForward )
{
// forward the request to the JSP
- dispatcher.forward(data.getRequest(), data.getResponse());
+ dispatcher.forward( data.getRequest(), data.getResponse() );
}
else
{
- dispatcher.include(data.getRequest(), data.getResponse());
+ dispatcher.include( data.getRequest(), data.getResponse() );
}
}
- catch(Exception e)
+ catch ( Exception e )
{
- getLogger().error(ExceptionUtils.getStackTrace(e));
+ getLogger().error( ExceptionUtils.getStackTrace( e ) );
}
}
}
Index: Renderer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/renderer/Renderer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Renderer.java 15 Feb 2003 03:55:51 -0000 1.1.1.1
+++ Renderer.java 1 May 2003 19:28:40 -0000 1.2
@@ -70,16 +70,16 @@
public interface Renderer
{
public final static String ROLE = Renderer.class.getName();
-
+
/**
* <p>Render a given view into a <code>String</code>.</p>
*
* @param data
* @param view
*/
- String render(RunData data, String view)
+ String render( RunData data, String view )
throws SummitException, Exception;
-
+
/**
* <p>Render a given view into a <code>Writer</code>.</p>
*
@@ -87,9 +87,9 @@
* @param view
* @param writer
*/
- void render(RunData data, String view, Writer writer)
+ void render( RunData data, String view, Writer writer )
throws SummitException, Exception;
-
+
/**
* <p>Test for the existance of view using the native ability of the
* <code>Renderer</code> if possible.</p>
@@ -97,6 +97,6 @@
* @param view View to check the existance of.
* @return boolean
*/
- boolean viewExists(String view);
+ boolean viewExists( String view );
}
Index: VelocityContextAdapter.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/renderer/VelocityContextAdapter.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- VelocityContextAdapter.java 15 Feb 2003 03:55:52 -0000 1.1.1.1
+++ VelocityContextAdapter.java 1 May 2003 19:28:40 -0000 1.2
@@ -67,14 +67,14 @@
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
* @version $Id$
*/
-public class VelocityContextAdapter
+public class VelocityContextAdapter
extends AbstractContext
{
/** <p>View Context instance that we are wrapping.</p> */
private ViewContext context;
/** Constructor */
- public VelocityContextAdapter(ViewContext context)
+ public VelocityContextAdapter( ViewContext context )
{
this.context = context;
}
@@ -95,21 +95,21 @@
}
/** @see AbstractContext#internalContainsKey */
- public boolean internalContainsKey(Object key)
+ public boolean internalContainsKey( Object key )
{
return false;
//return context.containsKey( key );
}
/** @see AbstractContext#internalGetKeys */
- public Object[] internalGetKeys()
+ public Object[] internalGetKeys()
{
return null;
//return context.getKeys();
}
/** @see AbstractContext#internalRemove */
- public Object internalRemove(Object key)
+ public Object internalRemove( Object key )
{
return null;
//return context.remove( key );
Index: VelocityRenderer.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/renderer/VelocityRenderer.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- VelocityRenderer.java 15 Feb 2003 03:55:52 -0000 1.1.1.1
+++ VelocityRenderer.java 1 May 2003 19:28:40 -0000 1.2
@@ -76,8 +76,8 @@
*
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
* @version $Id$
- * @task the encoding needs to be configurable.
- * @task Valves need to have an initialization phase
+ * @todo the encoding needs to be configurable.
+ * @todo Valves need to have an initialization phase
*/
public class VelocityRenderer
extends AbstractRenderer
@@ -89,7 +89,7 @@
/** Velocity Component */
private VelocityComponent velocity;
-
+
/**
* <p>Initialize Velocity renderer by retrieving a Velocity component from
* the underlying Plexus container.</p>
@@ -100,9 +100,9 @@
try
{
velocity = (VelocityComponent)
- getServiceBroker().lookup( VelocityComponent.ROLE );
+ getServiceManager().lookup( VelocityComponent.ROLE );
}
- catch (ServiceException e)
+ catch ( ServiceException e )
{
getLogger().error( "Error retrieving the velocity component!", e );
throw new ConfigurationException( "Error retrieving the velocity component!", e );
@@ -110,70 +110,70 @@
}
/** @see org.apache.plexus.summit.renderer.Renderer#render(RunData,String) */
- public String render(RunData data, String view)
+ public String render( RunData data, String view )
throws SummitException, Exception
{
StringWriter writer = new StringWriter();
- render(data, view, writer);
+ render( data, view, writer );
return writer.toString();
}
/** @see org.apache.plexus.summit.renderer.Renderer#render(RunData,String,Writer) */
- public void render(RunData data, String view, Writer writer)
+ public void render( RunData data, String view, Writer writer )
throws SummitException, Exception
{
- getLogger().info("Rendering template: " + view);
+ getLogger().info( "Rendering template: " + view );
+
+ ViewContext viewContext = (ViewContext) data.getMap().get( SummitConstants.VIEW_CONTEXT );
+ VelocityContextAdapter vca = new VelocityContextAdapter( viewContext );
- ViewContext viewContext = (ViewContext) data.getMap().get(SummitConstants.VIEW_CONTEXT);
- VelocityContextAdapter vca = new VelocityContextAdapter(viewContext);
-
try
{
- if ( !velocity.templateExists(view) )
+ if ( !velocity.templateExists( view ) )
{
getLogger().error( "Template " + view + " does note exist!" );
throw new Exception( "Template " + view + " does note exist!" );
}
- Template template = velocity.getTemplate(view);
- template.merge(vca, writer);
+ Template template = velocity.getTemplate( view );
+ template.merge( vca, writer );
}
- catch (Throwable e)
+ catch ( Throwable e )
{
// if the Exception is a MethodInvocationException, the underlying
// Exception is likely to be more informative, so rewrap that one.
- if (e instanceof MethodInvocationException)
+ if ( e instanceof MethodInvocationException )
{
- e = ((MethodInvocationException)e).getWrappedThrowable();
+ e = ( (MethodInvocationException) e ).getWrappedThrowable();
}
- getLogger().error("Error rendering template: ", e);
+ getLogger().error( "Error rendering template: ", e );
}
finally
{
try
{
- if (writer != null)
+ if ( writer != null )
{
// don't close to allow us to play
// nicely with others.
writer.flush();
}
}
- catch (Exception e)
+ catch ( Exception e )
{
// do nothing
}
}
}
-
- /**
+
+ /**
* Check the existence of a Velocity template.
*
* @param view Velocity view to check for existance.
* @return boolean
*/
- public boolean viewExists(String view)
+ public boolean viewExists( String view )
{
- return velocity.templateExists(view);
+ return velocity.templateExists( view );
}
}