You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2003/02/22 12:38:12 UTC

cvs commit: jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/extension/jetty JettyInitializer.java

vmassol     2003/02/22 03:38:12

  Modified:    framework/src/java/j2ee13/org/apache/cactus
                        FilterTestCase.java
               framework/src/java/j2ee13/org/apache/cactus/extension/jetty
                        JettyInitializer.java
  Log:
  Package refactoring that should not impact anyone.
  
  Revision  Changes    Path
  1.9       +2 -2      jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/FilterTestCase.java
  
  Index: FilterTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/FilterTestCase.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FilterTestCase.java	21 Feb 2003 10:49:17 -0000	1.8
  +++ FilterTestCase.java	22 Feb 2003 11:38:12 -0000	1.9
  @@ -59,8 +59,8 @@
   import javax.servlet.FilterChain;
   import javax.servlet.http.HttpServletResponse;
   
  +import org.apache.cactus.configuration.Configuration;
   import org.apache.cactus.server.FilterConfigWrapper;
  -import org.apache.cactus.util.Configuration;
   import org.apache.cactus.util.FilterConfiguration;
   
   /**
  
  
  
  1.8       +17 -11    jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/extension/jetty/JettyInitializer.java
  
  Index: JettyInitializer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/framework/src/java/j2ee13/org/apache/cactus/extension/jetty/JettyInitializer.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JettyInitializer.java	4 Jan 2003 16:44:33 -0000	1.7
  +++ JettyInitializer.java	22 Feb 2003 11:38:12 -0000	1.8
  @@ -58,14 +58,14 @@
   
   import java.net.URL;
   
  +import org.apache.cactus.client.initialization.Initializable;
  +import org.apache.cactus.configuration.BaseConfiguration;
  +import org.apache.cactus.configuration.Configuration;
  +import org.apache.cactus.configuration.ServletConfiguration;
   import org.apache.cactus.server.FilterTestRedirector;
   import org.apache.cactus.server.ServletTestRedirector;
  -import org.apache.cactus.util.BaseConfiguration;
   import org.apache.cactus.util.ClassLoaderUtils;
  -import org.apache.cactus.util.Configuration;
   import org.apache.cactus.util.FilterConfiguration;
  -import org.apache.cactus.util.Initializable;
  -import org.apache.cactus.util.ServletConfiguration;
   
   /**
    * Cactus initializer to start an embedded Jetty server. It will be stopped
  @@ -146,8 +146,10 @@
        * Create a Jetty server object and configures a listener on the
        * port defined in the Cactus context URL property.
        * 
  -     * @param theConfiguration the base Cactus configuration
     * @return the Jetty <code>Server</code> object
  -     * 
     * @exception Exception if an error happens during initialization
  +     * @param theConfiguration the base Cactus configuration
  +     * @return the Jetty <code>Server</code> object
  +     * 
  +     * @exception Exception if an error happens during initialization
        */
       public Object createServer(Configuration theConfiguration) 
           throws Exception
  @@ -171,9 +173,11 @@
        * Create a Jetty Context. We use a <code>WebApplicationContext</code>
        * because we need to use Servlet Filters.
        * 
  -     * @param theServer the Jetty Server object
     * @param theConfiguration the base Cactus configuration
  +     * @param theServer the Jetty Server object
  +     * @param theConfiguration the base Cactus configuration
        * @return Object the <code>WebApplicationContext</code> object
  -     * 
     * @exception Exception if an error happens during initialization
  +     * 
  +     * @exception Exception if an error happens during initialization
        */
       public Object createContext(Object theServer,
           Configuration theConfiguration) throws Exception
  @@ -203,9 +207,11 @@
       
       /**
        * Adds the Cactus Servlet redirector configuration
  -     * 
     * @param theContext the Jetty context under which to add the configuration
  +     * 
  +     * @param theContext the Jetty context under which to add the configuration
        * @param theConfiguration the Cactus Servlet configuration
  -     * 
     * @exception Exception if an error happens during initialization
  +     * 
  +     * @exception Exception if an error happens during initialization
        */
       public void addServletRedirector(Object theContext,
           ServletConfiguration theConfiguration) throws Exception
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org