CVS: plexus-components/summit/src/java/org/apache/plexus/summit/rundata AbstractRunData.java,1.5,1.6 RunData.java,1.6,1.7

[email protected] Mon, 5 May 2003 13:57:35 -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-serv4103/summit/src/java/org/apache/plexus/summit/rundata

Modified Files:
	AbstractRunData.java RunData.java 
Log Message:
I forgot that there was already a getServiceManager() method
in SummitComponent, so now we can remove the cruft in RunData.

Index: AbstractRunData.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/rundata/AbstractRunData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- AbstractRunData.java	5 May 2003 16:42:14 -0000	1.5
+++ AbstractRunData.java	5 May 2003 18:57:33 -0000	1.6
@@ -66,7 +66,6 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.avalon.framework.activity.Initializable;
-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;
@@ -112,9 +111,6 @@
     /** The RequestParameterParser used to parse the request */
     private RequestParameterParser parameterParser;
 
-    /** The root ServiceBroker used to lookup non-Summit components */
-    private ServiceManager rootServiceManager;
-
     public void initialize() throws Exception
     {
         parameterParser = (RequestParameterParser)
@@ -335,21 +331,5 @@
     public ServletContext getServletContext()
     {
         return servletConfig.getServletContext();
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.plexus.summit.rundata.RunData#getRootServiceBroker()
-     */
-    public ServiceManager getServiceManager()
-    {
-        return rootServiceManager;
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.plexus.summit.rundata.RunData#setRootServiceBroker(org.apache.plexus.service.ServiceBroker)
-     */
-    public void setServiceManager( ServiceManager rootServiceManager )
-    {
-        this.rootServiceManager = rootServiceManager;
     }
 }

Index: RunData.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/rundata/RunData.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- RunData.java	5 May 2003 16:42:14 -0000	1.6
+++ RunData.java	5 May 2003 18:57:33 -0000	1.7
@@ -67,7 +67,6 @@
 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
@@ -208,19 +207,4 @@
      * Get the servlet context for this turbine webapp.
      */
     public ServletContext getServletContext();
-
-    /**
-     * Get the ServiceManager from the Plexus which created the
-     * PlexusServlet.
-     *
-     * @return ServiceManager The ServiceManager.
-     */
-    public ServiceManager getServiceManager();
-
-    /**
-     * Set the ServiceManager.
-     *
-     * @param rootBroker The ServiceManager.
-     */
-    public void setServiceManager( ServiceManager manager );
 }