CVS: plexus-components/summit/src/java/org/apache/plexus/summit/rundata AbstractRunData.java,1.3,1.4 DefaultRunData.java,1.1.1.1,1.2 RunData.java,1.4,1.5
[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/rundata
In directory eng.werken.com:/tmp/cvs-serv17379/src/java/org/apache/plexus/summit/rundata
Modified Files:
AbstractRunData.java DefaultRunData.java RunData.java
Log Message:
o Removed the multiple View notion.
o Using a service manager instead of the components being service managers.
Index: AbstractRunData.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/rundata/AbstractRunData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- AbstractRunData.java 15 Feb 2003 20:58:43 -0000 1.3
+++ AbstractRunData.java 1 May 2003 19:28:40 -0000 1.4
@@ -66,7 +66,7 @@
import javax.servlet.http.HttpSession;
import org.apache.avalon.framework.activity.Initializable;
-import org.apache.plexus.service.ServiceBroker;
+import org.apache.avalon.framework.service.ServiceManager;
import org.apache.plexus.summit.AbstractSummitComponent;
import org.apache.plexus.summit.parameters.RequestParameterParser;
import org.apache.plexus.summit.parameters.RequestParameters;
@@ -81,28 +81,28 @@
* Is possible that some might like to avoid the whole resolution process
* and entirely do their own thing.
*/
-public abstract class AbstractRunData
+public abstract class AbstractRunData
extends AbstractSummitComponent
implements RunData, Initializable
{
/** Target view. */
private String target;
-
+
/** Servlet Request. */
private HttpServletRequest request;
-
+
/** Servlet Respsonse. */
private HttpServletResponse response;
-
+
/** Servlet Config. */
private ServletConfig servletConfig;
-
+
/** Content type. */
private String contentType;
-
+
/** General storage. */
private Map map = new HashMap();
-
+
/** Resolution produced by Resolver. */
private Resolution resolution;
@@ -111,16 +111,16 @@
/** The RequestParameterParser used to parse the request */
private RequestParameterParser parameterParser;
-
+
/** The root ServiceBroker used to lookup non-Summit components */
- private ServiceBroker rootServiceBroker;
+ private ServiceManager rootServiceManager;
public void initialize() throws Exception
{
- parameterParser = ( RequestParameterParser )
- getServiceBroker().lookup( RequestParameterParser.ROLE );
+ parameterParser = (RequestParameterParser)
+ getServiceManager().lookup( RequestParameterParser.ROLE );
}
-
+
/**
* Gets the target attribute of the AbstractRunData object
*/
@@ -132,7 +132,7 @@
/**
* Sets the target attribute of the AbstractRunData object
*/
- public void setTarget(String target)
+ public void setTarget( String target )
{
this.target = target;
}
@@ -142,13 +142,13 @@
*/
public boolean hasTarget()
{
- return (target != null);
+ return ( target != null );
}
/**
* Sets the request attribute of the AbstractRunData object
*/
- public void setRequest(HttpServletRequest request)
+ public void setRequest( HttpServletRequest request )
{
this.request = request;
this.parameters = parameterParser.parse( request );
@@ -165,7 +165,7 @@
/**
* Sets the response attribute of the AbstractRunData object
*/
- public void setResponse(HttpServletResponse response)
+ public void setResponse( HttpServletResponse response )
{
this.response = response;
}
@@ -185,11 +185,11 @@
{
return request.getSession();
}
-
+
/**
* Sets the servletConfig attribute of the AbstractRunData object
*/
- public void setServletConfig(ServletConfig servletConfig)
+ public void setServletConfig( ServletConfig servletConfig )
{
this.servletConfig = servletConfig;
}
@@ -205,7 +205,7 @@
/**
* Sets the map attribute of the AbstractRunData object
*/
- public void setMap(Map map)
+ public void setMap( Map map )
{
this.map = map;
}
@@ -223,7 +223,7 @@
*
* @param ct the new content type.
*/
- public void setContentType(String contentType)
+ public void setContentType( String contentType )
{
this.contentType = contentType;
}
@@ -254,7 +254,7 @@
/**
* Sets the Resolver attribute of the AbstractRunData object
*/
- public void setResolution(Resolution resolution)
+ public void setResolution( Resolution resolution )
{
this.resolution = resolution;
}
@@ -266,29 +266,29 @@
{
return resolution;
}
-
- /**
+
+ /**
* Create a static link to resources in the webapp space.
*
* @param path Path to the static resource in the webapp space.
* @return Full URL to the static resource in the webapp space.
*/
- public String getLink(String path)
+ public String getLink( String path )
{
StringBuffer sb = new StringBuffer();
- sb.append (getServerScheme()); //http
- sb.append ("://");
- sb.append (getServerName()); //www.foo.com
- sb.append (':');
- sb.append (getServerPort()); //port webserver running on (8080 for TDK)
+ sb.append( getServerScheme() ); //http
+ sb.append( "://" );
+ sb.append( getServerName() ); //www.foo.com
+ sb.append( ':' );
+ sb.append( getServerPort() ); //port webserver running on (8080 for TDK)
//the context for tomcat adds a / so no need to add another
- sb.append (getRequest().getContextPath()); //the tomcat context
- sb.append ('/');
- sb.append (path);
+ sb.append( getRequest().getContextPath() ); //the tomcat context
+ sb.append( '/' );
+ sb.append( path );
return sb.toString();
}
-
-
+
+
/**
* @see org.apache.plexus.summit.rundata.RunData#getContextPath()
*/
@@ -336,20 +336,20 @@
{
return servletConfig.getServletContext();
}
-
+
/* (non-Javadoc)
* @see org.apache.plexus.summit.rundata.RunData#getRootServiceBroker()
*/
- public ServiceBroker getRootServiceBroker()
+ public ServiceManager getRootServiceManager()
{
- return rootServiceBroker;
+ return rootServiceManager;
}
/* (non-Javadoc)
* @see org.apache.plexus.summit.rundata.RunData#setRootServiceBroker(org.apache.plexus.service.ServiceBroker)
*/
- public void setRootServiceBroker(ServiceBroker rootBroker)
+ public void setRootServiceManager( ServiceManager rootServiceManager )
{
- this.rootServiceBroker = rootBroker;
+ this.rootServiceManager = rootServiceManager;
}
}
Index: DefaultRunData.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/rundata/DefaultRunData.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- DefaultRunData.java 15 Feb 2003 03:55:57 -0000 1.1.1.1
+++ DefaultRunData.java 1 May 2003 19:28:40 -0000 1.2
@@ -63,6 +63,6 @@
* @version $Id$
*/
public class DefaultRunData
- extends AbstractRunData
+ extends AbstractRunData
{
}
Index: RunData.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/rundata/RunData.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- RunData.java 8 Mar 2003 20:48:48 -0000 1.4
+++ RunData.java 1 May 2003 19:28:40 -0000 1.5
@@ -64,10 +64,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.plexus.service.ServiceBroker;
import org.apache.plexus.summit.SummitComponent;
import org.apache.plexus.summit.parameters.RequestParameters;
import org.apache.plexus.summit.resolver.Resolution;
+import org.apache.avalon.framework.service.ServiceManager;
/**
* RunData is an interface to run-rime information that is passed within
@@ -92,7 +92,7 @@
/**
* Sets the target attribute of the RunData object
*/
- void setTarget(String template);
+ void setTarget( String template );
/**
* Description of the Method
@@ -102,7 +102,7 @@
/**
* Sets the request attribute of the RunData object
*/
- void setRequest(HttpServletRequest r);
+ void setRequest( HttpServletRequest r );
/**
* Gets the request attribute of the RunData object
@@ -112,7 +112,7 @@
/**
* Sets the response attribute of the RunData object
*/
- void setResponse(HttpServletResponse r);
+ void setResponse( HttpServletResponse r );
/**
* Gets the response attribute of the RunData object
@@ -127,7 +127,7 @@
/**
* Sets the servletConfig attribute of the RunData object
*/
- void setServletConfig(ServletConfig servletConfig);
+ void setServletConfig( ServletConfig servletConfig );
/**
* Gets the servletConfig attribute of the RunData object
@@ -137,7 +137,7 @@
/**
* Sets the map attribute of the RunData object
*/
- void setMap(Map map);
+ void setMap( Map map );
/**
* Gets the map attribute of the RunData object
@@ -161,7 +161,7 @@
*
* @param ct the new content type.
*/
- void setContentType(String ct);
+ void setContentType( String ct );
/**
* Gets the request parameters.
@@ -171,7 +171,7 @@
/**
* Sets the Resolver attribute of the RunData object
*/
- void setResolution(Resolution resolution);
+ void setResolution( Resolution resolution );
/**
* Gets the Resolver attribute of the RunData object
@@ -179,20 +179,20 @@
Resolution getResolution();
/**
- * Get the server name.
+ * Get the server name.
*/
public String getServerName();
/**
- * Get the server port.
+ * Get the server port.
*/
public int getServerPort();
-
+
/**
* Get the server scheme.
*/
public String getServerScheme();
-
+
/**
* Get the initial script name.
@@ -211,20 +211,20 @@
/**
* Get the root service broker from the Plexus which created the
- * PlexusServlet. The root service broker is currently the only
+ * PlexusServlet. The root service broker is currently the only
* ServiceBroker capable of looking up non-Summit components.
- *
+ *
* @return ServiceBroker The root ServiceBroker capable of looking
* up non-Summit components.
*/
- public ServiceBroker getRootServiceBroker();
-
+ public ServiceManager getRootServiceManager();
+
/**
* Set the root service broker which is capable of looking up
* non-Summit components.
- *
+ *
* @param rootBroker The root ServiceBroker capable of looking up
- * non-Summit components.
+ * non-Summit components.
*/
- public void setRootServiceBroker(ServiceBroker rootBroker);
+ public void setRootServiceManager( ServiceManager rootBroker );
}