You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/02/02 20:26:43 UTC

cvs commit: avalon/merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener DefaultHTTPModelListener.java

mcconnell    2004/02/02 11:26:43

  Modified:    merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener
                        DefaultHTTPModelListener.java
  Log:
  Addition of servlet discovery and registration with the http server facility.
  
  Revision  Changes    Path
  1.4       +7 -10     avalon/merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener/DefaultHTTPModelListener.java
  
  Index: DefaultHTTPModelListener.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/facilities/http/listener/src/java/org/apache/avalon/http/listener/DefaultHTTPModelListener.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultHTTPModelListener.java	2 Feb 2004 11:31:37 -0000	1.3
  +++ DefaultHTTPModelListener.java	2 Feb 2004 19:26:43 -0000	1.4
  @@ -150,16 +150,15 @@
               Class clazz = component.getDeploymentClass();
               if( Servlet.class.isAssignableFrom( clazz ) )
               {
  -                if( getLogger().isInfoEnabled() )
  +                if( flag )
                   {
  -                    getLogger().info( 
  -                      "component: " + component + " is a Servlet" );
  +                    if( getLogger().isInfoEnabled() )
  +                    {
  +                        getLogger().info( 
  +                          "component: " + component + " is a Servlet" );
  +                    }
  +                    m_server.register( component );
                   }
  -
  -                // ## TODO
  -                // register the component with the http
  -                // server under a special servlet holder
  -                //
               }
           }
       }
  @@ -173,7 +172,6 @@
       */
       public void modelAdded( CompositionEvent event )
       {
  -        System.out.println( "# model added: " + event );
           DeploymentModel model = event.getChild();
           processModel( model, true );
       }
  @@ -183,7 +181,6 @@
       */
       public void modelRemoved( CompositionEvent event )
       {
  -        System.out.println( "# model removed: " + event );
           DeploymentModel model = event.getChild();
           processModel( model, false );
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org