You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gr...@apache.org on 2003/08/21 16:36:22 UTC

cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/web AbstractWebApplication.java WebApplication.java

gregw       2003/08/21 07:36:22

  Modified:    modules/web/src/java/org/apache/geronimo/web
                        AbstractWebApplication.java WebApplication.java
  Log:
  Slight changes to getDeploymentDescriptr
  
  Revision  Changes    Path
  1.2       +18 -7     incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebApplication.java
  
  Index: AbstractWebApplication.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebApplication.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractWebApplication.java	18 Aug 2003 13:30:41 -0000	1.1
  +++ AbstractWebApplication.java	21 Aug 2003 14:36:22 -0000	1.2
  @@ -56,7 +56,7 @@
   
   package org.apache.geronimo.web;
   
  -import java.net.URL;
  +import java.net.URI;
   
   import org.apache.geronimo.common.AbstractComponent;
   import org.w3c.dom.Document;
  @@ -131,7 +131,7 @@
        * @return
        * @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptor()
        */
  -    public Document getDeploymentDescriptor()
  +    public String getDeploymentDescriptor()
       {
           // TODO
           return null;
  @@ -140,9 +140,9 @@
       /* -------------------------------------------------------------------------------------- */
       /* 
        * @return
  -     * @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptorURL()
  +     * @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptorURI()
        */
  -    public URL getDeploymentDescriptorURL()
  +    public URI getDeploymentDescriptorURI()
       {
           // TODO
           return null;
  @@ -151,9 +151,20 @@
       /* -------------------------------------------------------------------------------------- */
       /* 
        * @return
  -     * @see org.apache.geronimo.web.WebApplication#getURL()
  +     * @see org.apache.geronimo.web.WebApplication#getDeploymentDescriptorDocument()
        */
  -    public URL getURL()
  +    public Document getDeploymentDescriptorDocument()
  +    {
  +        // TODO
  +        return null;
  +    }
  +
  +    /* -------------------------------------------------------------------------------------- */
  +    /* 
  +     * @return
  +     * @see org.apache.geronimo.web.WebApplication#getURI()
  +     */
  +    public URI getURI()
       {
           // TODO
           return null;
  
  
  
  1.2       +22 -20    incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebApplication.java
  
  Index: WebApplication.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/WebApplication.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WebApplication.java	18 Aug 2003 13:30:41 -0000	1.1
  +++ WebApplication.java	21 Aug 2003 14:36:22 -0000	1.2
  @@ -56,7 +56,7 @@
   
   package org.apache.geronimo.web;
   
  -import java.net.URL;
  +import java.net.URI;
   
   import org.apache.geronimo.common.Component;
   import org.w3c.dom.Document;
  @@ -73,23 +73,25 @@
    */
   public interface WebApplication extends Component {
   
  -	/* -------------------------------------------------------------------------------------- */
  -	/**Get the url of the webapp
  -	* @return
  -	*/
  -	public URL getURL();
  -
  -	/*-------------------------------------------------------------------------------- */
  -	/** JSR077 WebModule method to expose the
  -	 * names of all servlets contained within this webapp.
  -	 * 
  -	* @return Names of all servlets contained by this webapp
  -	*/
  -	public String[] getServlets();
  -
  -	public String getContextPath();
  -
  -	public Document getDeploymentDescriptor();
  +    /* -------------------------------------------------------------------------------------- */
  +    /**Get the url of the webapp
  +     * @return
  +     */
  +    public URI getURI();
  +    
  +    /*-------------------------------------------------------------------------------- */
  +    /** JSR077 WebModule method to expose the
  +     * names of all servlets contained within this webapp.
  +     * 
  +     * @return Names of all servlets contained by this webapp
  +     */
  +    public String[] getServlets();
  +    
  +    public String getContextPath();
  +    
  +    public String getDeploymentDescriptor();
  +    
  +    public URI getDeploymentDescriptorURI();
       
  -    public URL getDeploymentDescriptorURL();
  +    public Document getDeploymentDescriptorDocument();
   }