CVS: plexus-components/summit/src/java/org/apache/plexus/summit AbstractSummitComponent.java,1.2,1.3 Summit.java,1.5,1.6 SummitComponent.java,1.2,1.3

[email protected] Sat, 3 May 2003 09:31:45 -0500
Newsgroups gmane.comp.java.plexus.devel
Message-ID <[email protected]>
Update of /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit
In directory eng.werken.com:/tmp/cvs-serv7104/src/java/org/apache/plexus/summit

Modified Files:
	AbstractSummitComponent.java Summit.java SummitComponent.java 
Log Message:
o Cleanups


Index: AbstractSummitComponent.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/AbstractSummitComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AbstractSummitComponent.java	1 May 2003 19:28:39 -0000	1.2
+++ AbstractSummitComponent.java	3 May 2003 14:31:42 -0000	1.3
@@ -95,24 +95,6 @@
     /** The service manager that created this object */
     private ServiceManager manager;
 
-    /** The application view id */
-    private String applicationViewId;
-
-    /** The application view name */
-    private String applicationViewName;
-
-    /** @see org.apache.plexus.summit.SummitComponent#getApplicationViewName() */
-    public String getApplicationViewName()
-    {
-        return applicationViewName;
-    }
-
-    /** @see org.apache.plexus.summit.SummitComponent#getApplicationViewId() */
-    public String getApplicationViewId()
-    {
-        return applicationViewId;
-    }
-
     public ServiceManager getServiceManager()
     {
         return manager;

Index: Summit.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/Summit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Summit.java	1 May 2003 19:28:39 -0000	1.5
+++ Summit.java	3 May 2003 14:31:42 -0000	1.6
@@ -79,7 +79,7 @@
 public class Summit
     extends PlexusServlet
 {
-    private SummitView applicationView;
+    Pipeline pipeline;
 
     /**
      * Intialize Servlet.
@@ -89,24 +89,19 @@
     {
         super.init( config );
 
-        //log.info( "Loading Summit configuration" );
-        //log.info( "Initializing Application Views" );
-
         try
         {
-            applicationView = (SummitView) getServiceManager().lookup( SummitView.ROLE );
+            pipeline = (Pipeline) getServiceManager().lookup( Pipeline.ROLE );
         }
         catch ( ServiceException e )
         {
-            throw new ServletException( "Could not find the application applicationView. Summit Init Failed", e );
+            throw new ServletException( "Cannot initialize pipeline." );
         }
 
-        //log.info( "Summit Initialization complete, Ready to service requests." );
-
     }
 
     // -------------------------------------------------------------------
-    // R E Q U E S T  P R O C E S S I N G
+    // Request Processing
     // -------------------------------------------------------------------
 
     /**
@@ -129,7 +124,6 @@
             data.setRootServiceManager( getServiceManager() );
 
             // Execute the pipeline for this application applicationView.
-            Pipeline pipeline = (Pipeline) getServiceManager().lookup( Pipeline.ROLE );
             pipeline.invoke( data );
         }
         catch ( Throwable t )

Index: SummitComponent.java
===================================================================
RCS file: /cvsroot/plexus/plexus-components/summit/src/java/org/apache/plexus/summit/SummitComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SummitComponent.java	1 May 2003 19:28:39 -0000	1.2
+++ SummitComponent.java	3 May 2003 14:31:43 -0000	1.3
@@ -75,20 +75,6 @@
 public interface SummitComponent
 {
     /**
-     * Get the identifier for this component's application view.
-     *
-     * @return The identifier of the view.
-     */
-    public String getApplicationViewId();
-
-    /**
-     * Get the name of this component's application view.
-     *
-     * @return The name of the view.
-     */
-    public String getApplicationViewName();
-
-    /**
      * Gets the ServiceBroker associated with the current view.  This
      * will allow a component to get other components within the
      * application view.