cvs commit: jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig ConnectorStoreAppender.java

[pe...@apache.org]

pero        2005/02/15 01:35:22

  Modified:    modules/storeconfig/src/share/org/apache/catalina/storeconfig
                        ConnectorStoreAppender.java
  Log:
  add remove default jkHome handing
  
  Revision  Changes    Path
  1.2       +55 -0     jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
  
  Index: ConnectorStoreAppender.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/ConnectorStoreAppender.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConnectorStoreAppender.java	8 Jan 2005 11:14:07 -0000	1.1
  +++ ConnectorStoreAppender.java	15 Feb 2005 09:35:22 -0000	1.2
  @@ -19,13 +19,18 @@
   import java.beans.IntrospectionException;
   import java.beans.Introspector;
   import java.beans.PropertyDescriptor;
  +import java.io.File;
  +import java.io.IOException;
   import java.io.PrintWriter;
   import java.util.ArrayList;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.List;
   
  +import org.apache.catalina.Container;
   import org.apache.catalina.connector.Connector;
  +import org.apache.catalina.core.StandardContext;
  +import org.apache.catalina.core.StandardHost;
   import org.apache.coyote.ProtocolHandler;
   import org.apache.tomcat.util.IntrospectionUtils;
   
  @@ -223,5 +228,55 @@
           }
           super.printValue(writer, indent, repl, value);
       }
  +    
  +    /*
  +     * Print Context Values. <ul><li> Spezial handling to default workDir.
  +     * </li><li> Don't save path at external context.xml </li><li> Don't
  +     * generate docBase for host.appBase webapps <LI></ul>
  +     * 
  +     * @see org.apache.catalina.config.StoreAppender#isPrintValue(java.lang.Object,
  +     *      java.lang.Object, java.lang.String,
  +     *      org.apache.catalina.config.StoreDescription)
  +     */
  +    public boolean isPrintValue(Object bean, Object bean2, String attrName,
  +            StoreDescription desc) {
  +        boolean isPrint = super.isPrintValue(bean, bean2, attrName, desc);
  +        if (isPrint) {
  +            if ("jkHome".equals(attrName)) {
  +                Connector connector = ((Connector) bean);
  +                File catalinaBase = getCatalinaBase();
  +                File jkHomeBase = getJkHomeBase((String) connector
  +                        .getProperty("jkHome"), catalinaBase);
  +                isPrint = !catalinaBase.equals(jkHomeBase);
  +
  +            }
  +        }
  +        return isPrint;
  +    }
  +
  +    protected File getCatalinaBase() {
  +
  +        File appBase;
  +        File file = new File(System.getProperty("catalina.base"));
  +        try {
  +            file = file.getCanonicalFile();
  +        } catch (IOException e) {
  +        }
  +        return (file);
  +    }
  +
  +    protected File getJkHomeBase(String jkHome, File appBase) {
  +
  +        File jkHomeBase;
  +        File file = new File(jkHome);
  +        if (!file.isAbsolute())
  +            file = new File(appBase, jkHome);
  +        try {
  +            jkHomeBase = file.getCanonicalFile();
  +        } catch (IOException e) {
  +            jkHomeBase = file;
  +        }
  +        return (jkHomeBase);
  +    }
   
   }
  \ No newline at end of file
  
  
  

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