anchor.diff:  	    mkdir -p ${cfg.baseDir}
   
   	    # Create a symlink to the bin directory of the tomcat component
  -	    ln -sfn ${pkgs.tomcat6}/bin ${cfg.baseDir}/bin
  +	    ln -sfn ${tomcat}/bin ${cfg.baseDir}/bin
   
   	    # Create a conf/ directory
   	    mkdir -p ${cfg.baseDir}/conf
   	    chown ${cfg.user}:${cfg.group} ${cfg.baseDir}/conf
   
   	    # Symlink the config files in the conf/ directory (except for catalina.properties and server.xml)
  -	    for i in $(ls ${pkgs.tomcat6}/conf | grep -v catalina.properties | grep -v server.xml)
  +	    for i in $(ls ${tomcat}/conf | grep -v catalina.properties | grep -v server.xml)
   	    do
  -	        ln -sfn ${pkgs.tomcat6}/conf/$i ${cfg.baseDir}/conf/`basename $i`
  +	        ln -sfn ${tomcat}/conf/$i ${cfg.baseDir}/conf/`basename $i`
   	    done
   
               # Create subdirectory for virtual hosts
  
positive.code: let
  
    cfg = config.services.tomcat;
  
  in
  
  {
  
negative.code:       };
  
        webapps = mkOption {
          default = [ tomcat ];
          description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
        };
  
  