avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl DefaultServletHolder.java
Date Mon, 02 Feb 2004 11:33:22 GMT
mcconnell    2004/02/02 03:33:22

  Added:       merlin/facilities/http/api/src/java/org/apache/avalon/http
                        HttpException.java HttpRuntimeException.java
               merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl
                        DefaultServletHolder.java
  Log:
  Updates related to the management of components that are servlets.
  
  Revision  Changes    Path
  1.1                  avalon/merlin/facilities/http/api/src/java/org/apache/avalon/http/HttpException.java
  
  Index: HttpException.java
  ===================================================================
  /* 
   * Copyright 2004 Apache Software Foundation
   * Licensed  under the  Apache License,  Version 2.0  (the "License");
   * you may not use  this file  except in  compliance with the License.
   * You may obtain a copy of the License at 
   * 
   *   http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed  under the  License is distributed on an "AS IS" BASIS,
   * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   * implied.
   * 
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.avalon.http;
  
  import org.apache.avalon.framework.CascadingException;
  
  /**
   * Exception to indicate that there was a http management related error.
   *
   * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
   * @version $Revision: 1.1 $ $Date: 2004/02/02 11:33:22 $
   */
  public class HttpException
          extends CascadingException
  {
  
      /**
       * Construct a new <code>HttpException</code> instance.
       *
       * @param message The detail message for this exception.
       */
      public HttpException( final String message )
      {
          this( message, null );
      }
  
      /**
       * Construct a new <code>HttpException</code> instance.
       *
       * @param message The detail message for this exception.
       * @param throwable the root cause of the exception
       */
      public HttpException( final String message, final Throwable throwable )
      {
          super( message, throwable );
      }
  }
  
  
  
  
  1.1                  avalon/merlin/facilities/http/api/src/java/org/apache/avalon/http/HttpRuntimeException.java
  
  Index: HttpRuntimeException.java
  ===================================================================
  /* 
   * Copyright 2004 Apache Software Foundation
   * Licensed  under the  Apache License,  Version 2.0  (the "License");
   * you may not use  this file  except in  compliance with the License.
   * You may obtain a copy of the License at 
   * 
   *   http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed  under the  License is distributed on an "AS IS" BASIS,
   * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
   * implied.
   * 
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.avalon.http;
  
  import org.apache.avalon.framework.CascadingRuntimeException;
  
  /**
   * Exception to indicate that there was a http management related error.
   *
   * @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
   * @version $Revision: 1.1 $ $Date: 2004/02/02 11:33:22 $
   */
  public class HttpRuntimeException
          extends CascadingRuntimeException
  {
  
      /**
       * Construct a new <code>HttpRuntimeException</code> instance.
       *
       * @param message The detail message for this exception.
       */
      public HttpRuntimeException( final String message )
      {
          this( message, null );
      }
  
      /**
       * Construct a new <code>HttpRuntimeException</code> instance.
       *
       * @param message The detail message for this exception.
       * @param throwable the root cause of the exception
       */
      public HttpRuntimeException( final String message, final Throwable throwable )
      {
          super( message, throwable );
      }
  }
  
  
  
  
  1.1                  avalon/merlin/facilities/http/impl/src/java/org/apache/avalon/http/impl/DefaultServletHolder.java
  
  Index: DefaultServletHolder.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 2002,2003 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
      must not be used to endorse or promote products derived from this  software
      without  prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation. For more  information on the
   Apache Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.avalon.apps.sevak.blocks.jetty;
  
  import org.apache.avalon.activation.appliance.Appliance;
  import org.apache.avalon.composition.model.ComponentModel;
  import org.apache.avalon.http.HttpRuntimeException;
  import org.mortbay.jetty.servlet.ServletHolder;
  import org.mortbay.jetty.servlet.ServletHandler;
  
  /**
   * The DefaultServletHolder is an appliance based lifecycle handler
   * that overrides classic jetty servlet deployment.
   *
   * @author  <a href="mailto:mcconnell@apache.org">Stephen McConnell</a>
   * @version 1.0
   */
  class DefaultServletHolder extends ServletHolder
  {
      private final ComponentModel m_model;
  
     /**
      * Construct a Servlet Holder using a supplied ComponentModel.
      *
      * @param model the component model
      * @param handler the servlet handler
      */
      public DefaultServletHolder( 
        ComponentModel model, ServletHandler handler )
      {
          super( 
            handler, 
            model.getQualifiedName(), 
            model.getType().getInfo().getClassname() );
          m_model = model;
      }
  
      /**
       * Returns a new instance of the servlet through aquision os a runtime
       * component from the supplied component model.
       * @return the instance
       * @throws InstantiationException if a instantiation problem occurs
       * @throws IllegalAccessException if an acvcess error occurs
       */
      public synchronized Object newInstance() 
        throws InstantiationException, IllegalAccessException
      {
          try
          {
              Appliance appliance = (Appliance)m_model.getHandler();
              return appliance.resolve();
          }
          catch( Throwable e )
          {
              final String error =
                "Appliance resolution error in model: " + m_model;
              throw new HttpRuntimeException( error, e );
          }
      }
  }
  
  
  

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


Mime
View raw message