CVS: plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve AbstractValve.java,1.1.1.1,1.2 CreateViewContextValve.java,1.1.1.1,1.2 DetermineTargetValve.java,1.2,1.3 DisplayValve.java,1.1.1.1,1.2 JspRendererValve.java,1.1.1.1,1.2 ResolverValve.java,1.1.1.1,1.2 Valve.java,1.1.1.1,1.2 ValveContext.java,1.1.1.1,1.2
[email protected] Thu, 1 May 2003 14:28:42 -0500
| Newsgroups | gmane.comp.java.plexus.devel |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve
In directory eng.werken.com:/tmp/cvs-serv17379/src/java/org/apache/plexus/summit/pipeline/valve
Modified Files:
AbstractValve.java CreateViewContextValve.java
DetermineTargetValve.java DisplayValve.java
JspRendererValve.java ResolverValve.java Valve.java
ValveContext.java
Log Message:
o Removed the multiple View notion.
o Using a service manager instead of the components being service managers.
Index: AbstractValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/AbstractValve.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- AbstractValve.java 15 Feb 2003 03:55:50 -0000 1.1.1.1
+++ AbstractValve.java 1 May 2003 19:28:40 -0000 1.2
@@ -79,10 +79,10 @@
public void initialize() throws Exception
{
}
-
+
/**
* @see org.apache.plexus.summit.Valve#invoke(RunData, ValveContext)
*/
- public abstract void invoke(RunData data, ValveContext context)
+ public abstract void invoke( RunData data, ValveContext context )
throws IOException, SummitException;
}
Index: CreateViewContextValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/CreateViewContextValve.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- CreateViewContextValve.java 15 Feb 2003 03:55:50 -0000 1.1.1.1
+++ CreateViewContextValve.java 1 May 2003 19:28:40 -0000 1.2
@@ -69,21 +69,21 @@
*/
public class CreateViewContextValve
extends AbstractValve
-{
+{
/**
- * @see org.apache.plexus.summit.Valve#invoke(RunData, ValveContext)
+ * @see org.apache.plexus.summit.pipeline.valve.Valve#invoke(RunData, ValveContext)
*/
public void invoke( RunData data, ValveContext context )
throws IOException, SummitException
{
ViewContext viewContext = new DefaultViewContext();
- populateViewContext(data, viewContext);
- data.getMap().put(SummitConstants.VIEW_CONTEXT, viewContext);
-
+ populateViewContext( data, viewContext );
+ data.getMap().put( SummitConstants.VIEW_CONTEXT, viewContext );
+
// Pass control to the next Valve in the Pipeline
context.invokeNext( data );
}
-
+
/**
* Populate the velocityContext.
*
@@ -96,9 +96,9 @@
* @param data RunData for request.
* @param viewContext ViewContext that will be populated.
*/
- protected void populateViewContext(RunData data, ViewContext viewContext)
+ protected void populateViewContext( RunData data, ViewContext viewContext )
{
viewContext.put( "data", data );
- viewContext.put("name","root");
+ viewContext.put( "name", "root" );
}
}
Index: DetermineTargetValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/DetermineTargetValve.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DetermineTargetValve.java 15 Feb 2003 19:39:21 -0000 1.2
+++ DetermineTargetValve.java 1 May 2003 19:28:40 -0000 1.3
@@ -70,39 +70,39 @@
* specified by the configuration property Turbine.TEMPLATE_HOMEPAGE.
*
* FIXME: The request parameter which determines the template should be
- * configurable.
+ * configurable.
*
* @author <a href="mailto:[email protected]">James Taylor</a>
* @author <a href="mailto:[email protected]">Pete Kazmier</a>
*/
-public class DetermineTargetValve
+public class DetermineTargetValve
extends AbstractValve
{
-
+
/**
- * @see org.apache.plexus.summit.Valve#invoke(RunData, ValveContext)
+ * @see org.apache.plexus.summit.pipeline.valve.Valve#invoke(RunData, ValveContext)
*/
public void invoke( RunData data, ValveContext context )
throws IOException, SummitException
{
- if ( ! data.hasTarget() )
+ if ( !data.hasTarget() )
{
- String target = data.getParameters().getString("target");
+ String target = data.getParameters().getString( "target" );
if ( target != null )
{
data.setTarget( target );
- getLogger().info( "Setting target from request parameter: " + target);
+ getLogger().info( "Setting target from request parameter: " + target );
}
else
{
target = getResolver( data ).getDefaultView();
- data.setTarget(target);
- getLogger().info( "Setting target using default value: " + data.getTarget());
+ data.setTarget( target );
+ getLogger().info( "Setting target using default value: " + data.getTarget() );
}
}
-
+
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "Target is now: " + data.getTarget() );
@@ -112,11 +112,12 @@
context.invokeNext( data );
}
- private Resolver getResolver( RunData data ) throws SummitException
+ private Resolver getResolver( RunData data )
+ throws SummitException
{
try
{
- return ( Resolver ) getServiceBroker().lookup( Resolver.ROLE );
+ return (Resolver) getServiceManager().lookup( Resolver.ROLE );
}
catch ( ServiceException e )
{
Index: DisplayValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/DisplayValve.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DisplayValve.java 15 Feb 2003 03:55:50 -0000 1.1.1.1
+++ DisplayValve.java 1 May 2003 19:28:40 -0000 1.2
@@ -63,37 +63,35 @@
import org.apache.plexus.summit.rundata.RunData;
/**
- * @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 DisplayValve
- extends AbstractValve
+ extends AbstractValve
{
/**
- * @see org.apache.plexus.summit.Valve#invoke(RunData, ValveContext)
+ * @see org.apache.plexus.summit.pipeline.valve.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke( RunData data, ValveContext context )
throws IOException, SummitException
{
String target = "/" + data.getTarget();
-
- getLogger().info("Rendering template: " + target);
-
+
+ getLogger().info( "Rendering template: " + target );
+
// This is bad, align the exceptions
try
{
- Display display =
- ( Display ) getServiceBroker().lookup( Display.ROLE );
-
+ Display display = (Display) getServiceManager().lookup( Display.ROLE );
display.render( data );
}
- catch (Exception e)
+ catch ( Exception e )
{
e.printStackTrace();
- throw new SummitException("Can't display!", e);
- }
-
+ throw new SummitException( "Can't display!", e );
+ }
+
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext( data );
}
}
Index: JspRendererValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/JspRendererValve.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- JspRendererValve.java 15 Feb 2003 03:55:50 -0000 1.1.1.1
+++ JspRendererValve.java 1 May 2003 19:28:40 -0000 1.2
@@ -73,33 +73,33 @@
extends AbstractValve
{
/**
- * @see org.apache.plexus.summit.Valve#invoke(RunData, ValveContext)
+ * @see org.apache.plexus.summit.pipeline.valve.Valve#invoke(RunData, ValveContext)
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke( RunData data, ValveContext context )
throws IOException, SummitException
{
try
- {
+ {
String jsp = data.getTarget();
- render(data,jsp);
+ render( data, jsp );
}
- catch (Exception e)
+ catch ( Exception e )
{
- throw new SummitException("Error rendering JSP!", e);
+ throw new SummitException( "Error rendering JSP!", e );
}
// Pass control to the next Valve in the Pipeline
- context.invokeNext(data);
+ context.invokeNext( data );
}
- protected void render(RunData data, String jsp)
+ protected void render( RunData data, String jsp )
throws Exception
{
- JspRenderer r = new JspRenderer(data);
-
+ JspRenderer r = new JspRenderer( data );
+
r.enableLogging( getLogger() );
-
- r.render(jsp,true);
+
+ r.render( jsp, true );
}
}
Index: ResolverValve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/ResolverValve.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ResolverValve.java 15 Feb 2003 03:55:50 -0000 1.1.1.1
+++ ResolverValve.java 1 May 2003 19:28:40 -0000 1.2
@@ -67,31 +67,31 @@
*/
public class ResolverValve
extends AbstractValve
-{
+{
/**
- * @see org.apache.plexus.summit.Valve#invoke(RunData, ValveContext)
+ * @see org.apache.plexus.summit.pipeline.valve.Valve#invoke(RunData, ValveContext)
*/
public void invoke( RunData data, ValveContext context )
throws IOException, SummitException
{
String target = data.getTarget();
-
- getLogger().info("Resolving target: " + target);
-
+
+ getLogger().info( "Resolving target: " + target );
+
try
{
Resolver resolver =
- ( Resolver ) getServiceBroker().lookup( Resolver.ROLE );
+ (Resolver) getServiceManager().lookup( Resolver.ROLE );
Resolution resolution = resolver.resolve( target );
- data.setResolution(resolution);
+ data.setResolution( resolution );
}
- catch (Exception e)
+ catch ( Exception e )
{
- getLogger().error("Cannot resolve target: ", e);
+ getLogger().error( "Cannot resolve target: ", e );
}
-
+
// Pass control to the next Valve in the Pipeline
context.invokeNext( data );
}
Index: Valve.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/Valve.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Valve.java 15 Feb 2003 03:55:51 -0000 1.1.1.1
+++ Valve.java 1 May 2003 19:28:40 -0000 1.2
@@ -128,7 +128,7 @@
* @exception IOException Thrown by a subsequent Valve.
* @exception SummitException Thrown by a subsequent Valve.
*/
- public void invoke(RunData data, ValveContext context)
+ public void invoke( RunData data, ValveContext context )
throws IOException, SummitException;
/**
Index: ValveContext.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/pipeline/valve/ValveContext.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ValveContext.java 15 Feb 2003 03:55:51 -0000 1.1.1.1
+++ ValveContext.java 1 May 2003 19:28:40 -0000 1.2
@@ -100,6 +100,6 @@
* @exception SummitException No further Valves configured in the
* Pipeline currently being processed.
*/
- public void invokeNext(RunData data)
+ public void invokeNext( RunData data )
throws IOException, SummitException;
}