geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject cvs commit: incubator-geronimo/modules/web/src/java/org/apache/geronimo/web AbstractWebContainer.java
Date Mon, 24 Nov 2003 00:04:32 GMT
jboynes     2003/11/23 16:04:32

  Modified:    modules/core/src/java/org/apache/geronimo/connector/deployment
                        ConnectorDeploymentPlanner.java
               modules/kernel/src/java/org/apache/geronimo/kernel/deployment
                        DeploymentHelper.java
               modules/web/src/java/org/apache/geronimo/web
                        AbstractWebContainer.java
  Log:
  Renamed method to comply with coding convention
  
  Revision  Changes    Path
  1.6       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/deployment/ConnectorDeploymentPlanner.java
  
  Index: ConnectorDeploymentPlanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/connector/deployment/ConnectorDeploymentPlanner.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ConnectorDeploymentPlanner.java	18 Nov 2003 02:18:04 -0000	1.5
  +++ ConnectorDeploymentPlanner.java	24 Nov 2003 00:04:32 -0000	1.6
  @@ -144,7 +144,7 @@
           URL url = goal.getUrl();
           ConnectorDeploymentHelper dHelper =
                   new ConnectorDeploymentHelper(url, goal.getType());
  -        URL raURL = dHelper.locateJ2eeDD();
  +        URL raURL = dHelper.locateJ2EEDD();
           URL graURL = dHelper.locateGeronimoDD();
           // Is the specific URL deployable?
           if (null == raURL) {
  
  
  
  1.5       +2 -2      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/DeploymentHelper.java
  
  Index: DeploymentHelper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/DeploymentHelper.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeploymentHelper.java	17 Nov 2003 07:33:51 -0000	1.4
  +++ DeploymentHelper.java	24 Nov 2003 00:04:32 -0000	1.5
  @@ -137,7 +137,7 @@
        *
        * @throws org.apache.geronimo.kernel.deployment.DeploymentException
        */
  -    public URL locateJ2eeDD() throws DeploymentException {
  +    public URL locateJ2EEDD() throws DeploymentException {
           return j2eeURL;
       }
   
  
  
  
  1.22      +2 -2      incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java
  
  Index: AbstractWebContainer.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/web/src/java/org/apache/geronimo/web/AbstractWebContainer.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- AbstractWebContainer.java	23 Nov 2003 22:39:21 -0000	1.21
  +++ AbstractWebContainer.java	24 Nov 2003 00:04:32 -0000	1.22
  @@ -226,7 +226,7 @@
           URL url = goal.getUrl();
           DeploymentHelper deploymentHelper = new DeploymentHelper(url, goal.getType(), "WebApplication",
"web.xml", "geronimo-web.xml", "WEB-INF");
           URL geronimoDDURL = deploymentHelper.locateGeronimoDD();
  -        URL webDDURL = deploymentHelper.locateJ2eeDD();
  +        URL webDDURL = deploymentHelper.locateJ2EEDD();
   
           // Is the specific URL deployable?
           if (null == geronimoDDURL) {
  
  
  

Mime
View raw message