This commit was manufactured by cvs2svn to create tag 'glite-lb-server-

author cvs2svn <admin@example.com>

Tue, 19 Oct 2004 13:51:59 +0000 (13:51 +0000)

committer cvs2svn <admin@example.com>

Tue, 19 Oct 2004 13:51:59 +0000 (13:51 +0000)
author cvs2svn <admin@example.com>
Tue, 19 Oct 2004 13:51:59 +0000 (13:51 +0000)
committer cvs2svn <admin@example.com>
Tue, 19 Oct 2004 13:51:59 +0000 (13:51 +0000)
diff --git a/org.glite.deployment.lb/.cvsignore b/org.glite.deployment.lb/.cvsignore

deleted file mode 100644 (file)

index 3a4edf6..0000000
--- a/org.glite.deployment.lb/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/org.glite.deployment.lb/build.xml b/org.glite.deployment.lb/build.xml

deleted file mode 100644 (file)

index 0ceaee9..0000000
--- a/org.glite.deployment.lb/build.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) Members of the EGEE Collaboration. 2004 
-       See http://eu-egee.org/partners/ for details on the copyright holders
-       For license conditions see the license file or http://eu-egee.org/license.html
-
-       Build file for the gLite LB Server Deployment Unit
-       
-    Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>     
-
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.4  2004/10/14 16:07:53  dimeglio
-       Removed wms.thirdparty-globus-ssl-utils
-       
-       Revision 1.3  2004/10/14 11:50:22  dimeglio
-       Fixed some name and formatting issues
-       
-       Revision 1.2  2004/10/06 11:42:02  harakaly
-       first fill-up
-       
-       Revision 1.1  2004/10/06 09:19:24  dimeglio
-       First version of this file
-       
--->
-
-<project name="deployment-lb" default="dist">
-
-       <!-- =========================================
-                Builds the gLite LB Server Deployment Unit
-                ========================================= -->
-
-       <!-- =========================================
-            Import properties (order is important)
-                ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-
-       <!-- =========================================
-                Load dependency property files (order is important)
-                ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-
-
-       <!-- =========================================
-                Import task definitions (order is important)
-                ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-
-       <!-- =========================================
-                Load configure options
-                ========================================= -->
-       <property file="${global.configure.options.file}"/>
-
-       <!-- =========================================
-                Load common targets
-                ========================================= -->
-       <import file="${global.targets-external-dependencies.file}"/>
-       <import file="${global.targets-deploy.file}" />
-
-       <!-- =========================================
-                Load version file 
-                ========================================= -->
-       <property file="${module.version.file}"/>
-
-       <!-- ==============================================
-                Local private targets
-                ============================================== -->
-
-       <target name="localinit"
-               description="Module specific initialization tasks">
-       </target>
-
-       <target name="localcompile"
-               description="Module specific compilation tasks">
-       </target>
-
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-
-</project>
diff --git a/org.glite.deployment.lb/config/glite-lb.cfg.xml b/org.glite.deployment.lb/config/glite-lb.cfg.xml

deleted file mode 100644 (file)

index 0c9049c..0000000
--- a/org.glite.deployment.lb/config/glite-lb.cfg.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--  Parameters for  configuring the org.glite.data.io-daemon service -->
-<config>
-   <parameter name='verbose'         value='true'/>
-
-   <!-- host certificate -->
-   <parameter name='certs'           value='true'/>
-   <parameter name='certs_path'      value='/etc/grid-security/certificates'/>
-   <parameter name='host_cert_path'  value='/etc/grid-security'/>
-   <parameter name='hostcert'        value='hostcert.pem'/>
-   <parameter name='hostkey'         value='hostkey.pem'/>
-
-   <!-- user account -->
-   <parameter name='username'        value='glite'/>
-   <parameter name='group_name'      value='glite'/>
-   <parameter name='user_cert_path'  value='.cert'/>
-
-   <!-- env variables -->
-   <parameter name='glite_location'  value='/opt/glite'/>
-   <parameter name='globus_location' value='/opt/globus'/>
-
-   <!-- MySQL DB -->
-   <parameter name='db_name'         value='lbserver20'/>
-   <parameter name='db_user'         value='lbserver'/>
-</config>
diff --git a/org.glite.deployment.lb/config/scripts/glite-lb-config b/org.glite.deployment.lb/config/scripts/glite-lb-config

deleted file mode 100644 (file)

index f2e6433..0000000
--- a/org.glite.deployment.lb/config/scripts/glite-lb-config
+++ /dev/null
@@ -1,304 +0,0 @@
-#!/usr/bin/env python
-#####################################################################################
-#
-# Template script for configuring the gLite LB service
-# David Collados <david.collados@cern.ch>
-# $Id:
-#
-#####################################################################################
-#
-# Copyright (c) Members of the EGEE Collaboration. 2004.
-# See http://eu-egee.org/partners/ for details on the copyright holders.
-# For license conditions see the license file or http://eu-egee.org/license.html
-#
-#####################################################################################
-
-import os,string
-import sys, posix
-import getopt
-import _xmlplus
-import _xmlplus.xpath as xpath
-import xml.dom.minidom
-import time
-from xml.dom.minidom import Node
-
-
-# Set global variables here 
-global config
-global nodeType 
-nodeType = "lb"
-global verbose
-global certs
-
-#-------------------------------------------------------------------------------
-# Print some help
-#-------------------------------------------------------------------------------
-
-def usage(msg='glite-lb-bkserverd start/stop/status'):
-    pass
-
-#-------------------------------------------------------------------------------
-# Set all environment variables
-#-------------------------------------------------------------------------------
-
-def set_env():
-   print '#-------------------------------------------------------------------'
-   print 'Setting ENV variables in /root/.bashrc and /root/.profile'
-   print '#-------------------------------------------------------------------'
-   file = open('/root/.bashrc', 'a')
-   file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
-   file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
-   file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH\n')
-   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
-   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert']))
-   file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
-   file.close()
-   file = open('/root/.profile', 'a')
-   file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
-   file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
-   file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH\n')
-   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
-   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert']))
-   file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
-   file.close()
-   print 'OK!\n'
-
-   print '#-------------------------------------------------------------------'
-   print ('Setting ENV variables in /home/%s/.bashrc and /home/%s/.profile' % (config['username'], config['username']))
-   print '#-------------------------------------------------------------------'
-   file = open('/home/%s/.bashrc' % config['username'], 'a')
-   file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
-   file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
-   file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH\n')
-   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
-   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert'])) 
-   file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
-   file.close()
-   file = open('/home/%s/.profile' % config['username'], 'a')
-   file.write('\nexport GLITE_LOCATION=%s\n' % config['glite_location'])
-   file.write('export GLOBUS_LOCATION=%s\n' % config['globus_location'])
-   file.write('export LD_LIBRARY_PATH=$GLITE_LOCATION/lib:$GLOBUS_LOCATION/lib:$LD_LIBRARY_PATH\n')
-   file.write('export GLITE_HOST_KEY=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostkey']))
-   file.write('export GLITE_HOST_CERT=/home/%s/%s/%s\n' % (config['username'], config['user_cert_path'], config['hostcert']))
-   file.write('export GLITE_CERT_DIR=%s\n\n' % config['certs_path'])
-   file.close()
-   os.chown('/home/%s/.bashrc' % config['username'], config['username'], config['group_name'])
-   os.chown('/home/%s/.profile' % config['username'], config['username'], config['group_name'])
-   print 'OK!\n'
-
-
-#-------------------------------------------------------------------------------
-# Display the service configuration parameters
-#-------------------------------------------------------------------------------
-
-def print_config(config):
-    print '#-------------------------------------------------------------------'
-    print 'Configuration parameters for the gLite %s installation: ' % (nodeType)
-    print '#-------------------------------------------------------------------'
-
-    for x in config.keys():
-       print '%s = %s ' % (x, config[x])
-    
-    print "\n"
-    
-
-#-------------------------------------------------------------------------------
-# Check to see if host certs exist and that the permissions are correct
-#-------------------------------------------------------------------------------
-
-def check_certs():
-   # Check host certicicates exist
-   print '#-------------------------------------------------------------------'
-   print 'Checking if the hostkey and hostcert are in the machine.'
-   print '#-------------------------------------------------------------------'
-
-   hostcert = '%s/%s' % (config['host_cert_path'], config['hostcert'])
-   hostkey  = '%s/%s' % (config['host_cert_path'], config['hostkey'])
-   if not os.path.exists(hostcert):
-      sys.exit("Error: Host certificate not found at %s" % hostcert)
-   if not os.path.exists(hostkey) :
-      sys.exit("Error: Host key not found at %s" % hostkey)
-
-   print('OK!\n')
-   os.chmod(hostcert, 0644)
-   os.chmod(hostkey, 0600)
-
-#-------------------------------------------------------------------------------
-# All the configuration code goes here
-#-------------------------------------------------------------------------------
-
-def configure():
-   # Load environment variables
-   print '#-------------------------------------------------------------------'
-   print 'Loading environment variables.'
-   print '#-------------------------------------------------------------------'
-   os.system('source /root/.bashrc')
-   print('OK!\n')
-
-
-   # Create the MySQL database
-   print '#-------------------------------------------------------------------'
-   print ('Creating MySQL %s database.' % config['db_name'])
-   print '#-------------------------------------------------------------------'
-   os.system('/usr/bin/mysqlaccess %s %s' % (config['db_user'], config['db_name']))
-   file = open('/tmp/mysql_ct', 'w')
-   file.write('CREATE DATABASE %s;\n' % config['db_name'])
-   file.write('GRANT ALL PRIVILEGES ON %s.* TO %s@localhost IDENTIFIED BY "";\n' % (config['db_name'], config['db_user']))
-   file.write('USE %s;\n' % config['db_name'])
-   file.write('\. %s/etc/glite-lb-dbsetup.sql\n' % config['glite_location'])
-   file.close()
-   os.system('/usr/bin/mysql < /tmp/mysql_ct')
-
-
-   # Restarting MySQL
-   print '#-------------------------------------------------------------------'
-   print 'Restarting MySQL.'
-   print '#-------------------------------------------------------------------'
-   os.system('/etc/init.d/mysql stop')
-   time.sleep(5)  # Sleep 5 seconds before starting MySQL
-   os.system('/etc/init.d/mysql start')
-   print '\n'
-
-
-   # Create var directory
-   print '#-------------------------------------------------------------------'
-   print ('Creating %s/var directory.' % config['glite_location'])
-   print '#-------------------------------------------------------------------'
-   os.makedirs('%s/var' % config['glite_location'])
-   os.chmod('%s/var' % config['glite_location'], 777)
-   if os.path.exists('%s/var' % config['glite_location']):
-      print('OK!\n')
-   else:
-      sys.exit('Could not create directory %s/var\n' % config['glite_location'])
-
-   return 1
-
-
-#-------------------------------------------------------------------------------
-# Add user and group
-#-------------------------------------------------------------------------------
-
-def create_account():
-   # Create the group and user account
-   print '#-------------------------------------------------------------------'
-   print ('Adding group name "%s"' % config['group_name'])
-   print '#-------------------------------------------------------------------'
-   os.system('/usr/sbin/groupadd %s' % config['group_name'])
-   file = open('/etc/group', 'r')
-   group = config['group_name']
-   found_group = 0;
-   for line in file.readlines():
-      rec = string.splitfields(line, ':')
-      if rec[0] == group:
-         print ('OK!\n')
-         found_group = 1
-         break
-   if (found_group == 0):
-      sys.exit('Could not add group: %s' % group)
-
-   print '#-------------------------------------------------------------------'
-   print ('Adding user "%s" to group "%s"' % (config['username'], config['group_name']))
-   print '#-------------------------------------------------------------------'
-   os.system('/usr/sbin/useradd -s /bin/sh -g %s %s' % (config['group_name'], config['username']))
-   file = open('/etc/passwd', 'r')
-   user = config['username']
-   found_user = 0;
-   for line in file.readlines():
-      rec = string.splitfields(line, ':')
-      if rec[0] == user:
-         print ('OK!\n')
-         found_user = 1
-         break
-   if (found_user == 0):
-      sys.exit('Could not add user: %s' % user)
-
-
-
-#-------------------------------------------------------------------------------
-# Load the configuration values for the service 
-#-------------------------------------------------------------------------------
-
-def LoadParameterFile(filename='config.xml'):
-    doc = xml.dom.minidom.parse(filename)
-
-    nodes = xpath.Evaluate("/config/parameter", doc.documentElement)
-    params = {}
-    for node in nodes:
-        if params.has_key(node.attributes['name'].nodeValue):
-            print 'Warning name: %s already defined with value: %s' \
-                  % (node.attributes['name'].nodeValue, \
-                     node.attributes['value'].nodeValue)
-        else:
-            params[node.attributes['name'].nodeValue] = \
-            node.attributes['value'].nodeValue
-    return params
-
-
-#-------------------------------------------------------------------------------
-#  Main program begins here 
-#-------------------------------------------------------------------------------
-
-if __name__ == '__main__':
-
-   print '#-------------------------------------------------------------------'
-   print 'Installing a gLite %s' % (nodeType)
-   print '#-------------------------------------------------------------------'
-
-   # Command line opts if any
-   try:
-      opts, args = getopt.getopt(sys.argv[1:], 'h:t', ['help', 'test='])
-   except getopt.GetoptError:
-      usage()
-      sys.exit(2)
-
-   for o, a in opts:
-      if o in ("-h", "--help"):
-         usage('Test message if needed')
-         sys.exit()
-         lfn = a
-      if o == "--test":
-         var=a
-
-   # The script must be run as root
-   if not os.geteuid()==0:
-      sys.exit("\nThis script must be run as root\n")
-    
-   # Read service configuration information from a file
-   configFile = "../glite-%s.cfg.xml" % nodeType
-   config = LoadParameterFile(configFile)
-
-   # Create user account
-   create_account()
-
-   # Host certificates
-   if config['certs'] == 'true':
-      if not check_certs():
-         os.path.isfile("No host certificats found - plase install them and rerun")
-
-   # Verbose
-   if config['verbose'] == 'true':
-      verbose = 1
-   else:
-      verbose = 0
-   
-   # Set up the environment
-   set_env()
-      
-   # Print configuration parameters
-   if verbose:
-      print_config(config)
-
-   # Configure the service
-   if configure():
-      print '#-------------------------------------------------------------------'
-      print ('%s configuration successfully completed' % nodeType)
-      print '#-------------------------------------------------------------------'
-      print '\n'
-
-   # Start the daemon
-   print '#-------------------------------------------------------------------'
-   print ('Starting the gLite LB daemon using: %s/etc/init.d/glite-lb-bkserverd start' % config['glite_location'])
-   print '#-------------------------------------------------------------------'
-   os.system('%s/etc/init.d/glite-lb-bkserverd start' % config['glite_location'])
-   print '\n'
-
diff --git a/org.glite.deployment.lb/project/.cvsignore b/org.glite.deployment.lb/project/.cvsignore

deleted file mode 100644 (file)

index caf4eaa..0000000
--- a/org.glite.deployment.lb/project/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-glite-lb.sdf.xml
diff --git a/org.glite.deployment.lb/project/build.properties b/org.glite.deployment.lb/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.deployment.lb/project/glite-lb.sdf.xml.template b/org.glite.deployment.lb/project/glite-lb.sdf.xml.template

deleted file mode 100644 (file)

index 34f1f3b..0000000
--- a/org.glite.deployment.lb/project/glite-lb.sdf.xml.template
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version ="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) Members of the EGEE Collaboration. 2004 
-       See http://eu-egee.org/partners/ for details on the copyright holders
-       For license conditions see the license file or http://eu-egee.org/license.html
--->
-
-<node name="glite-lb-node" version="@module.version@">
-       <services>
-               <service name="glite-lb-service">
-                       <components>
-                               <component name="glite-lb-client-interface"
-                                       version="@org.glite.lb.client-interface.version@"
-                                       age="@org.glite.lb.client-interface.age@"
-                                       build="@org.glite.lb.client-interface.build@"
-                                       arch="i386"/>
-                       
-                               <component name="glite-lb-logger"
-                                       version="@org.glite.lb.logger.version@"
-                                       age="@org.glite.lb.logger.age@"
-                                       build="@org.glite.lb.logger.build@"
-                                       arch="i386"/>
-               
-                               <component name="glite-lb-common"
-                                       version="@org.glite.lb.common.version@"
-                                       age="@org.glite.lb.common.age@"
-                                       build="@org.glite.lb.common.build@"
-                                       arch="i386"/>
-       
-                               <component name="glite-lb-server"
-                                       version="@org.glite.lb.server.version@"
-                                       age="@org.glite.lb.server.age@"
-                                       build="@org.glite.lb.server.build@"
-                                       arch="i386"/>
-                                          
-                               <component name="glite-lb-server-bones"
-                                       version="@org.glite.lb.server-bones.version@"
-                                       age="@org.glite.lb.server-bones.age@"
-                                       build="@org.glite.lb.server-bones.build@"
-                                       arch="i386"/>
-                                          
-                               <component name="glite-wms-utils-jobid"
-                                       version="@org.glite.wms-utils.jobid.version@"
-                                       age="@org.glite.wms-utils.jobid.age@"
-                                       build="@org.glite.wms-utils.jobid.build@"
-                                       arch="i386"/>
-       
-                               <component name="glite-wms-utils-exception"
-                                       version="@org.glite.wms-utils.exception.version@"
-                                       age="@org.glite.wms-utils.exception.age@"
-                                       build="@org.glite.wms-utils.exception.build@"
-                                       arch="i386"/>
-       
-                               <component name="glite-security-proxyrenewal"
-                                       version="@org.glite.security.proxyrenewal.version@"
-                                       age="@org.glite.security.proxyrenewal.age@"
-                                       build="@org.glite.security.proxyrenewal.build@"
-                                       arch="i386"/>
-       
-                       </components>
-                       <dependencies>
-                               <external name="MySQL-server"
-                                       version="4.0.20"
-                                       age="0"
-                                       arch="i386"/>
-                               <external name="MySQL-client"
-                                       version="4.0.20"
-                                       age="0"
-                                       arch="i386"/>                             
-                               <external name="ares"
-                                       version="1.1.1"
-                                       age="EGEE"
-                                       arch="i386"/>                             
-                               <external name="vdt_globus_essentials"
-                                       version="VDT1.2.0rh9"
-                                       age="1"
-                                       arch="i386"/>
-                               <external name="gpt"
-                                       version="VDT1.2.0rh9"
-                                       age="1"
-                                       arch="i386"/>                                            
-                               <external name="myproxy"
-                                       version="1.14"
-                                       age="EGEE"
-                                       arch="i386"/>
-                               <external name="perl-Expect.pm"
-                                       version="1.01"
-                                       age="9"
-                                       arch="i386"/>
-                       </dependencies>
-               </service>
-       </services>
-       <dependencies>
-               <external name="ca_ArmeSFo"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_ASGCCA"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_BEGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_CERN"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_CESNET"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_CNRS-DataGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_CNRS-Projets"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_CNRS"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_CyGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_DOEGrids"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_DOESG-Root"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_ESnet"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_FNAL"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_FNAL_KCA"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_GermanGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_Grid-Ireland"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_GridCanada"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_HellasGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_INFN"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_IUCC"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_LIP"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_NIKHEF"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_NorduGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_PK-Grid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_PolishGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_Russia"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_SlovakGrid"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_Spain"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-               <external name="ca_UKeScience"
-                                 version="0.23"
-                                 age="1"
-                                 arch="noarch"/>
-       </dependencies>
-</node>
diff --git a/org.glite.deployment.lb/project/glite-lb.spec b/org.glite.deployment.lb/project/glite-lb.spec

deleted file mode 100644 (file)

index 7ac378b..0000000
--- a/org.glite.deployment.lb/project/glite-lb.spec
+++ /dev/null
@@ -1,43 +0,0 @@
-Summary:LB node installation package
-Name:glite-lb
-Version:@MODULE.VERSION@
-Release:@MODULE.BUILD@
-Copyright:Open Source EGEE License
-Vendor:EU EGEE project
-Group:System/Application
-Prefix:/opt/glite
-BuildArch:i386
-BuildRoot:%{_builddir}/%{name}-%{version}
-Requires: glite-lb-common, glite-lb-logger, glite-lb-server, glite-security-proxyrenewal, glite-lb-client-interface, MySQL-server, MySQL-client, expat, ares,vdt_globus_essentials, glite-wms-utils-jobid, glite-wms-utils-exception, glite-wms-utils-thirdparty-globus_ssl_utils, myproxy, perl-Expect.pm 
-
-AutoReqProv:no
-Source:glite-lb.tar.gz
-%define debug_package %{nil}
-
-%description
-LB node installation package
-
-%prep
- 
-
-%setup -c
-
-%build
- 
-
-%install
- 
-
-%clean
- 
-%pre
-%post
-#echo "post install script"
-%preun
-%postun
-%files
-%attr(755,root,root) %{prefix}/etc/config/scripts
-%attr(644,root,root) %{prefix}/etc/config/
-
-%changelog
-
diff --git a/org.glite.deployment.lb/project/lxscript-rpm.xsl b/org.glite.deployment.lb/project/lxscript-rpm.xsl

deleted file mode 100644 (file)

index 20c12b8..0000000
--- a/org.glite.deployment.lb/project/lxscript-rpm.xsl
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsl:stylesheet version="1.0" 
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-       
-       <xsl:output method="xml" 
-               indent="yes"
-               encoding="UTF-8"
-               omit-xml-declaration="yes"/>
-
-       <!-- Definition of variables and parameters -->
-       <xsl:param name="repository"/>
-       <xsl:param name="ext-repository"/>
-
-       <!-- global processing -->
-       <xsl:template match="/">
-#!/bin/sh
-
-# Copyright (c) Members of the EGEE Collaboration. 2004 
-# See http://eu-egee.org/partners/ for details on the copyright holders
-# For license conditions see the license file or http://eu-egee.org/license.html
-
-# glite-lb_installer v. <xsl:value-of select="/node/@version"/>
-#
-# The glite-lb_installer installs the gLite <xsl:value-of select="/node/@name"/> Deployment Unit
-#
-# Usage: glite-lb_installer [-u|-v|--help]
-#        -u          uninstall
-#        -v          print version
-#        --help      print script usage info
-# Return codes: 0 - Ok
-#               1 - if a file could not be downloaded
-
-###############################################################################
-function install()
-{
-       # Download global dependencies  
-       <xsl:for-each select="node/dependencies">
-               <xsl:apply-templates>
-                               <xsl:with-param name="install">true</xsl:with-param>
-               </xsl:apply-templates>
-       </xsl:for-each>
-       
-       <xsl:for-each select="node/services/service">
-
-       # Download <xsl:value-of select="@name"/> dependencies RPMS from repository
-               <xsl:for-each select="dependencies">
-                       <xsl:apply-templates>
-                               <xsl:with-param name="install">true</xsl:with-param>
-                       </xsl:apply-templates>
-               </xsl:for-each>
-
-       # Download <xsl:value-of select="@name"/> RPMS from repository
-               <xsl:for-each select="components">
-                       <xsl:apply-templates>
-                               <xsl:with-param name="install">true</xsl:with-param>
-                       </xsl:apply-templates>
-               </xsl:for-each>
-
-       </xsl:for-each>
-               
-       # Install all RPMS
-       rpm -Uvh $RPMLIST
-}
-
-###############################################################################
-function uninstall()
-{
-       # Global dependencies   
-       <xsl:for-each select="node/dependencies">
-               <xsl:apply-templates>
-                       <xsl:with-param name="install">false</xsl:with-param>
-               </xsl:apply-templates>
-       </xsl:for-each>
-               
-       <xsl:for-each select="node/services/service">
-
-       # <xsl:value-of select="@name"/> dependencies RPMS from repository
-               <xsl:for-each select="dependencies">
-                       <xsl:apply-templates>
-                               <xsl:with-param name="install">false</xsl:with-param>
-                       </xsl:apply-templates>
-               </xsl:for-each>
-
-       # <xsl:value-of select="@name"/> RPMS from repository
-               <xsl:for-each select="components">
-                       <xsl:apply-templates>
-                               <xsl:with-param name="install">false</xsl:with-param>
-                       </xsl:apply-templates>
-               </xsl:for-each>
-
-       </xsl:for-each>
-               
-       # Uninstall all RPMS
-       rpm -e $RPMLIST
-}
-
-###############################################################################
-function usage()
-{
-       echo 
-       echo Copyright \(c\) Members of the EGEE Collaboration. 2004 
-       echo See http://eu-egee.org/partners/ for details on the copyright holders
-       echo For license conditions see the license file or http://eu-egee.org/license.html
-       echo 
-       echo glite-lb_installer v. <xsl:value-of select="/node/@version"/>
-       echo 
-       echo The glite-lb_installer installs the gLite <xsl:value-of select="/node/@name"/> Deployment Unit
-       echo 
-       echo Usage: glite-lb_installer \[-u\|-v\|--help\]
-       echo -u          uninstall
-       echo -v          print version
-       echo --help      print script usage info
-       echo 
-       echo Return codes:
-       echo 0 - Ok
-       echo 1 - if a file could not be downloaded
-       echo 
-}
-
-###############################################################################
-function version
-{
-       echo 
-       echo Copyright \(c\) Members of the EGEE Collaboration. 2004 
-       echo See http://eu-egee.org/partners/ for details on the copyright holders
-       echo For license conditions see the license file or http://eu-egee.org/license.html
-       echo 
-       echo glite-lb_installer v. <xsl:value-of select="/node/@version"/>
-       echo 
-}
-
-
-RPMLIST=
-
-###############################################################################
-# Main
-
-while getopts uvh opt
-do
-       case $opt in
-               'u') uninstall
-                    exit 0     
-                    ;;
-               'v') version
-                    exit 0     
-                    ;;
-               'h') usage
-                    exit 0     
-                    ;;
-       esac
-done
-
-install
-
-exit 0
-       </xsl:template>
-
-       <xsl:template name="dependencies" match="external">
-               <xsl:param name="install"/>
-               <xsl:variable name="package"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/>.<xsl:value-of select="@arch"/>.rpm</xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="$install = 'true'">
-wget -N --non-verbose <xsl:value-of select="$ext-repository"/><xsl:value-of select="$package"/>
-if [ ! -f "<xsl:value-of select="$package"/>" ]
-then
-       echo 
-       echo ERROR: <xsl:value-of select="$package"/> could not be downloaded!
-       exit 1
-fi
-                       </xsl:when>
-               </xsl:choose>
-RPMLIST="$RPMLIST <xsl:value-of select="$package"/>"
-       </xsl:template>
-       
-       <xsl:template name="components" match="component">
-               <xsl:param name="install"/>
-               <xsl:variable name="package"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/>.<xsl:value-of select="@arch"/>.rpm</xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="$install='true'">
-wget -N --non-verbose <xsl:value-of select="$repository"/><xsl:value-of select="@arch"/>/RPMS/<xsl:value-of select="$package"/>
-if [ ! -f "<xsl:value-of select="$package"/>" ]
-then
-       echo 
-       echo ERROR: <xsl:value-of select="$package"/> could not be downloaded!
-       exit 1
-fi
-                       </xsl:when>
-               </xsl:choose>
-RPMLIST="$RPMLIST <xsl:value-of select="$package"/>"
-       </xsl:template>
-
-</xsl:stylesheet>
diff --git a/org.glite.deployment.lb/project/lxscript-tgz.xsl b/org.glite.deployment.lb/project/lxscript-tgz.xsl

deleted file mode 100644 (file)

index 5b55e40..0000000
--- a/org.glite.deployment.lb/project/lxscript-tgz.xsl
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<xsl:stylesheet version="1.0" 
-       xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-       
-       <xsl:output method="xml" 
-               indent="yes"
-               encoding="UTF-8"
-               omit-xml-declaration="yes"/>
-
-       <!-- Definition of variables and parameters -->
-       <xsl:param name="repository"/>
-       <xsl:param name="ext-repository"/>
-
-       <!-- global processing -->
-       <xsl:template match="/">
-#!/bin/sh
-#
-# glite-lb_tgz_installer
-# usage: glite-lb_tgz_installer [-u]
-#               -u             uninstall
-#
-# glite-lb_tgz_installer installs the gLite <xsl:value-of select="/node/@name"/> Deployment Unit from biniary tarballs
-#
-<!-- Put here pre-install instructions -->
-PREFIX=/opt/glite
-
-###############################################################################
-# Download global dependencies 
-               <xsl:for-each select="node/dependencies">
-                       <xsl:apply-templates/>
-               </xsl:for-each>
-###############################################################################
-               
-               <xsl:for-each select="node/services/service">
-###############################################################################
-# Download <xsl:value-of select="@name"/> dependencies RPMS from repository
-                       <xsl:for-each select="dependencies">
-                               <xsl:apply-templates/>
-                       </xsl:for-each>
-###############################################################################
-# Download <xsl:value-of select="@name"/> RPMS from repository
-                       <xsl:for-each select="components">
-                               <xsl:apply-templates/>
-                       </xsl:for-each>
-###############################################################################
-               </xsl:for-each>
-               
-       </xsl:template>
-
-       <xsl:template name="dependencies" match="external">
-               <xsl:variable name="package"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>-<xsl:value-of select="@age"/>.<xsl:value-of select="@arch"/>.rpm</xsl:variable>
-wget <xsl:value-of select="$ext-repository"/><xsl:value-of select="$package"/>
-       </xsl:template>
-       
-       <xsl:template name="components" match="component">
-               <xsl:variable name="package"><xsl:value-of select="@name"/>-<xsl:value-of select="@version"/>_bin.tar.gz</xsl:variable>
-wget <xsl:value-of select="$repository"/>i386/tgz/<xsl:value-of select="$package"/>
-tar -xzf <xsl:value-of select="$package"/> $PREFIX
-       </xsl:template>
-
-</xsl:stylesheet>
diff --git a/org.glite.deployment.lb/project/properties.xml b/org.glite.deployment.lb/project/properties.xml

deleted file mode 100644 (file)

index 638f02b..0000000
--- a/org.glite.deployment.lb/project/properties.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) Members of the EGEE Collaboration. 2004 
-       See http://eu-egee.org/partners/ for details on the copyright holders
-       For license conditions see the license file or http://eu-egee.org/license.html
-
-       Common build properties file for the gLite LB Server Node Deployment Unit
-       
-       Author: Alberto Di Meglio <alberto.di.meglio@cern.ch>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
--->
-
-<project name="gLite LB Server Deployment Unit common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${deployment.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${deployment.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="lb" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-</project>
diff --git a/org.glite.deployment.lb/project/version.properties b/org.glite.deployment.lb/project/version.properties

deleted file mode 100644 (file)

index 312c4a3..0000000
--- a/org.glite.deployment.lb/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 10:00:35 CEST 2004
-module.version=0.1.0
-module.build=12
-module.age=1
diff --git a/org.glite.jp.common/Makefile b/org.glite.jp.common/Makefile

deleted file mode 100644 (file)

index 8626261..0000000
--- a/org.glite.jp.common/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-# defaults
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-jp-common
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-gsoap_prefix=/software/gsoap-2.6
-
-CC=gcc
-
--include Makefile.inc
-
-
-VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/project:${jpproject}
-
-GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
-
-
-DEBUG:=-g -O0 
-CFLAGS:=${DEBUG} -I. -I${top_srcdir}/interface -I${stagedir}/include \
-       ${GLOBUSINC}
-
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} -rpath ${stagedir}/lib
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
-INSTALL:=libtool --mode=install install
-COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-
-HDRS:=types.h context.h strmd5.h
-
-SRCS:=context.c strmd5.c
-OBJS:=${SRCS:.c=.lo}
-
-commonlib:= libglite_jp_common.la
-
-default all: compile
-
-compile: ${commonlib}
-
-${commonlib}: ${OBJS}
-       ${LINK} -o $@ ${OBJS}
-
-check: 
-       -echo nothing yet
-
-doc:
-
-stage: compile
-       $(MAKE) install PREFIX=${stagedir}
-
-install:
-       -mkdir -p ${PREFIX}/include/${globalprefix}/${jpprefix}
-       cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${jpprefix}
-       -mkdir -p ${PREFIX}/lib
-       ${INSTALL} -m 755 ${commonlib} ${PREFIX}/lib
-
-dist: distsrc distbin
-
-# FIXME: just copied from LB
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-        
-clean:
-
-%.lo: %.c
-       ${COMPILE} -o $@ -c $< 
diff --git a/org.glite.jp.common/build.xml b/org.glite.jp.common/build.xml

deleted file mode 100755 (executable)

index 0b93f98..0000000
--- a/org.glite.jp.common/build.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite JP Common module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1  2004/09/14 12:31:52  ljocha
-       *** empty log message ***
-       
-       Revision 1.5  2004/07/28 12:27:00  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.4  2004/07/06 17:51:37  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.3  2004/06/22 22:49:46  dimeglio
-       Removed debug comments
-       
-       Revision 1.2  2004/06/22 22:06:52  dimeglio
-       Added standard comments
-       
--->
-
-<project name="common" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite JP Primary Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                 Load configure options (order is important)
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-        <import file="${component.configure.options.file}"/>
-       
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-</project>             
diff --git a/org.glite.jp.common/interface/context.h b/org.glite.jp.common/interface/context.h

deleted file mode 100644 (file)

index 20effb2..0000000
--- a/org.glite.jp.common/interface/context.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __GLITE_JP_CONTEXT
-#define __GLITE_JP_CONTEXT
-
-int glite_jp_init_context(glite_jp_context_t *);
-void glite_jp_free_query_rec(glite_jp_query_rec_t *);
-
-char *glite_jp_peer_name(glite_jp_context_t);
-char *glite_jp_error_chain(glite_jp_context_t);
-
-int glite_jp_stack_error(glite_jp_context_t, const glite_jp_error_t *);
-int glite_jp_clear_error(glite_jp_context_t); 
-
-int glite_jp_add_deferred(glite_jp_context_t,int (*)(glite_jp_context_t,void *),void *);
-int glite_jp_run_deferred(glite_jp_context_t);
-
-
-#endif
diff --git a/org.glite.jp.common/interface/strmd5.h b/org.glite.jp.common/interface/strmd5.h

deleted file mode 100755 (executable)

index c5d76b6..0000000
--- a/org.glite.jp.common/interface/strmd5.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _GLITE_STRMD5_H
-#define _GLITE_STRMD5_H
-
-#ident "$Header$"
-
-/* Compute MD5 sum of the first argument.
- * The sum is returned in the 16-byte array pointed to by 2nd argument
- *     (if not NULL)
- *
- * Return value: ASCII string of the sum, i.e. 32 characters [0-9a-f]
- *     (pointer to static area, changed by subsequent calls)
- */
-
-char *strmd5(const char *src, unsigned char *dst);
-
-/**
- * Returns: allocated 32bytes long ASCII string with md5 sum
- * of the first argument
- */
-char *str2md5(const char *src);
-
-/**
- * Returns: allocated 22bytes long ASCII string with md5 sum in base64
- * format of the source argument
- */
-char *str2md5base64(const char *src);
-
-#endif /* _GLITE_STRMD5_H */
diff --git a/org.glite.jp.common/interface/types.h b/org.glite.jp.common/interface/types.h

deleted file mode 100644 (file)

index 70e8482..0000000
--- a/org.glite.jp.common/interface/types.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef __GLITE_JP_TYPES
-#define __GLITE_JP_TYPES
-
-#include <sys/time.h>
-
-typedef struct _glite_jp_error_t {
-       int     code;
-       char    *desc;
-       char    *source;
-       struct _glite_jp_error_t *reason;
-} glite_jp_error_t;
-
-typedef struct _glite_jp_context {
-       glite_jp_error_t *error;
-       int     (**deferred_func)(struct _glite_jp_context *,void *);
-       void    **deferred_arg;
-       void    *feeds;
-       struct soap     *other_soap;
-} *glite_jp_context_t;
-
-typedef enum {
-       GLITE_JP_FILECLASS_UNDEF,
-       GLITE_JP_FILECLASS_INPUT,
-       GLITE_JP_FILECLASS_OUTPUT,
-       GLITE_JP_FILECLASS_LBLOG,
-       GLITE_JP_FILECLASS_TAGS,
-       GLITE_JP_FILECLASS__LAST
-} glite_jp_fileclass_t;
-
-typedef struct {
-       char    *name;
-       int     sequence;
-       time_t  timestamp;
-       int     binary;
-       size_t  size;
-       char    *value;
-} glite_jp_tagval_t;
-
-typedef enum {
-       GLITE_JP_ATTR_UNDEF,
-       GLITE_JP_ATTR_OWNER,
-       GLITE_JP_ATTR_TIME,
-       GLITE_JP_ATTR_TAG,
-       GLITE_JP_ATTR__LAST
-} glite_jp_attrtype_t;
-
-typedef struct {
-       glite_jp_attrtype_t     type;
-       char    *name;
-} glite_jp_attr_t;
-
-typedef struct {
-       glite_jp_attr_t attr;
-       union {
-               char    *s;
-               int     i;
-               struct timeval time;
-               glite_jp_tagval_t tag;
-       } value;
-} glite_jp_attrval_t;
-
-
-typedef enum {
-       GLITE_JP_QUERYOP_UNDEF,
-       GLITE_JP_QUERYOP_EQUAL,
-       GLITE_JP_QUERYOP_UNEQUAL,
-       GLITE_JP_QUERYOP_LESS,
-       GLITE_JP_QUERYOP_GREATER,
-       GLITE_JP_QUERYOP_WITHIN,
-       GLITE_JP_QUERYOP__LAST,
-} glite_jp_queryop_t;
-
-typedef struct {
-       glite_jp_attr_t attr;
-       glite_jp_queryop_t op;
-       union _glite_jp_query_rec_val {
-               char    *s;
-               int     i;
-               struct timeval time;
-       } value,value2;
-} glite_jp_query_rec_t;
-
-#endif
diff --git a/org.glite.jp.common/project/configure.properties.xml b/org.glite.jp.common/project/configure.properties.xml

deleted file mode 100644 (file)

index 9e1f7ed..0000000
--- a/org.glite.jp.common/project/configure.properties.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite JP Common module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.3  2004/08/31 07:57:17  akrenek
-       very first unit test
-       
-       Revision 1.2  2004/07/06 20:50:10  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="JP Common configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-jpprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-cppunit=${with.cppunit.prefix}
-jpproject=${subsystem.project.dir}
-project=${component.project.dir}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.jp.common/project/properties.xml b/org.glite.jp.common/project/properties.xml

deleted file mode 100755 (executable)

index 2d7b685..0000000
--- a/org.glite.jp.common/project/properties.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Common component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.3  2004/07/16 14:56:55  flammer
-       Corrected input path of build.properties.
-       
-       Revision 1.2  2004/06/22 22:05:23  dimeglio
-       Added configuration options
-       
--->
-
-<project name="JP Common component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="org.glite.jp"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="jp"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="common" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.jp.common/src/context.c b/org.glite.jp.common/src/context.c

deleted file mode 100644 (file)

index 016bc59..0000000
--- a/org.glite.jp.common/src/context.c
+++ /dev/null
@@ -1,164 +0,0 @@
-#include <string.h>
-#include <stdlib.h>
-
-#include "types.h"
-#include "context.h"
-
-int glite_jp_init_context(glite_jp_context_t *ctx)
-{
-       *ctx = calloc(1,sizeof **ctx);
-}
-
-char *glite_jp_peer_name(glite_jp_context_t ctx)
-{
-       return strdup("unknown");
-}
-
-char *glite_jp_error_chain(glite_jp_context_t ctx)
-{
-       char    *ret = NULL,indent[300] = "";
-       int     len = 0,add;
-       char    buf[2000];
-
-       glite_jp_error_t *ep = ctx->error;
-
-       do {
-               add = snprintf(buf,sizeof buf,"%s%s: %s (%s)\n",
-                               indent,
-                               ep->source,
-                               strerror(ep->code),
-                               ep->desc ? ep->desc : "");
-               ret = realloc(ret,len + add + 1);
-               strncpy(ret + len,buf,add); ret[len += add] = 0;
-               strcat(indent,"  ");
-       } while (ep = ep->reason);
-
-       return ret;
-}
-
-int glite_jp_stack_error(glite_jp_context_t ctx, const glite_jp_error_t *err)
-{
-       glite_jp_error_t        *reason = ctx->error;
-
-       ctx->error = calloc(1,sizeof *ctx->error);
-       ctx->error->code = err->code;
-       ctx->error->desc = err->desc ? strdup(err->desc) : NULL;
-       ctx->error->source = err->source ? strdup(err->source) : NULL;
-       ctx->error->reason = reason;
-
-       return err->code;
-}
-
-int glite_jp_clear_error(glite_jp_context_t ctx)
-{
-       glite_jp_error_t        *e = ctx->error, *r;
-
-       while (e) {
-               r = e->reason;
-               free(e->source);
-               free(e->desc);
-               free(e);
-               e = r;
-       }
-       ctx->error = NULL;
-       return 0;
-}
-
-
-void glite_jp_free_query_rec(glite_jp_query_rec_t *q)
-{
-       free(q->attr.name); q->attr.name = NULL;
-       switch (q->attr.type) {
-               case GLITE_JP_ATTR_OWNER:
-               case GLITE_JP_ATTR_TAG:
-                       free(q->value.s); q->value.s = NULL;
-                       if (q->op == GLITE_JP_QUERYOP_WITHIN) {
-                               free(q->value2.s);
-                               q->value2.s = NULL;
-                       }
-                       break;
-               default: break;
-       }
-}
-
-int glite_jp_attr_copy(glite_jp_attr_t *dst,const glite_jp_attr_t *src)
-{
-       dst->name = src->name ? strdup(src->name) : NULL;
-       dst->type = src->type;
-       return 0;
-}
-
-int glite_jp_queryrec_copy(glite_jp_query_rec_t *dst, const glite_jp_query_rec_t *src)
-{
-       glite_jp_attr_copy(&dst->attr,&src->attr);
-       dst->op = src->op;
-       switch (src->attr.type) {
-               case GLITE_JP_ATTR_OWNER:
-               case GLITE_JP_ATTR_TAG:
-                       dst->value.s = strdup(src->value.s);
-                       if (dst->op == GLITE_JP_QUERYOP_WITHIN)
-                               dst->value2.s = strdup(src->value2.s);
-                       break;
-               case GLITE_JP_ATTR_TIME:
-                       memcpy(&dst->value.time,&src->value.time,sizeof dst->value.time);
-                       if (dst->op == GLITE_JP_QUERYOP_WITHIN)
-                               memcpy(&dst->value2.time,&src->value2.time,sizeof dst->value2.time);
-                       break;
-       }
-       return 0;
-}
-
-int glite_jp_run_deferred(glite_jp_context_t ctx)
-{
-       int     i,cnt,ret;
-
-       if (!ctx->deferred_func) return 0;
-
-       glite_jp_clear_error(ctx);
-       for (cnt=0;ctx->deferred_func[cnt];cnt++);
-       for (i=0; i<cnt; i++) {
-               if (ret = (*ctx->deferred_func)(ctx,*ctx->deferred_arg)) {
-                       glite_jp_error_t        err;
-                       char    desc[100];
-
-                       sprintf(desc,"calling func #%d, %p",i,*ctx->deferred_func);
-                       err.code = ret;
-                       err.desc = desc;
-                       err.source = "glite_jp_run_deferred()";
-
-                       glite_jp_stack_error(ctx,&err);
-                       return ret;
-               }
-               else {
-                       memmove(ctx->deferred_func,ctx->deferred_func+1,
-                                       (cnt-i) * sizeof *ctx->deferred_func);
-                       memmove(ctx->deferred_arg,ctx->deferred_arg+1,
-                                       (cnt-i) * sizeof *ctx->deferred_arg);
-               }
-       }
-       free(ctx->deferred_func); ctx->deferred_func = NULL;
-       free(ctx->deferred_arg); ctx->deferred_arg = NULL;
-       return 0;
-}
-
-int glite_jp_add_deferred(
-               glite_jp_context_t ctx,
-               int (*func)(glite_jp_context_t, void *),
-               void *arg
-)
-{
-       int     (**v)(glite_jp_context_t, void *) = ctx->deferred_func;
-       int     i;
-
-       for (i=0; v && *v; i++);
-
-       ctx->deferred_func = realloc(ctx->deferred_func, (i+1) * sizeof *ctx->deferred_func);
-       ctx->deferred_func[i] = func;
-       ctx->deferred_func[i+1] = NULL;
-
-       ctx->deferred_arg = realloc(ctx->deferred_arg,(i+1) * sizeof *ctx->deferred_arg);
-       ctx->deferred_arg[i] = arg;
-       ctx->deferred_arg[i+1] = NULL;
-
-       return 0;
-}
diff --git a/org.glite.jp.common/src/strmd5.c b/org.glite.jp.common/src/strmd5.c

deleted file mode 100755 (executable)

index 87fd400..0000000
--- a/org.glite.jp.common/src/strmd5.c
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <openssl/md5.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "strmd5.h"
-
-static char mbuf[33];
-
-static int base64_encode(const void *enc, int enc_size, char *out, int out_max_size)
-{
-    static const char* b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-
-    unsigned char* enc_buf = (unsigned char*)enc;
-    int                  out_size = 0;
-    unsigned int  bits = 0;
-    unsigned int  shift = 0;
-
-    while ( out_size < out_max_size ) {
-       if ( enc_size>0 ) {
-           // Shift in byte
-           bits <<= 8;
-           bits |= *enc_buf;
-           shift += 8;
-           // Next byte
-           enc_buf++;
-           enc_size--;
-       } else if ( shift>0 ) {
-           // Pad last bits to 6 bits - will end next loop
-           bits <<= 6 - shift;
-           shift = 6;
-       } else {
-           // Terminate with Mime style '='
-           *out = '=';
-           out_size++;
-
-           return out_size;
-       }
-
-       // Encode 6 bit segments
-       while ( shift>=6 ) {
-           shift -= 6;
-           *out = b64[ (bits >> shift) & 0x3F ];
-           out++;
-           out_size++;
-       }
-    }
-
-    // Output overflow
-    return -1;
-}
-
-char *strmd5(const char *s, unsigned char *digest)
-{
-    MD5_CTX md5;
-    unsigned char d[16];
-    int        i;
-
-    MD5_Init(&md5);
-    MD5_Update(&md5,s,strlen(s));
-    MD5_Final(d,&md5);
-
-    if (digest) memcpy(digest,d,sizeof(d));
-
-    for (i=0; i<16; i++) {
-       int     dd = d[i] & 0x0f;
-       mbuf[2*i+1] = dd<10 ? dd+'0' : dd-10+'a';
-       dd = d[i] >> 4;
-       mbuf[2*i] = dd<10 ? dd+'0' : dd-10+'a';
-    }
-    mbuf[32] = 0;
-    return (char *) mbuf;
-}
-
-char *str2md5(const char *s)
-{
-    MD5_CTX md5;
-    unsigned char d[16];
-    char* ret = malloc(33);
-    int        i;
-
-    if (!ret)
-       return NULL;
-
-    MD5_Init(&md5);
-    MD5_Update(&md5, s, strlen(s));
-    MD5_Final(d, &md5);
-
-    for (i=0; i<16; i++) {
-       int  dd = d[i] & 0x0f;
-       ret[2*i+1] = dd<10 ? dd+'0' : dd-10+'a';
-       dd = d[i] >> 4;
-       ret[2*i] = dd<10 ? dd+'0' : dd-10+'a';
-    }
-    ret[32] = 0;
-    return ret;
-}
-
-char *str2md5base64(const char *s)
-{
-    MD5_CTX md5;
-    unsigned char d[16];
-    char buf[50];
-    int l;
-
-    MD5_Init(&md5);
-    MD5_Update(&md5, s, strlen(s));
-    MD5_Final(d, &md5);
-
-    l = base64_encode(d, 16, buf, sizeof(buf) - 1);
-    if (l < 1)
-       return NULL;
-    buf[l - 1] = 0;
-    return strdup(buf);
-}
diff --git a/org.glite.jp.index/Makefile b/org.glite.jp.index/Makefile

deleted file mode 100644 (file)

index 3b893cd..0000000
--- a/org.glite.jp.index/Makefile
+++ /dev/null
@@ -1,129 +0,0 @@
-# defaults
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-server
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-gsoap_prefix=/software/gsoap-2.6
-
-CC=gcc
-
--include Makefile.inc
-
-
-VPATH=${top_srcdir}/src:${top_srcdir}/examples:${top_srcdir}/test:${top_srcdir}/project:${jpproject}
-
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour}
-
-DEBUG:=-g -O0  -DDEBUG
-
-CFLAGS:=${DEBUG} -I. -I${gsoap_prefix}/include -I${stagedir}/include
-LDFLAGS:=-L${stagedir}/lib
-
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
-INSTALL:=libtool --mode=install install
-
-
-daemon:=glite-jp-indexd
-example:=jpis-test
-soap_prefix:=jpis_
-
-SRCS:= simple_server.c soap_ops.c \
-       ${soap_prefix}C.c \
-       ${soap_prefix}Server.c
-
-EXA_SRCS:=jpis-test.c ${soap_prefix}C.c ${soap_prefix}Client.c
-
-
-OBJS:=${SRCS:.c=.o} stdsoap2.o
-EXA_OBJS:=${EXA_SRCS:.c=.o} stdsoap2.o
-
-COMMONLIB:=-lglite_jp_common
-
-default all: compile
-
-compile: ${daemon} ${example}
-
-${daemon}: ${OBJS}
-       ${LINK} -o $@ ${OBJS} ${COMMONLIB} ${GLOBUS_LIBS}
-
-${example}: ${EXA_OBJS}
-       ${LINK} -o $@ ${EXA_OBJS}
-
-JobProvenanceIS.xh: JobProvenanceIS.wsdl JobProvenanceTypes.wsdl typemap.dat
-       cp  ${jpproject}/JobProvenanceTypes.wsdl .
-       ${gsoap_prefix}/bin/wsdl2h -t ${top_srcdir}/src/typemap.dat -c -o $@ $<
-       rm -f JobProvenanceTypes.wsdl
-
-${soap_prefix}C.c ${soap_prefix}H.h: JobProvenanceIS.xh
-       ${gsoap_prefix}/bin/soapcpp2 -w -c -p ${soap_prefix} JobProvenanceIS.xh
-
-#$(SOAP_PREFIX)H.h $(SOAP_PREFIX)C.c: LB.xh
-#        $(GSOAP_BIN_PATH)/soapcpp2 -w -c -p $(SOAP_PREFIX) LB.xh
-#
-#LB.xh: LB.wsdl typemap.dat
-#         $(GSOAP_BIN_PATH)/wsdl2h -c -o $@ LB.wsdl
-#
-
-
-check: 
-       -echo nothing yet
-
-doc:
-
-stage: compile
-       ${INSTALL} -m 755 ${daemon} ${stagedir}/bin
-
-dist: distsrc distbin
-
-# FIXME: just copied from LB
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-        
-install:
-       -mkdir -p ${PREFIX}/bin ${PREFIX}/etc ${PREFIX}/etc/init.d
-       for p in bkserverd bkindex; do \
-               ${INSTALL} -m 755 "glite_lb_$$p" "${PREFIX}/bin/glite-lb-$$p"; \
-       done
-
-       for f in dbsetup.sql index.conf.template; do \
-               ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc; \
-       done
-
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-bkserverd
-
-clean:
-
-soap_ops.o jpis-test.o simple_server.o: ${soap_prefix}H.h
-
-# we have no real config.h but have to force gSoap not to use
-# linux ftime with broken (aka obsolete) DST information
-
-stdsoap2.o: ${gsoap_prefix}/devel/stdsoap2.c
-       test -f config.h || touch config.h
-       @echo 'The following warning "time_t (de)serialization is not MT safe on this platform" is harmless'
-       ${CC} -o $@ -c -DHAVE_CONFIG_H ${CFLAGS} ${gsoap_prefix}/devel/stdsoap2.c
-
diff --git a/org.glite.jp.index/build.xml b/org.glite.jp.index/build.xml

deleted file mode 100755 (executable)

index 7f0b6cb..0000000
--- a/org.glite.jp.index/build.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite JP Primary module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1.1.1  2004/09/20 14:59:03  ljocha
-       
-       
-       Revision 1.1  2004/09/14 12:33:31  ljocha
-       *** empty log message ***
-       
-       Revision 1.5  2004/07/28 12:27:00  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.4  2004/07/06 17:51:37  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.3  2004/06/22 22:49:46  dimeglio
-       Removed debug comments
-       
-       Revision 1.2  2004/06/22 22:06:52  dimeglio
-       Added standard comments
-       
--->
-
-<project name="common" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite JP Primary Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                 Load configure options (order is important)
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-        <import file="${component.configure.options.file}"/>
-       
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-</project>             
diff --git a/org.glite.jp.index/project/JobProvenanceIS.wsdl b/org.glite.jp.index/project/JobProvenanceIS.wsdl

deleted file mode 100644 (file)

index 26f97a4..0000000
--- a/org.glite.jp.index/project/JobProvenanceIS.wsdl
+++ /dev/null
@@ -1,531 +0,0 @@
-<WSDL:definitions
-       xmlns:tns="http://glite.org/wsdl/services/jp"
-       xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:jp="http://glite.org/wsdl/types/jp"
-       xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/"
-       xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
-       xmlns="http://schemas.xmlsoap.org/wsdl/"
-       targetNamespace="http://glite.org/wsdl/services/jp"
-       name="JobProvenance">
-
-       <WSDL:types>
-               <schema
-                       targetNamespace="http://glite.org/wsdl/types/jp"
-                       xmlns="http://www.w3.org/2001/XMLSchema"
-                       elementFormDefault="unqualified" attributeFormDefault="unqualified">
-                       <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-                       <simpleType name="Attribute">
-                               <restriction base="xsd:string">
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="UploadClass">
-                               <restriction base="xsd:string">
-                                       <enumeration value="INPUT-SANDBOX"/>
-                                       <enumeration value="OUTPUT-SANDBOX"/>
-                                       <enumeration value="JOB-LOG"/>
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="QueryOp">
-                               <restriction base="xsd:string">
-                                       <enumeration value="EQUAL"/>
-                                       <enumeration value="UNEQUAL"/>
-                                       <enumeration value="LESS"/>
-                                       <enumeration value="GREATER"/>
-                                       <enumeration value="WITHIN"/>
-                               </restriction>
-                       </simpleType>
-                       <complexType name="TagValue">
-                               <sequence>
-                                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="true"/>
-                                       <element name="sequence" type="xsd:int" minOccurs="0" maxOccurs="1"/>
-                                       <element name="timestamp" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="stringValue" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="blobValue" type="xsd:base64Binary" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="Attributes">
-                               <sequence>
-                                       <element name="item" type="jp:Attribute" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="GenericJPFaultType">
-                               <sequence>
-                                       <element name="source" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="code" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                                       <element name="text" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="reason" type="jp:GenericJPFaultType" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="PrimaryQueryElement">
-                               <sequence>
-                                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="PrimaryQuery">
-                               <sequence>
-                                       <element name="item" type="jp:PrimaryQueryElement" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="IndexQueryRecord">
-                               <sequence>
-                                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="IndexQueryElement">
-                               <sequence>
-                                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                                       <element name="record" type="jp:IndexQueryRecord" minOccurs="1"  maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="IndexQuery">
-                               <sequence>
-                                       <element name="item" type="jp:IndexQueryElement" minOccurs="1" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobRecord">
-                               <sequence>
-                                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="PSContact" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobRecords">
-                               <sequence>
-                                       <element name="record" type="jp:JobRecord" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-
-                       <complexType name="AttrUpdate">
-                               <sequence>
-                                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="AttrUpdates">
-                               <sequence>
-                                       <element name="item" type="jp:AttrUpdate" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobUpdate">
-                               <sequence>
-                                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="attributes" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-                                       <element name="tags" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="UpdateJobsData">
-                               <sequence>
-                                       <element name="job" type="jp:JobUpdate" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                               
-                       <complexType name="FeedIndexResponse">
-                               <sequence>
-                                       <element name="feedId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="expires" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="GetJobResponse">
-                               <sequence>
-                                       <element name="jobLog" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="inputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="outputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="tags" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="StartUploadResponse">
-                               <sequence>
-                                       <element name="destination" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="commitBefore" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <element name="GenericJPFault" type="jp:GenericJPFaultType"/>
-               </schema>
-       </WSDL:types>
-       <message name="RegisterJobRequest">
-               <part name="x" type="xsd:string"/>
-       </message>
-       <message name="StartUploadRequest">
-               <part name="uclass" type="jp:UploadClass"/>
-               <part name="commitTimeout" type="xsd:duration"/>
-               <part name="contentType" type="xsd:string"/>
-       </message>
-       <message name="StartUploadResponse">
-               <part name="destination" type="xsd:string"/>
-               <part name="commitBefore" type="xsd:dateTime"/>
-       </message>
-       <message name="CommitUploadRequest">
-               <part name="destination" type="xsd:string"/>
-       </message>
-       <message name="RecordTagRequest">
-               <part name="jobid" type="xsd:string"/>
-               <part name="tag" type="jp:TagValue"/>
-       </message>
-       <message name="FeedIndexRequest">
-               <part name="destination" type="xsd:string"/>
-               <part name="attributes" type="jp:Attributes"/>
-               <part name="conditions" type="jp:PrimaryQuery"/>
-               <part name="continuous" type="xsd:boolean"/>
-       </message>
-       <message name="FeedIndexResponse">
-               <part name="feedId" type="xsd:string"/>
-               <part name="expires" type="xsd:dateTime"/>
-       </message>
-       <message name="FeedIndexRefreshRequest">
-               <part name="feedId" type="xsd:string"/>
-       </message>
-       <message name="GetJobRequest">
-               <part name="jobid" type="xsd:string"/>
-       </message>
-       <message name="GetJobResponse">
-               <part name="jobLog" type="xsd:string"/>
-               <part name="inputSandbox" type="xsd:string"/>
-               <part name="outputSandbox" type="xsd:string"/>
-               <part name="tags" type="xsd:string"/>
-       </message>
-       <message name="GenericJPFault">
-               <part name="fault" element="jp:GenericJPFault"/>
-       </message>
-       <message name="EmptyResponse"/>
-       <portType name="JobProvenancePS_PortType">
-               <operation name="RegisterJob">
-                       <documentation>Register job with JP primary storage.
-Job registration in LB is propagated to JP immediately so that JP is aware of the job,
-despite no furhter information is available in it.
-
-Input: JobId
-
-Output: N/A
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:RegisterJobRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="StartUpload">
-                       <documentation>Initiate upload of of sandbox/dump of job life log from LB.
-WM component responsible for job sandbox management and LB server call JP to declare
-intention to upload intput/output sandbox and job life log.
-
-Input:
-
-uclass: type of the upload - INPUT_SANDBOX, OUTPUT_SANDBOX, JOB_LOG
-
-commitTimeout: upper limit on time for which JP waits for committing this upload transaction
-
-contentType: MIME type of the uploaded file
-
-Output:
-
-destination: URL where the client should upload the file
-
-commitBefore: acutual time when the upload transaction times out
-
-Faults: GenericJPFault
-
-
-Initiate upload of of sandbox/dump of job life log from LB.</documentation>
-                       <input message="tns:StartUploadRequest"/>
-                       <output message="tns:StartUploadResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="CommitUpload">
-                       <documentation>Confirm upload.
-Should be called after a file upload initiaded with StartUpload is finished.
-
-Input:
-
-destination: Upload destination URL (to match with the original request)
-
-Output:
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:CommitUploadRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="RecordTag">
-                       <documentation>Record a value of user tag.
-JP tags are either standalone or override values of their LB counterparts.
-However, JP tag values are still distinguishable those inherited from LB.
-JP tags may be either strings or blobs.
-
-Input:
-
-jobid:
-
-tag: structure containing name, timestamp, optional sequence number to order tag values
-without relying on timestamps, and string or blob value.
-
-Output: N/A
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:RecordTagRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="FeedIndex">
-                       <documentation>Start feeding JP index server.
-Called by the index server to start batch feed, and optionally also subscribe for incremental feed.
-
-JP index server subscribes with JP primary storage using a query
-containing conditions on primary metadata and a list of queryable attributes
-of the index server (i.e. data which should be sent to the index server).
-
-When a matching job record is created or modified within the primary storage
-the job record data are sent to the subscribed index server.
-
-The subscription is soft-state, it expires after certain time unless refreshed by the client explicitely.
-
-In the batch mode the query has the same form
-with additional flag asking for all matching records (i.e.\ not only
-arriving afterwards).
-
-Input:
-
-destination: where to send the job record data
-
-attributes: which job record attributes should be sent to the requesting index server
-
-conditions: list of query conditions. Each conditions has the form Attribute Operator Value,
-where Attribute is any of job record attributes and Operator is one of EQUAL, UNEQUAL, LESS, GREATER, WITHIN.
-
-continuous: flag determining that the query is incremental (not batch) 
-
-Output:
-
-feedId: unique Id of the feed request, to be used in refresh, cancelation etc.
-
-expires: when the feed times out. Must be refreshed before this time.
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:FeedIndexRequest"/>
-                       <output message="tns:FeedIndexResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="FeedIndexRefresh">
-                       <documentation>Extend batch feed subscription (used by index server)
-
-Input: feedId returned previously by FeedIndex
-
-Output: the same as for FeedIndex
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:FeedIndexRefreshRequest"/>
-                       <output message="tns:FeedIndexResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="GetJob">
-                       <documentation>Retrieve job record URL's when jobid is known
-Used either to bypass JP index server query for this specific case, or after the index server query to
-retrieve actual job record.
-
-Input: jobid
-
-Output:
-
-jobLog, inputSandbox, outputSandbox, tags: URL's to components of the job record.
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:GetJobRequest"/>
-                       <output message="tns:GetJobResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-       </portType>
-       <binding name="JobProvenancePS" type="tns:JobProvenancePS_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="RegisterJob">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="StartUpload">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="CommitUpload">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="RecordTag">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="FeedIndex">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="FeedIndexRefresh">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="GetJob">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-       <service name="JobProvenancePS">
-               <documentation>Job Provenance Primary Storage service</documentation>
-               <port name="JobProvenancePS" binding="tns:JobProvenancePS">
-                       <SOAP:address location="http://localhost:10001"/>
-               </port>
-       </service>
-
-       <message name="QueryJobsRequest">
-               <part name="conditions" type="jp:IndexQuery"/>
-       </message>
-
-       <message name="QueryJobsResponse">
-               <part name="jobs" type="jp:JobRecords"/>
-       </message>
-               
-       <message name="UpdateJobsRequest">
-               <part name="feedId" type="xsd:string"/>
-               <part name="data" type="jp:UpdateJobsData"/>
-               <part name="feedDone" type="xsd:boolean"/>
-       </message>
-       
-       <portType name="JobProvenanceIS_PortType">
-               <operation name="UpdateJobs">
-                       <documentation>Store or update information on jobs within the JP index server.
-Called directly by the primary storage, used for both batch and incremental feed.
-
-Input:
-
-data: list of job record updates. Each contains jobid, list of JP attribute values and user tag values.
-
-feedDone: flag indicating end of batch feed. (In order to avoid potential problems with buffer allocation
-the huge dataset of batch feed is split into reasonable chunks and delivered with more UpdateJobs calls.)
-
-Output: N/A
-
-Faults: GenericJPFault
-
-
-                       </documentation>
-                       <input message="tns:UpdateJobsRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="QueryJobs">
-                       <documentation>Retrieve pointers to job records of jobs matching a query.
-Input: conditions - list of lists of query conditions.
-       Elements of the inner lists refer to a single job attribute, the conditions are or-ed.
-       Elements of the outer list may refer to different job attributes, they are and-ed.
-
-Output:
-
-jobs: list of JobId, PSContact (URL of the primary storage which manges this job) pairs
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:QueryJobsRequest"/>
-                       <output message="tns:QueryJobsResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-       </portType>
-
-       <binding name="JobProvenanceIS" type="tns:JobProvenanceIS_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="UpdateJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="QueryJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-
-       <service name="JobProvenanceIS">
-               <documentation>Job Provenance Index service</documentation>
-               <port name="JobProvenanceIS" binding="tns:JobProvenanceIS">
-                       <SOAP:address location="http://localhost:10001"/>
-               </port>
-       </service>
-               
-
-</WSDL:definitions>
diff --git a/org.glite.jp.index/project/configure.properties.xml b/org.glite.jp.index/project/configure.properties.xml

deleted file mode 100644 (file)

index e72730c..0000000
--- a/org.glite.jp.index/project/configure.properties.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Common module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1.1.1  2004/09/20 14:59:03  ljocha
-       
-       
-       Revision 1.1  2004/09/14 12:33:31  ljocha
-       *** empty log message ***
-       
-       Revision 1.3  2004/08/31 07:57:17  akrenek
-       very first unit test
-       
-       Revision 1.2  2004/07/06 20:50:10  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Common configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-cppunit=${with.cppunit.prefix}
-jpproject=${subsystem.project.dir}
-project=${component.project.dir}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.jp.index/project/properties.xml b/org.glite.jp.index/project/properties.xml

deleted file mode 100755 (executable)

index cdd32d9..0000000
--- a/org.glite.jp.index/project/properties.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Common component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.1.1.1  2004/09/20 14:59:03  ljocha
-       
-       
-       Revision 1.1  2004/09/14 12:33:31  ljocha
-       *** empty log message ***
-       
-       Revision 1.3  2004/07/16 14:56:55  flammer
-       Corrected input path of build.properties.
-       
-       Revision 1.2  2004/06/22 22:05:23  dimeglio
-       Added configuration options
-       
--->
-
-<project name="JP Index component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="org.glite.jp"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="jp"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="index" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.jp.index/src/simple_server.c b/org.glite.jp.index/src/simple_server.c

deleted file mode 100644 (file)

index ccaa5a7..0000000
--- a/org.glite.jp.index/src/simple_server.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "glite/jp/types.h"
-#include "glite/jp/context.h"
-
-#include "jpis_H.h"
-
-int main() {
-   struct soap soap;
-   int i, m, s; // master and slave sockets
-
-   glite_jp_context_t  ctx;
-
-   soap_init(&soap);
-   glite_jp_init_context(&ctx);
-   soap.user = (void *) ctx;
-
-   srand48(time(NULL)); /* feed id generation */
-
-   m = soap_bind(&soap, NULL, 8902, 100);
-   if (m < 0)
-      soap_print_fault(&soap, stderr);
-   else
-   {
-      fprintf(stderr, "Socket connection successful: master socket = %d\n", m);
-      for (i = 1; ; i++) {
-         s = soap_accept(&soap);
-         if (s < 0) {
-            soap_print_fault(&soap, stderr);
-            break;
-         }
-         soap_serve(&soap); // process RPC request
-         soap_destroy(&soap); // clean up class instances
-         soap_end(&soap); // clean up everything and close socket
-        glite_jp_run_deferred(ctx);
-      }
-   }
-   soap_done(&soap); // close master socket
-
-   return 0;
-}
diff --git a/org.glite.jp.index/src/soap_ops.c b/org.glite.jp.index/src/soap_ops.c

deleted file mode 100644 (file)

index 5af7352..0000000
--- a/org.glite.jp.index/src/soap_ops.c
+++ /dev/null
@@ -1,81 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "glite/jp/types.h"
-#include "glite/jp/context.h"
-
-#include "jpis_H.h"
-#include "JobProvenanceIS.nsmap"
-
-static struct jptype__GenericJPFaultType *jp2s_error(struct soap *soap,
-               const glite_jp_error_t *err)
-{
-       struct jptype__GenericJPFaultType *ret = NULL;
-       if (err) {
-               ret = soap_malloc(soap,sizeof *ret);
-               memset(ret,0,sizeof *ret);
-               ret->code = err->code;
-               ret->source = soap_strdup(soap,err->source);
-               ret->text = soap_strdup(soap,strerror(err->code));
-               ret->description = soap_strdup(soap,err->desc);
-               ret->reason = jp2s_error(soap,err->reason);
-       }
-       return ret;
-}
-
-static void err2fault(const glite_jp_context_t ctx,struct soap *soap)
-{
-       char    *et;
-       struct SOAP_ENV__Detail *detail = soap_malloc(soap,sizeof *detail);
-       struct _GenericJPFault *f = soap_malloc(soap,sizeof *f);
-
-
-       f->jptype__GenericJPFault = jp2s_error(soap,ctx->error);
-
-       detail->__type = SOAP_TYPE__GenericJPFault;
-       detail->value = f;
-       detail->__any = NULL;
-
-       soap_receiver_fault(soap,"Oh, shit!",NULL);
-       if (soap->version == 2) soap->fault->SOAP_ENV__Detail = detail;
-       else soap->fault->detail = detail;
-}
-
-static void s2jp_tag(const struct jptype__TagValue *stag,glite_jp_tagval_t *jptag)
-{
-       memset(jptag,0,sizeof *jptag);
-       jptag->name = strdup(stag->name);
-       jptag->sequence = stag->sequence ? *stag->sequence : 0;
-       jptag->timestamp = stag->timestamp ? *stag->timestamp : 0;
-       if (stag->stringValue) jptag->value = strdup(stag->stringValue);
-       else if (stag->blobValue) {
-               jptag->binary = 1;
-               jptag->size = stag->blobValue->__size;
-               jptag->value = (char *) stag->blobValue->__ptr;
-       }
-}
-
-#define CONTEXT_FROM_SOAP(soap,ctx) glite_jp_context_t ctx = (glite_jp_context_t) ((soap)->user)
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__UpdateJobs(
-       struct soap *soap,
-       char *feed_id,
-       struct jptype__UpdateJobsData *jobs,
-       enum xsd__boolean done
-)
-{
-       printf("%s items %d jobid %s\n",__FUNCTION__,jobs->__sizejob,
-                       jobs->job[0]->jobid);
-       return SOAP_OK;
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__QueryJobs(
-       struct soap *soap,
-       struct jptype__IndexQuery *query,
-       struct jpsrv__QueryJobsResponse *resp
-)
-{
-       puts(__FUNCTION__);
-       return SOAP_OK;
-}
-
diff --git a/org.glite.jp.index/src/typemap.dat b/org.glite.jp.index/src/typemap.dat

deleted file mode 100644 (file)

index 7032cb2..0000000
--- a/org.glite.jp.index/src/typemap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-jpsrv = http://glite.org/wsdl/services/jp
-jptype = http://glite.org/wsdl/types/jp
diff --git a/org.glite.jp.primary/Makefile b/org.glite.jp.primary/Makefile

deleted file mode 100644 (file)

index 94e6663..0000000
--- a/org.glite.jp.primary/Makefile
+++ /dev/null
@@ -1,148 +0,0 @@
-# defaults
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-server
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-gsoap_prefix=/software/gsoap-2.6
-
-CC=gcc
-
--include Makefile.inc
-
-
-VPATH=${top_srcdir}/src:${top_srcdir}/examples:${top_srcdir}/test:${top_srcdir}/project:${jpproject}
-
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour}
-
-DEBUG:=-g -O0  -DDEBUG
-
-CFLAGS:=${DEBUG} -I. -I${top_srcdir}/src -I${gsoap_prefix}/include -I${stagedir}/include
-LDFLAGS:=-L${stagedir}/lib
-
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
-INSTALL:=libtool --mode=install install
-
-
-daemon:=glite-jp-primarystoraged
-example:=jpps-test
-ps_prefix:=jpps_
-is_prefix:=jpis_
-
-gsoap_version=`${gsoap_prefix}/bin/soapcpp2 -version 2>&1 | cut -d' ' -f4 | perl -F\\\\. -nae '$$F[2] =~ s/\D*$$//; print $$F[2]+100*$$F[1]+10000*$$F[0]'`
-
-CFLAGS+=-DGSOAP_VERSION=${gsoap_version}
-
-
-SRCS:= simple_server.c soap_ops.c \
-       ftp_backend.c \
-       feed.c tags.c\
-       is_client.c \
-       ${ps_prefix}ServerLib.c \
-       ${is_prefix}ClientLib.c \
-       env_C.c
-
-EXA_SRCS:=jpps-test.c ${ps_prefix}C.c ${ps_prefix}Client.c
-
-
-OBJS:=${SRCS:.c=.o} stdsoap2.o
-EXA_OBJS:=${EXA_SRCS:.c=.o} stdsoap2.o
-
-COMMONLIB:=-lglite_jp_common
-
-default all: compile
-
-compile: ${daemon} ${example}
-
-${daemon}: ${OBJS}
-       ${LINK} -o $@ ${OBJS} ${COMMONLIB} ${GLOBUS_LIBS} 
-
-${example}: ${EXA_OBJS}
-       ${LINK} -o $@ ${EXA_OBJS} 
-
-JobProvenanceIS.xh JobProvenancePS.xh: %.xh: %.wsdl JobProvenanceTypes.wsdl typemap.dat
-       cp  ${jpproject}/JobProvenanceTypes.wsdl .
-       ${gsoap_prefix}/bin/wsdl2h  -t ${top_srcdir}/src/typemap.dat -c -o $@ $<
-       rm -f JobProvenanceTypes.wsdl
-
-${ps_prefix}ServerLib.c ${ps_prefix}H.h: JobProvenancePS.xh
-       ${gsoap_prefix}/bin/soapcpp2 -n -w -c -p ${ps_prefix} JobProvenancePS.xh
-
-${is_prefix}ClientLib.c ${is_prefix}H.h: JobProvenanceIS.xh
-       ${gsoap_prefix}/bin/soapcpp2 -n -w -c -p ${is_prefix} JobProvenanceIS.xh
-
-env_C.c env_Server.c:
-       touch env.xh
-       ${gsoap_prefix}/bin/soapcpp2 -w -c -p env_ env.xh
-
-#$(SOAP_PREFIX)H.h $(SOAP_PREFIX)C.c: LB.xh
-#        $(GSOAP_BIN_PATH)/soapcpp2 -w -c -p $(SOAP_PREFIX) LB.xh
-#
-#LB.xh: LB.wsdl typemap.dat
-#         $(GSOAP_BIN_PATH)/wsdl2h -c -o $@ LB.wsdl
-#
-
-
-simple_server.o: ${is_prefix}H.h ${ps_prefix}H.h
-
-check: 
-       -echo nothing yet
-
-doc:
-
-stage: compile
-       ${INSTALL} -m 755 ${daemon} ${stagedir}/bin
-
-dist: distsrc distbin
-
-# FIXME: just copied from LB
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-        
-install:
-       -mkdir -p ${PREFIX}/bin ${PREFIX}/etc ${PREFIX}/etc/init.d
-       for p in bkserverd bkindex; do \
-               ${INSTALL} -m 755 "glite_lb_$$p" "${PREFIX}/bin/glite-lb-$$p"; \
-       done
-
-       for f in dbsetup.sql index.conf.template; do \
-               ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc; \
-       done
-
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-bkserverd
-
-clean:
-
-simple_server.o soap_ops.o jpps-test.o: ${ps_prefix}H.h
-
-# we have no real config.h but have to force gSoap not to use
-# linux ftime with broken (aka obsolete) DST information
-
-stdsoap2.o: ${gsoap_prefix}/devel/stdsoap2.c
-       test -f config.h || touch config.h
-       @echo 'The following warning "time_t (de)serialization is not MT safe on this platform" is harmless'
-       ${CC} -o $@ -c -DWITH_NONAMESPACES -DHAVE_CONFIG_H ${CFLAGS} ${gsoap_prefix}/devel/stdsoap2.c
-
diff --git a/org.glite.jp.primary/build.xml b/org.glite.jp.primary/build.xml

deleted file mode 100755 (executable)

index b6f440e..0000000
--- a/org.glite.jp.primary/build.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite JP Primary module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1  2004/09/14 12:33:31  ljocha
-       *** empty log message ***
-       
-       Revision 1.5  2004/07/28 12:27:00  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.4  2004/07/06 17:51:37  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.3  2004/06/22 22:49:46  dimeglio
-       Removed debug comments
-       
-       Revision 1.2  2004/06/22 22:06:52  dimeglio
-       Added standard comments
-       
--->
-
-<project name="common" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite JP Primary Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                 Load configure options (order is important)
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-        <import file="${component.configure.options.file}"/>
-       
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-</project>             
diff --git a/org.glite.jp.primary/examples/jpps-test.c b/org.glite.jp.primary/examples/jpps-test.c

deleted file mode 100644 (file)

index 4121605..0000000
--- a/org.glite.jp.primary/examples/jpps-test.c
+++ /dev/null
@@ -1,135 +0,0 @@
-#include <stdio.h>
-#include <sysexits.h>
-#include <string.h>
-#include <assert.h>
-
-#include "jpps_H.h"
-#include "jpps_.nsmap"
-
-#include "jptype_map.h"
-
-static void usage(const char *me)
-{
-       fprintf(stderr,"%s: [-s server-url] operation args \n\n"
-                       "       operations are:\n"
-                       "               RegisterJob jobid\n"
-                       "               StartUpload\n"
-                       "               CommitUpload\n"
-                       "               RecordTag\n"
-                       "               GetJob\n"
-                       "               FeedIndex destination query_number history continuous\n"
-               ,me);
-
-       exit (EX_USAGE);
-}
-       
-static int check_fault(struct soap *soap,int err) {
-       struct SOAP_ENV__Detail *detail;
-       struct jptype__GenericJPFaultType       *f;
-       char    *reason,indent[200] = "  ";
-
-       switch(err) {
-               case SOAP_OK: puts("OK");
-                             break;
-               case SOAP_FAULT:
-               case SOAP_SVR_FAULT:
-                       if (soap->version == 2) {
-                               detail = soap->fault->SOAP_ENV__Detail;
-                               reason = soap->fault->SOAP_ENV__Reason;
-                       }
-                       else {
-                               detail = soap->fault->detail;
-                               reason = soap->fault->faultstring;
-                       }
-                       fputs(reason,stderr);
-                       putc(10,stderr);
-                       assert(detail->__type == SOAP_TYPE__GenericJPFault);
-#if GSOAP_VERSION >=20700
-                       f = ((struct _GenericJPFault *) detail->fault)
-#else
-                       f = ((struct _GenericJPFault *) detail->value)
-#endif
-                               -> jptype__GenericJPFault;
-
-                       while (f) {
-                               fprintf(stderr,"%s%s: %s (%s)\n",indent,
-                                               f->source,f->text,f->description);
-                               f = f->reason;
-                               strcat(indent,"  ");
-                       }
-                       return -1;
-
-               default: soap_print_fault(soap,stderr);
-                        return -1;
-       }
-       return 0;
-}
-
-static struct jptype__Attribute sample_attr[] = {
-                       { OWNER, NULL },
-                       { TIME, "submitted" },
-                       { TAG, "test" },
-};
-
-static struct jptype__PrimaryQueryElement sample_query[][5] = {
-       {
-               { sample_attr+OWNER, EQUAL, "unknown", NULL },
-               { NULL, 0, NULL, NULL }
-       },
-};
-
-int main(int argc,char *argv[])
-{
-       char    *server = "http://localhost:8901";
-       int     opt;
-       struct soap     *soap = soap_new();
-
-       if (argc < 2) usage(argv[0]); 
-
-       soap_init(soap);
-       soap_set_namespaces(soap, jpps__namespaces);
-
-       while ((opt = getopt(argc,argv,"s:")) >= 0) switch (opt) {
-               case 's': server = optarg;
-                       break;
-               case '?': usage(argv[0]);
-       }
-
-       if (!strcasecmp(argv[1],"RegisterJob")) {
-               struct jpsrv__RegisterJobResponse       r;
-
-               if (argc != 3) usage(argv[0]);
-               check_fault(soap,
-                       soap_call_jpsrv__RegisterJob(soap,server,"",argv[2],&r));
-       }
-       else if (!strcasecmp(argv[1],"FeedIndex")) {
-               struct jpsrv__FeedIndexResponse r;
-               struct jptype__Attribute        *ap[2];
-               struct jptype__Attributes       attr = { 2, ap };
-               struct jptype__PrimaryQueryElement *qp[100];
-               struct jptype__PrimaryQuery     qry = { 0, qp }; 
-
-               int     i,j,qi = atoi(argv[3])-1;
-
-               if (argc != 6) usage(argv[0]);
-
-               for (i=0; i<attr.__sizeitem; i++) ap[i] = sample_attr+i;
-
-               for (i=0; sample_query[qi][i].attr; i++)
-                       qp[i] = &sample_query[qi][i];
-               qry.__sizeitem = i;
-               
-               if (!check_fault(soap,soap_call_jpsrv__FeedIndex(soap,server,"",
-                               argv[2],&attr,&qry,!strcasecmp(argv[4],"true"),
-                                       !strcasecmp(argv[5],"true"),
-                                       &r)))
-               {
-                       printf("FeedId: %s\nExpires: %s\n",r.feedId,ctime(&r.expires));
-               }
-       }
-       else usage(argv[0]);
-
-       return 0;
-}
-
-
diff --git a/org.glite.jp.primary/project/configure.properties.xml b/org.glite.jp.primary/project/configure.properties.xml

deleted file mode 100644 (file)

index 93bb310..0000000
--- a/org.glite.jp.primary/project/configure.properties.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Common module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1.1.1  2004/10/15 09:49:24  akrenek
-       
-       
-       Revision 1.1  2004/09/14 12:33:31  ljocha
-       *** empty log message ***
-       
-       Revision 1.3  2004/08/31 07:57:17  akrenek
-       very first unit test
-       
-       Revision 1.2  2004/07/06 20:50:10  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Common configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-gsoap_prefix=${with.gsoap.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-cppunit=${with.cppunit.prefix}
-jpproject=${subsystem.project.dir}
-project=${component.project.dir}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.jp.primary/project/properties.xml b/org.glite.jp.primary/project/properties.xml

deleted file mode 100755 (executable)

index 182d6e4..0000000
--- a/org.glite.jp.primary/project/properties.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Common component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.1  2004/09/14 12:33:31  ljocha
-       *** empty log message ***
-       
-       Revision 1.3  2004/07/16 14:56:55  flammer
-       Corrected input path of build.properties.
-       
-       Revision 1.2  2004/06/22 22:05:23  dimeglio
-       Added configuration options
-       
--->
-
-<project name="JP Primary component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="org.glite.jp"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="jp"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="primary" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.jp.primary/src/backend.h b/org.glite.jp.primary/src/backend.h

deleted file mode 100644 (file)

index 8dde271..0000000
--- a/org.glite.jp.primary/src/backend.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef __GLITE_JP_BACKEND
-#define __GLITE_JP_BACKEND
-
-#include <sys/types.h>
-#include <unistd.h>
-
-int glite_jppsbe_init(
-       glite_jp_context_t ctx,
-       int *argc,
-       char *argv[]
-);
-
-int glite_jppsbe_init_slave(
-       glite_jp_context_t ctx
-);
-
-int glite_jppsbe_register_job( 
-       glite_jp_context_t ctx,
-       const char *job,
-       const char *owner
-);
-
-int glite_jppsbe_start_upload(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class,
-       const char *content_type,
-       char **destination_out,
-       time_t *commit_before_inout
-);
-
-int glite_jppsbe_commit_upload(
-       glite_jp_context_t ctx,
-       const char *destination
-);
-
-int glite_jppsbe_destination_info(
-       glite_jp_context_t ctx,
-       const char *destination,
-       char **job_out,
-       glite_jp_fileclass_t *class_out
-);
-
-int glite_jppsbe_get_job_url(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class,
-       char **url_out
-);
-
-int glite_jppsbe_open_file(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class,
-       int mode,
-       void **handle_out
-);
-
-int glite_jppsbe_close_file(
-       glite_jp_context_t ctx,
-       void *handle
-);
-
-int glite_jppsbe_pread(
-       glite_jp_context_t ctx,
-       void *handle,
-       void *buf,
-       size_t nbytes,
-       off_t offset
-);
-
-int glite_jppsbe_pwrite(
-       glite_jp_context_t ctx,
-       void *handle,
-       void *buf,
-       size_t nbytes,
-       off_t offset
-);
-
-int glite_jppsbe_append(
-       glite_jp_context_t ctx,
-       void *handle,
-       void *buf,
-       size_t nbytes
-);
-
-int glite_jppsbe_get_job_metadata(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_attrval_t attrs_inout[]
-);
-
-int glite_jppsbe_query(
-       glite_jp_context_t ctx,
-       const glite_jp_query_rec_t query[],
-       const glite_jp_attrval_t metadata[],
-       int (*callback)(
-               glite_jp_context_t ctx,
-               const char *job,
-               const glite_jp_attrval_t metadata[]
-       )
-);
-
-#endif
diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c

deleted file mode 100644 (file)

index 1f7c2ac..0000000
--- a/org.glite.jp.primary/src/feed.c
+++ /dev/null
@@ -1,263 +0,0 @@
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "glite/jp/types.h"
-#include "glite/jp/strmd5.h"
-#include "feed.h"
-
-
-/* 
- * seconds before feed expires: should be 
- * XXX: should be configurable, default for real deployment sort of 1 hour
- */
-#define FEED_TTL       120
-
-static int check_qry_item(
-               glite_jp_context_t ctx,
-               const glite_jp_query_rec_t    *qry,
-               const glite_jp_attrval_t *attr
-)
-{
-       int     cmp,cmp2;
-       long    scmp,ucmp;
-
-       switch (qry->attr.type) {
-               case GLITE_JP_ATTR_OWNER:
-               case GLITE_JP_ATTR_TAG:
-                       cmp = strcmp(attr->value.s,qry->value.s);
-                       break;
-               case GLITE_JP_ATTR_TIME:
-                       scmp = (ucmp = attr->value.time.tv_usec - qry->value.time.tv_usec) > 0 ? 0 : -1;
-                       ucmp -= 1000000 * scmp;
-                       scmp += attr->value.time.tv_sec - qry->value.time.tv_sec;
-                       cmp = scmp ? scmp : ucmp;
-                       break;
-       }
-       switch (qry->op) {
-               case GLITE_JP_QUERYOP_EQUAL: return !cmp;
-               case GLITE_JP_QUERYOP_UNEQUAL: return cmp;
-               case GLITE_JP_QUERYOP_LESS: return cmp < 0;
-               case GLITE_JP_QUERYOP_GREATER: return cmp > 0;
-
-               case GLITE_JP_QUERYOP_WITHIN:
-                       switch (qry->attr.type) {
-                       case GLITE_JP_ATTR_OWNER:
-                       case GLITE_JP_ATTR_TAG:
-                               cmp2 = strcmp(attr->value.s,qry->value2.s);
-                               break;
-                       case GLITE_JP_ATTR_TIME:
-                               scmp = (ucmp = attr->value.time.tv_usec - qry->value2.time.tv_usec) > 0 ? 0 : -1;
-                               ucmp -= 1000000 * scmp;
-                               scmp += attr->value.time.tv_sec - qry->value2.time.tv_sec;
-                               cmp2 = scmp ? scmp : ucmp;
-                               break;
-                       }
-                       return cmp >= 0 && cmp2 <= 0;
-       }
-}
-
-/* XXX: limit on query size -- I'm lazy to malloc() */
-#define QUERY_MAX      100
-
-static int match_feed(
-               glite_jp_context_t ctx,
-               const struct jpfeed *feed,
-               const char *job,
-               const glite_jp_attrval_t attrs[] /* XXX: not checked for correctness */
-)
-{
-       int     i;
-       int     attri[GLITE_JP_ATTR__LAST];
-       int     qi[QUERY_MAX];
-
-       glite_jp_attrval_t *newattr = NULL;
-
-       glite_jp_clear_error(ctx);
-
-       for (i=0; i<GLITE_JP_ATTR__LAST; i++) attri[i] = -1;
-       for (i=0; attrs[i].attr.type; i++) attri[attrs[i].attr.type] = i;
-
-       if (feed->qry) {
-               int     j,complete = 1;
-
-               memset(qi,0,sizeof qi);
-               for (i=0; feed->qry[i].attr.type; i++) {
-                       assert(i<QUERY_MAX);
-                       if ((j=attri[feed->qry[i].attr.type]) >=0) {
-                               if (check_qry_item(ctx,feed->qry+i,attrs+j))
-                                       qi[i] = 1; /* matched */
-                               else return 0;  /* can't be satisfied */
-                       }
-                       else complete = 0;
-               }
-
-               /* not all attributes in query are known from input 
-                * we have to retrieve job metadata from the backend
-                */
-               if (!complete) {
-                       glite_jp_attrval_t      meta[GLITE_JP_ATTR__LAST+1];
-                       int     qai[GLITE_JP_ATTR__LAST];
-
-                       memset(meta,0,sizeof meta);
-                       j=0;
-                       for (i=0; feed->qry[i].attr.type; i++) if (!qi[i]) {
-                               meta[j].attr.type = feed->qry[i].attr.type;
-                               meta[j].attr.name = feed->qry[i].attr.name;
-                               qai[feed->qry[i].attr.type] = i;
-                               j++;
-                       }
-
-                       if (glite_jppsbe_get_job_metadata(ctx,job,meta)) {
-                               glite_jp_error_t        err;
-                               err.code = EIO;
-                               err.source = __FUNCTION__;
-                               err.desc = "complete query";
-                               return glite_jp_stack_error(ctx,&err);
-                       }
-
-                       for (i=0; j=meta[i].attr.type; i++)
-                               if (!check_qry_item(ctx,feed->qry+qai[j],meta+i))
-                                       return 0;
-               }
-       }
-
-       /* matched completely */
-       return glite_jpps_single_feed(ctx,feed->destination,job,attrs);
-}
-
-int glite_jpps_match_attr(
-               glite_jp_context_t ctx,
-               const char *job,
-               const glite_jp_attrval_t attrs[]
-)
-{
-       struct jpfeed   *f = (struct jpfeed *) ctx->feeds;
-       int     i,j;
-       int     attri[GLITE_JP_ATTR__LAST];
-
-       glite_jp_clear_error(ctx);
-
-       for (i=0; i<GLITE_JP_ATTR__LAST; i++) attri[i] = -1;
-       for (i=0; attrs[i].attr.type; i++) {
-               if (attrs[i].attr.type >= GLITE_JP_ATTR__LAST ||
-                               attrs[i].attr.type <= 0)
-               {
-                       glite_jp_error_t        err;
-                       err.code = EINVAL;
-                       err.source = __FUNCTION__;
-                       err.desc = "unknown attribute";
-                       return glite_jp_stack_error(ctx,&err);
-               }
-               if (attri[attrs[i].attr.type] >= 0) {
-                       glite_jp_error_t        err;
-                       err.code = EINVAL;
-                       err.source = __FUNCTION__;
-                       err.desc = "double attribute change";
-                       return glite_jp_stack_error(ctx,&err);
-               }
-
-               attri[attrs[i].attr.type] = i;
-       }
-
-       for (;f; f = f->next) {
-               for (i=0; f->attrs[i].type && attri[f->attrs[i].type] == -1; i++);
-               /* XXX: ignore any errors */
-               if (f->attrs[i].type) match_feed(ctx,f,job,attrs);
-       }
-
-       return glite_jp_clear_error(ctx);
-}
-
-int glite_jpps_match_file(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class
-)
-{
-       fprintf(stderr,"%s: \n",__FUNCTION__);
-       return 0;
-}
-
-int glite_jpps_match_tag(
-       glite_jp_context_t ctx,
-       const char *job,
-       const glite_jp_tagval_t *tag
-)
-{
-       fprintf(stderr,"%s: \n",__FUNCTION__);
-       return 0;
-}
-
-static char *generate_feedid(void)
-{
-       char    hname[200],buf[1000];
-
-       gethostname(hname,sizeof hname);
-       snprintf(buf,sizeof buf,"%s%d%ld",hname,getpid(),lrand48());
-       buf[sizeof buf-1] = 0;
-       return str2md5base64(buf);
-}
-
-
-int glite_jpps_run_feed(
-       glite_jp_context_t ctx,
-       const char *destination,
-       const glite_jp_attr_t *attrs,
-       const glite_jp_query_rec_t *qry,
-       char **feed_id)
-{
-       fprintf(stderr,"%s: \n",__FUNCTION__);
-       return 0;
-}
-
-static int register_feed_deferred(glite_jp_context_t ctx,void *feed)
-{
-       struct jpfeed   *f = feed;
-
-       f->next = ctx->feeds;
-       ctx->feeds = f;
-       return 0;
-}
-
-/* FIXME:
- * - volatile implementation: should store the registrations in a file
- *   and recover after restart
- * - should communicate the data among all server slaves
- */
-int glite_jpps_register_feed(
-       glite_jp_context_t ctx,
-       const char *destination,
-       const glite_jp_attr_t *attrs,
-       const glite_jp_query_rec_t *qry,
-       char **feed_id,
-       time_t *expires)
-{
-       int     i;
-       struct jpfeed   *f = calloc(1,sizeof *f);
-
-       if (!*feed_id) *feed_id = generate_feedid();
-       time(expires); *expires += FEED_TTL;
-
-       f->id = strdup(*feed_id);
-       f->destination = strdup(destination);
-       f->expires = *expires;
-       for (i=0; attrs[i].type; i++) {
-               f->attrs = realloc(f->attrs,(i+2) * sizeof *f->attrs);
-               glite_jp_attr_copy(f->attrs+i,attrs+i);
-               memset(f->attrs+i+1,0,sizeof *f->attrs);
-       }
-       for (i=0; qry[i].attr.type; i++) {
-               f->qry = realloc(f->qry,(i+2) * sizeof *f->qry);
-               glite_jp_queryrec_copy(f->qry+i,qry+i);
-               memset(f->qry+i+1,0,sizeof *f->qry);
-       }
-
-       glite_jp_add_deferred(ctx,register_feed_deferred,f);
-
-       return 0;
-}
-
diff --git a/org.glite.jp.primary/src/feed.h b/org.glite.jp.primary/src/feed.h

deleted file mode 100644 (file)

index 1551a82..0000000
--- a/org.glite.jp.primary/src/feed.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef __GLITE_JP_FEED
-#define __GLITE_JP_FEED
-
-
-struct jpfeed {
-       char    *id,*destination;
-       time_t  expires;
-       glite_jp_attr_t *attrs;
-       glite_jp_query_rec_t    *qry;
-       struct jpfeed   *next;
-};
-
-
-int glite_jpps_match_attr(glite_jp_context_t,const char *,const glite_jp_attrval_t[]);
-int glite_jpps_match_file(glite_jp_context_t,const char *,glite_jp_fileclass_t);
-int glite_jpps_match_tag(glite_jp_context_t,const char *,const glite_jp_tagval_t *);
-int glite_jpps_run_feed(glite_jp_context_t,const char *,const glite_jp_attr_t *,const glite_jp_query_rec_t *,char **);
-int glite_jpps_register_feed(glite_jp_context_t,const char *,const glite_jp_attr_t *,const glite_jp_query_rec_t *,char **,time_t *);
-
-#endif
-
diff --git a/org.glite.jp.primary/src/ftp_backend.c b/org.glite.jp.primary/src/ftp_backend.c

deleted file mode 100644 (file)

index d076125..0000000
--- a/org.glite.jp.primary/src/ftp_backend.c
+++ /dev/null
@@ -1,166 +0,0 @@
-#include "glite/jp/types.h"
-#include "glite/jp/context.h"
-
-#include "backend.h"
-
-int glite_jppsbe_init(
-       glite_jp_context_t ctx,
-       int *argc,
-       char *argv[]
-)
-{
-}
-
-int glite_jppsbe_init_slave(
-       glite_jp_context_t ctx
-)
-{
-}
-
-int glite_jppsbe_register_job( 
-       glite_jp_context_t ctx,
-       const char *job,
-       const char *owner
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_start_upload(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class,
-       const char *content_type,
-       char **destination_out,
-       time_t *commit_before_inout
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_commit_upload(
-       glite_jp_context_t ctx,
-       const char *destination
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_destination_info(
-       glite_jp_context_t ctx,
-       const char *destination,
-       char **job,
-       glite_jp_fileclass_t *class
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-
-int glite_jppsbe_get_job_url(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class,
-       char **url_out
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_open_file(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_fileclass_t class,
-       int mode,
-       void **handle_out
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_close_file(
-       glite_jp_context_t ctx,
-       void *handle
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_pread(
-       glite_jp_context_t ctx,
-       void *handle,
-       void *buf,
-       size_t nbytes,
-       off_t offset
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_pwrite(
-       glite_jp_context_t ctx,
-       void *handle,
-       void *buf,
-       size_t nbytes,
-       off_t offset
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_append(
-       glite_jp_context_t ctx,
-       void *handle,
-       void *buf,
-       size_t nbytes
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_get_job_metadata(
-       glite_jp_context_t ctx,
-       const char *job,
-       glite_jp_attrval_t attrs_inout[]
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
-
-int glite_jppsbe_query(
-       glite_jp_context_t ctx,
-       const glite_jp_query_rec_t query[],
-       const glite_jp_attrval_t metadata[],
-       int (*callback)(
-               glite_jp_context_t ctx,
-               const char *job,
-               const glite_jp_attrval_t metadata[]
-       )
-)
-{
-       glite_jp_clear_error(ctx);
-       puts(__FUNCTION__);
-       return 0;
-}
diff --git a/org.glite.jp.primary/src/is_client.c b/org.glite.jp.primary/src/is_client.c

deleted file mode 100644 (file)

index 1a50c03..0000000
--- a/org.glite.jp.primary/src/is_client.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <stdio.h>
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "glite/jp/types.h"
-
-#include "feed.h"
-#include "jpis_H.h"
-#include "jpis_.nsmap"
-
-int glite_jpps_single_feed(
-               glite_jp_context_t ctx,
-               const char *destination,
-               const char *job,
-               const glite_jp_attrval_t attrs[]
-)
-{
-       /* TODO: really call JP Index server (via interlogger) */
-       printf("feed to %s, job %s\n",destination,job);
-
-       /* FIXME: check fault */
-       // soap_call_jpsrv__UpdateJobs(ctx->other_soap,destination,"",
-
-
-       return 0;
-}
diff --git a/org.glite.jp.primary/src/jptype_map.h b/org.glite.jp.primary/src/jptype_map.h

deleted file mode 100644 (file)

index 6df0828..0000000
--- a/org.glite.jp.primary/src/jptype_map.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#if GSOAP_VERSION >= 20700
-#define INPUT_SANDBOX  jptype__UploadClass__INPUT_SANDBOX
-#define OUTPUT_SANDBOX jptype__UploadClass__OUTPUT_SANDBOX
-#define JOB_LOG        jptype__UploadClass__JOB_LOG
-
-#define OWNER jptype__AttributeType__OWNER
-#define TIME jptype__AttributeType__TIME
-#define TAG jptype__AttributeType__TAG
-
-#define EQUAL jptype__QueryOp__EQUAL
-#define UNEQUAL jptype__QueryOp__UNEQUAL
-#define LESS jptype__QueryOp__LESS
-#define GREATER jptype__QueryOp__GREATER
-#define WITHIN jptype__QueryOp__WITHIN
-#endif
-
diff --git a/org.glite.jp.primary/src/simple_server.c b/org.glite.jp.primary/src/simple_server.c

deleted file mode 100644 (file)

index a620988..0000000
--- a/org.glite.jp.primary/src/simple_server.c
+++ /dev/null
@@ -1,46 +0,0 @@
-#include "glite/jp/types.h"
-#include "glite/jp/context.h"
-
-#include "jpps_H.h"
-
-extern SOAP_NMAC struct Namespace jpis__namespaces[],jpps__namespaces[];
-
-int main() {
-   struct soap soap;
-   int i, m, s; // master and slave sockets
-
-   glite_jp_context_t  ctx;
-
-   soap_init(&soap);
-   soap_set_namespaces(&soap, jpps__namespaces);
-
-   glite_jp_init_context(&ctx);
-   soap.user = (void *) ctx;
-   ctx->other_soap = soap_new();
-   soap_init(ctx->other_soap);
-   soap_set_namespaces(ctx->other_soap,jpis__namespaces);
-
-   srand48(time(NULL)); /* feed id generation */
-
-   m = soap_bind(&soap, NULL, 8901, 100);
-   if (m < 0)
-      soap_print_fault(&soap, stderr);
-   else
-   {
-      fprintf(stderr, "Socket connection successful: master socket = %d\n", m);
-      for (i = 1; ; i++) {
-         s = soap_accept(&soap);
-         if (s < 0) {
-            soap_print_fault(&soap, stderr);
-            break;
-         }
-         jpps__serve(&soap); // process RPC request
-         soap_destroy(&soap); // clean up class instances
-         soap_end(&soap); // clean up everything and close socket
-        glite_jp_run_deferred(ctx);
-      }
-   }
-   soap_done(&soap); // close master socket
-
-   return 0;
-}
diff --git a/org.glite.jp.primary/src/soap_ops.c b/org.glite.jp.primary/src/soap_ops.c

deleted file mode 100644 (file)

index 19cc22b..0000000
--- a/org.glite.jp.primary/src/soap_ops.c
+++ /dev/null
@@ -1,361 +0,0 @@
-#include <stdio.h>
-#include <fcntl.h>
-
-#include "glite/jp/types.h"
-#include "glite/jp/context.h"
-
-#include "feed.h"
-
-#include "jpps_H.h"
-#include "jpps_.nsmap"
-
-#include "jptype_map.h"
-
-static struct jptype__GenericJPFaultType *jp2s_error(struct soap *soap,
-               const glite_jp_error_t *err)
-{
-       struct jptype__GenericJPFaultType *ret = NULL;
-       if (err) {
-               ret = soap_malloc(soap,sizeof *ret);
-               memset(ret,0,sizeof *ret);
-               ret->code = err->code;
-               ret->source = soap_strdup(soap,err->source);
-               ret->text = soap_strdup(soap,strerror(err->code));
-               ret->description = soap_strdup(soap,err->desc);
-               ret->reason = jp2s_error(soap,err->reason);
-       }
-       return ret;
-}
-
-static void err2fault(const glite_jp_context_t ctx,struct soap *soap)
-{
-       char    *et;
-       struct SOAP_ENV__Detail *detail = soap_malloc(soap,sizeof *detail);
-       struct _GenericJPFault *f = soap_malloc(soap,sizeof *f);
-
-
-       f->jptype__GenericJPFault = jp2s_error(soap,ctx->error);
-
-       detail->__type = SOAP_TYPE__GenericJPFault;
-#if GSOAP_VERSION >= 20700
-       detail->fault = f;
-#else
-       detail->value = f;
-#endif
-       detail->__any = NULL;
-
-       soap_receiver_fault(soap,"Oh, shit!",NULL);
-       if (soap->version == 2) soap->fault->SOAP_ENV__Detail = detail;
-       else soap->fault->detail = detail;
-}
-
-static glite_jp_fileclass_t s2jp_fileclass(enum jptype__UploadClass class)
-{
-       switch (class) {
-               case INPUT_SANDBOX: return GLITE_JP_FILECLASS_INPUT;
-               case OUTPUT_SANDBOX: return GLITE_JP_FILECLASS_OUTPUT;
-               case JOB_LOG: return GLITE_JP_FILECLASS_LBLOG;
-               default: return GLITE_JP_FILECLASS_UNDEF;
-       }
-}
-
-static void s2jp_tag(const struct jptype__TagValue *stag,glite_jp_tagval_t *jptag)
-{
-       memset(jptag,0,sizeof *jptag);
-       jptag->name = strdup(stag->name);
-       jptag->sequence = stag->sequence ? *stag->sequence : 0;
-       jptag->timestamp = stag->timestamp ? *stag->timestamp : 0;
-       if (stag->stringValue) jptag->value = strdup(stag->stringValue);
-       else if (stag->blobValue) {
-               jptag->binary = 1;
-               jptag->size = stag->blobValue->__size;
-               jptag->value = (char *) stag->blobValue->__ptr;
-       }
-}
-
-#define CONTEXT_FROM_SOAP(soap,ctx) glite_jp_context_t ctx = (glite_jp_context_t) ((soap)->user)
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__RegisterJob(
-               struct soap *soap,
-               char *job,
-               struct jpsrv__RegisterJobResponse *response)
-{
-       CONTEXT_FROM_SOAP(soap,ctx);
-       char    *owner = glite_jp_peer_name(ctx);
-       glite_jp_attrval_t owner_val[2];
-
-       if (glite_jppsbe_register_job(ctx,job,owner)) {
-               err2fault(ctx,soap);
-               free(owner);
-               return SOAP_FAULT;
-       }
-
-       owner_val[0].attr.type = GLITE_JP_ATTR_OWNER;
-       owner_val[0].value.s = owner;
-       owner_val[1].attr.type = GLITE_JP_ATTR_UNDEF;
-
-/* XXX: errrors should be ingored but not silently */
-       glite_jpps_match_attr(ctx,job,owner_val); 
-       free(owner);
-
-       return SOAP_OK;
-}
-
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__StartUpload(
-               struct soap *soap,
-               char *job,
-               enum jptype__UploadClass class,
-               time_t commit_before,
-               char *content_type,
-               struct jpsrv__StartUploadResponse *response)
-{
-       CONTEXT_FROM_SOAP(soap,ctx);
-       glite_jp_fileclass_t    jclass = s2jp_fileclass(class);
-       char    *destination;
-
-       if (glite_jppsbe_start_upload(ctx,job,jclass,content_type,&destination,&commit_before)) {
-               err2fault(ctx,soap);
-               return SOAP_FAULT;
-       }
-
-       response->destination = soap_strdup(soap,destination);
-       free(destination);
-       response->commitBefore = commit_before;
-
-       return SOAP_OK;
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__CommitUpload(
-               struct soap *soap,
-               char *destination,
-               struct jpsrv__CommitUploadResponse *response)
-{
-       CONTEXT_FROM_SOAP(soap,ctx);
-       char    *job = NULL;
-       glite_jp_fileclass_t    class;
-
-       if (glite_jppsbe_commit_upload(ctx,destination)) {
-               err2fault(ctx,soap);
-               return SOAP_FAULT;
-       }
-
-       /* XXX: should not fail when commit_upload was OK */
-       glite_jppsbe_destination_info(ctx,destination,&job,&class);
-
-       /* XXX: ignore errors but don't fail silenty */
-       glite_jpps_match_file(ctx,job,class);
-
-       return SOAP_OK;
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__RecordTag(
-               struct soap *soap,
-               char *job,
-               struct jptype__TagValue *tag,
-               struct jpsrv__RecordTagResponse *response)
-{
-       CONTEXT_FROM_SOAP(soap,ctx);
-       void    *tagfile;
-
-       glite_jp_tagval_t       mytag;
-
-       if (glite_jppsbe_open_file(ctx,job,GLITE_JP_FILECLASS_TAGS,
-                                       O_WRONLY|O_CREAT,&tagfile))
-       {
-               err2fault(ctx,soap);
-               return SOAP_FAULT;
-       }
-
-       if (glite_jpps_tag_append(ctx,tagfile,&mytag)) {
-               err2fault(ctx,soap);
-               glite_jppsbe_close_file(ctx,tagfile);
-               return SOAP_FAULT;
-       }
-
-       if (glite_jppsbe_close_file(ctx,tagfile)) {
-               err2fault(ctx,soap);
-               return SOAP_FAULT;
-       }
-
-       /* XXX: ignore errors but don't fail silenty */
-
-       s2jp_tag(tag,&mytag);
-       glite_jpps_match_tag(ctx,job,&mytag);
-
-       return SOAP_OK;
-}
-
-static void s2jp_attr(const struct jptype__Attribute *in,glite_jp_attr_t *out)
-{
-       switch (in->type) {
-               case OWNER: out->type = GLITE_JP_ATTR_OWNER; break;
-               case TIME: out->type = GLITE_JP_ATTR_TIME;
-                          out->name = strdup(in->name);
-                          break;
-               case TAG: out->type = GLITE_JP_ATTR_TAG;
-                         out->name = strdup(in->name);
-                         break;
-               default: break;
-       }
-}
-
-static void s2jp_queryval(
-               const char *in,
-               glite_jp_attrtype_t type,
-               union _glite_jp_query_rec_val *out)
-{
-       switch (type) {
-               case GLITE_JP_ATTR_OWNER:
-               case GLITE_JP_ATTR_TAG:
-                       out->s = strdup(in);
-                       break;
-               case GLITE_JP_ATTR_TIME:
-                       out->time.tv_sec = atoi(in);
-                       break;
-       }
-}
-
-static void s2jp_query(const struct jptype__PrimaryQueryElement *in, glite_jp_query_rec_t *out)
-{
-       s2jp_attr(in->attr,&out->attr);
-
-       switch (in->op) {
-               case EQUAL: out->op = GLITE_JP_QUERYOP_EQUAL; break;
-               case UNEQUAL: out->op = GLITE_JP_QUERYOP_UNEQUAL; break;
-               case LESS: out->op = GLITE_JP_QUERYOP_LESS; break;
-               case GREATER: out->op = GLITE_JP_QUERYOP_GREATER; break;
-               case WITHIN:
-                       out->op = GLITE_JP_QUERYOP_WITHIN;
-                       s2jp_queryval(in->value2,out->attr.type,&out->value2);
-                       break;
-       }
-
-       s2jp_queryval(in->value,out->attr.type,&out->value);
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__FeedIndex(
-               struct soap *soap,
-               char *destination,
-               struct jptype__Attributes *attributes,
-               struct jptype__PrimaryQuery *query,
-               enum xsd__boolean history,
-               enum xsd__boolean continuous,
-               struct jpsrv__FeedIndexResponse *response)
-{      
-
-/* deferred processing: return feed_id to the index server first,
- * start feeding it afterwards -- not before the index server actually
- * knows feed_id and is ready to accept the feed.
- *
- * Has to be done within the same server slave, 
- * passed through the context */
-
-       CONTEXT_FROM_SOAP(soap,ctx);
-       char    *feed_id = NULL;
-       time_t  expires = 0;
-       int     ret = SOAP_OK;
-
-       glite_jp_attr_t *attrs = calloc(attributes->__sizeitem+1,sizeof *attrs);
-       glite_jp_query_rec_t    *qry = calloc(query->__sizeitem+1,sizeof *qry);
-       int     i;
-
-       glite_jp_clear_error(ctx);
-
-       for (i = 0; i<attributes->__sizeitem; i++) s2jp_attr(attributes->item[i],attrs+i);
-       for (i = 0; i<query->__sizeitem; i++) s2jp_query(query->item[i],qry+i);
-
-       if (history) {
-               if (glite_jpps_run_feed(ctx,destination,attrs,qry,&feed_id)) {
-                       err2fault(ctx,soap);
-                       ret = SOAP_FAULT;
-                       goto cleanup;
-               }
-       }
-
-       if (continuous) {
-               if (glite_jpps_register_feed(ctx,destination,attrs,qry,&feed_id,&expires)) {
-                       err2fault(ctx,soap);
-                       ret = SOAP_FAULT;
-                       goto cleanup;
-               }
-       }
-
-       if (!history && !continuous) {
-               glite_jp_error_t        err;
-               err.code = EINVAL;
-               err.source = __FUNCTION__;
-               err.desc = "at least one of <history> and <continous> must be true";
-               glite_jp_stack_error(ctx,&err);
-               err2fault(ctx,soap);
-               ret = SOAP_FAULT;
-               goto cleanup;
-       }
-
-       response->expires = expires;
-       response->feedId = soap_strdup(soap,feed_id);
-
-cleanup:
-       free(feed_id);
-       for (i=0; attrs[i].type; i++) free(attrs[i].name);
-       free(attrs);
-       for (i=0; qry[i].attr.type; i++) glite_jp_free_query_rec(qry+i);
-       free(qry);
-
-       return ret;
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__FeedIndexRefresh(
-               struct soap *soap,
-               char *feed_id,
-               struct jpsrv__FeedIndexRefreshResponse *response)
-{
-       fprintf(stderr,"%s: not implemented\n",__FUNCTION__);
-       abort();
-}
-
-SOAP_FMAC5 int SOAP_FMAC6 jpsrv__GetJob(
-               struct soap *soap,
-               char *job,
-               struct jpsrv__GetJobResponse *response)
-{
-       CONTEXT_FROM_SOAP(soap,ctx);
-       char    *url;
-
-       struct {
-               glite_jp_fileclass_t    type;
-               char    **url;
-               char    *name;
-       } tab[] = {
-               { GLITE_JP_FILECLASS_INPUT, &response->inputSandbox, "input sandbox" },
-               { GLITE_JP_FILECLASS_OUTPUT, &response->outputSandbox, "output sandbox" },
-               { GLITE_JP_FILECLASS_LBLOG, &response->jobLog, "L&B log" },
-               { GLITE_JP_FILECLASS_TAGS, &response->tags, "JP tags" },
-               { GLITE_JP_FILECLASS_UNDEF, NULL, NULL }
-       };
-
-       int     i;
-       glite_jp_error_t        err;
-               
-       for (i=0; tab[i].type; i++) {
-               glite_jp_clear_error(ctx);
-               switch (glite_jppsbe_get_job_url(ctx,job,tab[i].type,&url)) {
-                       case 0: *tab[i].url = soap_strdup(soap,url);
-                               free(url);
-                               break;
-                       case ENOENT:
-                               *tab[i].url = NULL;
-                               break;
-                       default: 
-                               err.code = ctx->error->code;
-                               err.source = "jpsrv__GetJob()";
-                               err.desc = tab[i].name;
-                               glite_jp_stack_error(ctx,&err);
-                               err2fault(ctx,soap);
-                               glite_jp_clear_error(ctx);
-                               return SOAP_FAULT;
-               }
-       }
-       return SOAP_OK;
-}
-
diff --git a/org.glite.jp.primary/src/tags.c b/org.glite.jp.primary/src/tags.c

deleted file mode 100644 (file)

index 25474f4..0000000
--- a/org.glite.jp.primary/src/tags.c
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <errno.h>
-
-#include <glite/jp/types.h>
-#include "tags.h"
-#include "backend.h"
-
-/* magic name_len value_len binary sequence timestamp */
-#define HEADER "JP#TAG# %05u %012lu %c %05u %012lu#"
-#define HEADER_SIZE 48
-
-int glite_jpps_tag_append(
-       glite_jp_context_t ctx,
-       void *handle,
-       const glite_jp_tagval_t *tag
-)
-{
-       char    hdr[HEADER_SIZE+1];
-       glite_jp_error_t        err;
-
-       unsigned long   vlen = tag->binary ? tag->size :
-                               (tag->value ? strlen(tag->value) : 0);
-       int     nlen;
-
-       memset(&err,0,sizeof err);
-       err.source = "glite_jpps_tag_append()";
-
-       if (!tag->name) {
-               err.code = EINVAL;
-               err.desc = "tag name";
-               return glite_jp_stack_error(ctx,&err);
-       }
-
-       nlen = strlen(tag->name);
-
-       assert(sprintf(hdr,HEADER,nlen,vlen,
-                       tag->binary ? "B" : "S",
-                       tag->sequence, tag->timestamp) == HEADER_SIZE);
-
-       if (glite_jppsbe_append(ctx,handle,hdr,HEADER_SIZE)) {
-               err.code = EIO;
-               err.desc = "write tag header";
-               return glite_jp_stack_error(ctx,&err);
-       }
-
-       if (glite_jppsbe_append(ctx,handle,tag->name,nlen)) {
-               err.code = EIO;
-               err.desc = "write tag name";
-               return glite_jp_stack_error(ctx,&err);
-       }
-
-       if (glite_jppsbe_append(ctx,handle,tag->value,vlen)) {
-               err.code = EIO;
-               err.desc = "write tag value";
-               return glite_jp_stack_error(ctx,&err);
-       }
-
-       return 0;
-}
-
diff --git a/org.glite.jp.primary/src/tags.h b/org.glite.jp.primary/src/tags.h

deleted file mode 100644 (file)

index 0d8afa8..0000000
--- a/org.glite.jp.primary/src/tags.h
+++ /dev/null
@@ -1 +0,0 @@
-int glite_jpps_tag_append(glite_jp_context_t,void *,const glite_jp_tagval_t *);
diff --git a/org.glite.jp.primary/src/typemap.dat b/org.glite.jp.primary/src/typemap.dat

deleted file mode 100644 (file)

index 7032cb2..0000000
--- a/org.glite.jp.primary/src/typemap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-jpsrv = http://glite.org/wsdl/services/jp
-jptype = http://glite.org/wsdl/types/jp
diff --git a/org.glite.jp/project/JobProvenance.wsdl b/org.glite.jp/project/JobProvenance.wsdl

deleted file mode 100644 (file)

index 26f97a4..0000000
--- a/org.glite.jp/project/JobProvenance.wsdl
+++ /dev/null
@@ -1,531 +0,0 @@
-<WSDL:definitions
-       xmlns:tns="http://glite.org/wsdl/services/jp"
-       xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:jp="http://glite.org/wsdl/types/jp"
-       xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/"
-       xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
-       xmlns="http://schemas.xmlsoap.org/wsdl/"
-       targetNamespace="http://glite.org/wsdl/services/jp"
-       name="JobProvenance">
-
-       <WSDL:types>
-               <schema
-                       targetNamespace="http://glite.org/wsdl/types/jp"
-                       xmlns="http://www.w3.org/2001/XMLSchema"
-                       elementFormDefault="unqualified" attributeFormDefault="unqualified">
-                       <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-                       <simpleType name="Attribute">
-                               <restriction base="xsd:string">
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="UploadClass">
-                               <restriction base="xsd:string">
-                                       <enumeration value="INPUT-SANDBOX"/>
-                                       <enumeration value="OUTPUT-SANDBOX"/>
-                                       <enumeration value="JOB-LOG"/>
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="QueryOp">
-                               <restriction base="xsd:string">
-                                       <enumeration value="EQUAL"/>
-                                       <enumeration value="UNEQUAL"/>
-                                       <enumeration value="LESS"/>
-                                       <enumeration value="GREATER"/>
-                                       <enumeration value="WITHIN"/>
-                               </restriction>
-                       </simpleType>
-                       <complexType name="TagValue">
-                               <sequence>
-                                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="true"/>
-                                       <element name="sequence" type="xsd:int" minOccurs="0" maxOccurs="1"/>
-                                       <element name="timestamp" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="stringValue" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="blobValue" type="xsd:base64Binary" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="Attributes">
-                               <sequence>
-                                       <element name="item" type="jp:Attribute" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="GenericJPFaultType">
-                               <sequence>
-                                       <element name="source" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="code" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                                       <element name="text" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="reason" type="jp:GenericJPFaultType" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="PrimaryQueryElement">
-                               <sequence>
-                                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="PrimaryQuery">
-                               <sequence>
-                                       <element name="item" type="jp:PrimaryQueryElement" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="IndexQueryRecord">
-                               <sequence>
-                                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="IndexQueryElement">
-                               <sequence>
-                                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                                       <element name="record" type="jp:IndexQueryRecord" minOccurs="1"  maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="IndexQuery">
-                               <sequence>
-                                       <element name="item" type="jp:IndexQueryElement" minOccurs="1" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobRecord">
-                               <sequence>
-                                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="PSContact" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobRecords">
-                               <sequence>
-                                       <element name="record" type="jp:JobRecord" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-
-                       <complexType name="AttrUpdate">
-                               <sequence>
-                                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="AttrUpdates">
-                               <sequence>
-                                       <element name="item" type="jp:AttrUpdate" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobUpdate">
-                               <sequence>
-                                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="attributes" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-                                       <element name="tags" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="UpdateJobsData">
-                               <sequence>
-                                       <element name="job" type="jp:JobUpdate" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                               
-                       <complexType name="FeedIndexResponse">
-                               <sequence>
-                                       <element name="feedId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="expires" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="GetJobResponse">
-                               <sequence>
-                                       <element name="jobLog" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="inputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="outputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="tags" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="StartUploadResponse">
-                               <sequence>
-                                       <element name="destination" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="commitBefore" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                               </sequence>
-                       </complexType>
-                       <element name="GenericJPFault" type="jp:GenericJPFaultType"/>
-               </schema>
-       </WSDL:types>
-       <message name="RegisterJobRequest">
-               <part name="x" type="xsd:string"/>
-       </message>
-       <message name="StartUploadRequest">
-               <part name="uclass" type="jp:UploadClass"/>
-               <part name="commitTimeout" type="xsd:duration"/>
-               <part name="contentType" type="xsd:string"/>
-       </message>
-       <message name="StartUploadResponse">
-               <part name="destination" type="xsd:string"/>
-               <part name="commitBefore" type="xsd:dateTime"/>
-       </message>
-       <message name="CommitUploadRequest">
-               <part name="destination" type="xsd:string"/>
-       </message>
-       <message name="RecordTagRequest">
-               <part name="jobid" type="xsd:string"/>
-               <part name="tag" type="jp:TagValue"/>
-       </message>
-       <message name="FeedIndexRequest">
-               <part name="destination" type="xsd:string"/>
-               <part name="attributes" type="jp:Attributes"/>
-               <part name="conditions" type="jp:PrimaryQuery"/>
-               <part name="continuous" type="xsd:boolean"/>
-       </message>
-       <message name="FeedIndexResponse">
-               <part name="feedId" type="xsd:string"/>
-               <part name="expires" type="xsd:dateTime"/>
-       </message>
-       <message name="FeedIndexRefreshRequest">
-               <part name="feedId" type="xsd:string"/>
-       </message>
-       <message name="GetJobRequest">
-               <part name="jobid" type="xsd:string"/>
-       </message>
-       <message name="GetJobResponse">
-               <part name="jobLog" type="xsd:string"/>
-               <part name="inputSandbox" type="xsd:string"/>
-               <part name="outputSandbox" type="xsd:string"/>
-               <part name="tags" type="xsd:string"/>
-       </message>
-       <message name="GenericJPFault">
-               <part name="fault" element="jp:GenericJPFault"/>
-       </message>
-       <message name="EmptyResponse"/>
-       <portType name="JobProvenancePS_PortType">
-               <operation name="RegisterJob">
-                       <documentation>Register job with JP primary storage.
-Job registration in LB is propagated to JP immediately so that JP is aware of the job,
-despite no furhter information is available in it.
-
-Input: JobId
-
-Output: N/A
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:RegisterJobRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="StartUpload">
-                       <documentation>Initiate upload of of sandbox/dump of job life log from LB.
-WM component responsible for job sandbox management and LB server call JP to declare
-intention to upload intput/output sandbox and job life log.
-
-Input:
-
-uclass: type of the upload - INPUT_SANDBOX, OUTPUT_SANDBOX, JOB_LOG
-
-commitTimeout: upper limit on time for which JP waits for committing this upload transaction
-
-contentType: MIME type of the uploaded file
-
-Output:
-
-destination: URL where the client should upload the file
-
-commitBefore: acutual time when the upload transaction times out
-
-Faults: GenericJPFault
-
-
-Initiate upload of of sandbox/dump of job life log from LB.</documentation>
-                       <input message="tns:StartUploadRequest"/>
-                       <output message="tns:StartUploadResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="CommitUpload">
-                       <documentation>Confirm upload.
-Should be called after a file upload initiaded with StartUpload is finished.
-
-Input:
-
-destination: Upload destination URL (to match with the original request)
-
-Output:
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:CommitUploadRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="RecordTag">
-                       <documentation>Record a value of user tag.
-JP tags are either standalone or override values of their LB counterparts.
-However, JP tag values are still distinguishable those inherited from LB.
-JP tags may be either strings or blobs.
-
-Input:
-
-jobid:
-
-tag: structure containing name, timestamp, optional sequence number to order tag values
-without relying on timestamps, and string or blob value.
-
-Output: N/A
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:RecordTagRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="FeedIndex">
-                       <documentation>Start feeding JP index server.
-Called by the index server to start batch feed, and optionally also subscribe for incremental feed.
-
-JP index server subscribes with JP primary storage using a query
-containing conditions on primary metadata and a list of queryable attributes
-of the index server (i.e. data which should be sent to the index server).
-
-When a matching job record is created or modified within the primary storage
-the job record data are sent to the subscribed index server.
-
-The subscription is soft-state, it expires after certain time unless refreshed by the client explicitely.
-
-In the batch mode the query has the same form
-with additional flag asking for all matching records (i.e.\ not only
-arriving afterwards).
-
-Input:
-
-destination: where to send the job record data
-
-attributes: which job record attributes should be sent to the requesting index server
-
-conditions: list of query conditions. Each conditions has the form Attribute Operator Value,
-where Attribute is any of job record attributes and Operator is one of EQUAL, UNEQUAL, LESS, GREATER, WITHIN.
-
-continuous: flag determining that the query is incremental (not batch) 
-
-Output:
-
-feedId: unique Id of the feed request, to be used in refresh, cancelation etc.
-
-expires: when the feed times out. Must be refreshed before this time.
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:FeedIndexRequest"/>
-                       <output message="tns:FeedIndexResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="FeedIndexRefresh">
-                       <documentation>Extend batch feed subscription (used by index server)
-
-Input: feedId returned previously by FeedIndex
-
-Output: the same as for FeedIndex
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:FeedIndexRefreshRequest"/>
-                       <output message="tns:FeedIndexResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="GetJob">
-                       <documentation>Retrieve job record URL's when jobid is known
-Used either to bypass JP index server query for this specific case, or after the index server query to
-retrieve actual job record.
-
-Input: jobid
-
-Output:
-
-jobLog, inputSandbox, outputSandbox, tags: URL's to components of the job record.
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:GetJobRequest"/>
-                       <output message="tns:GetJobResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-       </portType>
-       <binding name="JobProvenancePS" type="tns:JobProvenancePS_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="RegisterJob">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="StartUpload">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="CommitUpload">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="RecordTag">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="FeedIndex">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="FeedIndexRefresh">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="GetJob">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-       <service name="JobProvenancePS">
-               <documentation>Job Provenance Primary Storage service</documentation>
-               <port name="JobProvenancePS" binding="tns:JobProvenancePS">
-                       <SOAP:address location="http://localhost:10001"/>
-               </port>
-       </service>
-
-       <message name="QueryJobsRequest">
-               <part name="conditions" type="jp:IndexQuery"/>
-       </message>
-
-       <message name="QueryJobsResponse">
-               <part name="jobs" type="jp:JobRecords"/>
-       </message>
-               
-       <message name="UpdateJobsRequest">
-               <part name="feedId" type="xsd:string"/>
-               <part name="data" type="jp:UpdateJobsData"/>
-               <part name="feedDone" type="xsd:boolean"/>
-       </message>
-       
-       <portType name="JobProvenanceIS_PortType">
-               <operation name="UpdateJobs">
-                       <documentation>Store or update information on jobs within the JP index server.
-Called directly by the primary storage, used for both batch and incremental feed.
-
-Input:
-
-data: list of job record updates. Each contains jobid, list of JP attribute values and user tag values.
-
-feedDone: flag indicating end of batch feed. (In order to avoid potential problems with buffer allocation
-the huge dataset of batch feed is split into reasonable chunks and delivered with more UpdateJobs calls.)
-
-Output: N/A
-
-Faults: GenericJPFault
-
-
-                       </documentation>
-                       <input message="tns:UpdateJobsRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="QueryJobs">
-                       <documentation>Retrieve pointers to job records of jobs matching a query.
-Input: conditions - list of lists of query conditions.
-       Elements of the inner lists refer to a single job attribute, the conditions are or-ed.
-       Elements of the outer list may refer to different job attributes, they are and-ed.
-
-Output:
-
-jobs: list of JobId, PSContact (URL of the primary storage which manges this job) pairs
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:QueryJobsRequest"/>
-                       <output message="tns:QueryJobsResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-       </portType>
-
-       <binding name="JobProvenanceIS" type="tns:JobProvenanceIS_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="UpdateJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="QueryJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-
-       <service name="JobProvenanceIS">
-               <documentation>Job Provenance Index service</documentation>
-               <port name="JobProvenanceIS" binding="tns:JobProvenanceIS">
-                       <SOAP:address location="http://localhost:10001"/>
-               </port>
-       </service>
-               
-
-</WSDL:definitions>
diff --git a/org.glite.jp/project/JobProvenanceIS.wsdl b/org.glite.jp/project/JobProvenanceIS.wsdl

deleted file mode 100644 (file)

index 2ef587d..0000000
--- a/org.glite.jp/project/JobProvenanceIS.wsdl
+++ /dev/null
@@ -1,108 +0,0 @@
-<WSDL:definitions
-       xmlns:tns="http://glite.org/wsdl/services/jp"
-       xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:jp="http://glite.org/wsdl/types/jp"
-       xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/"
-       xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
-       xmlns="http://schemas.xmlsoap.org/wsdl/"
-       targetNamespace="http://glite.org/wsdl/services/jp"
-       name="JobProvenanceIS">
-
-       <import namespace="http://glite.org/wsdl/types/jp" location="JobProvenanceTypes.wsdl"/>
-
-       <message name="GenericJPFault">
-               <part name="fault" element="jp:GenericJPFault"/>
-       </message>
-
-       <message name="QueryJobsRequest">
-               <part name="conditions" type="jp:IndexQuery"/>
-       </message>
-
-       <message name="QueryJobsResponse">
-               <part name="jobs" type="jp:JobRecords"/>
-       </message>
-               
-       <message name="UpdateJobsRequest">
-               <part name="feedId" type="xsd:string"/>
-               <part name="data" type="jp:UpdateJobsData"/>
-               <part name="feedDone" type="xsd:boolean"/>
-       </message>
-       
-       <portType name="JobProvenanceIS_PortType">
-               <operation name="UpdateJobs">
-                       <documentation>Store or update information on jobs within the JP index server.
-Called directly by the primary storage, used for both batch and incremental feed.
-
-Input:
-
-data: list of job record updates. Each contains jobid, list of JP attribute values and user tag values.
-
-feedDone: flag indicating end of batch feed. (In order to avoid potential problems with buffer allocation
-the huge dataset of batch feed is split into reasonable chunks and delivered with more UpdateJobs calls.)
-
-Output: N/A
-
-Faults: GenericJPFault
-
-
-                       </documentation>
-                       <input message="tns:UpdateJobsRequest"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="QueryJobs">
-                       <documentation>Retrieve pointers to job records of jobs matching a query.
-Input: conditions - list of lists of query conditions.
-       Elements of the inner lists refer to a single job attribute, the conditions are or-ed.
-       Elements of the outer list may refer to different job attributes, they are and-ed.
-
-Output:
-
-jobs: list of JobId, PSContact (URL of the primary storage which manges this job) pairs
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:QueryJobsRequest"/>
-                       <output message="tns:QueryJobsResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-       </portType>
-
-       <binding name="JobProvenanceIS" type="tns:JobProvenanceIS_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="UpdateJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="QueryJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-
-       <service name="JobProvenanceIS">
-               <documentation>Job Provenance Index service</documentation>
-               <port name="JobProvenanceIS" binding="tns:JobProvenanceIS">
-                       <SOAP:address location="http://localhost:10001"/>
-               </port>
-       </service>
-               
-
-</WSDL:definitions>
diff --git a/org.glite.jp/project/JobProvenancePS.wsdl b/org.glite.jp/project/JobProvenancePS.wsdl

deleted file mode 100644 (file)

index 7c777dd..0000000
--- a/org.glite.jp/project/JobProvenancePS.wsdl
+++ /dev/null
@@ -1,307 +0,0 @@
-<WSDL:definitions
-       xmlns:tns="http://glite.org/wsdl/services/jp"
-       xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:jp="http://glite.org/wsdl/types/jp"
-       xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/"
-       xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
-       xmlns="http://schemas.xmlsoap.org/wsdl/"
-       targetNamespace="http://glite.org/wsdl/services/jp"
-       name="JobProvenancePS">
-
-       <import namespace="http://glite.org/wsdl/types/jp" location="JobProvenanceTypes.wsdl"/>
-
-       <message name="RegisterJobRequest">
-               <part name="job" type="xsd:string"/>
-       </message>
-       <message name="StartUploadRequest">
-               <part name="job" type="xsd:string"/>
-               <part name="uclass" type="jp:UploadClass"/>
-               <part name="commitBefore" type="xsd:dateTime"/>
-               <part name="contentType" type="xsd:string"/>
-       </message>
-       <message name="StartUploadResponse">
-               <part name="destination" type="xsd:string"/>
-               <part name="commitBefore" type="xsd:dateTime"/>
-       </message>
-       <message name="CommitUploadRequest">
-               <part name="destination" type="xsd:string"/>
-       </message>
-       <message name="RecordTagRequest">
-               <part name="jobid" type="xsd:string"/>
-               <part name="tag" type="jp:TagValue"/>
-       </message>
-       <message name="FeedIndexRequest">
-               <part name="destination" type="xsd:string"/>
-               <part name="attributes" type="jp:Attributes"/>
-               <part name="conditions" type="jp:PrimaryQuery"/>
-               <part name="history" type="xsd:boolean"/>
-               <part name="continuous" type="xsd:boolean"/>
-       </message>
-       <message name="FeedIndexResponse">
-               <part name="feedId" type="xsd:string"/>
-               <part name="expires" type="xsd:dateTime"/>
-       </message>
-       <message name="FeedIndexRefreshRequest">
-               <part name="feedId" type="xsd:string"/>
-       </message>
-       <message name="GetJobRequest">
-               <part name="jobid" type="xsd:string"/>
-       </message>
-       <message name="GetJobResponse">
-               <part name="jobLog" type="xsd:string"/>
-               <part name="inputSandbox" type="xsd:string"/>
-               <part name="outputSandbox" type="xsd:string"/>
-               <part name="tags" type="xsd:string"/>
-       </message>
-       <message name="GenericJPFault">
-               <part name="fault" element="jp:GenericJPFault"/>
-       </message>
-       <message name="EmptyResponse"/>
-       <portType name="JobProvenancePS_PortType">
-               <operation name="RegisterJob">
-                       <documentation>Register job with JP primary storage.
-Job registration in LB is propagated to JP immediately so that JP is aware of the job,
-despite no furhter information is available in it.
-
-Input: JobId
-
-Output: N/A
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:RegisterJobRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="StartUpload">
-                       <documentation>Initiate upload of of sandbox/dump of job life log from LB.
-WM component responsible for job sandbox management and LB server call JP to declare
-intention to upload intput/output sandbox and job life log.
-
-Input:
-
-uclass: type of the upload - INPUT_SANDBOX, OUTPUT_SANDBOX, JOB_LOG
-
-commitTimeout: upper limit on time for which JP waits for committing this upload transaction
-
-contentType: MIME type of the uploaded file
-
-Output:
-
-destination: URL where the client should upload the file
-
-commitBefore: acutual time when the upload transaction times out
-
-Faults: GenericJPFault
-
-
-Initiate upload of of sandbox/dump of job life log from LB.</documentation>
-                       <input message="tns:StartUploadRequest"/>
-                       <output message="tns:StartUploadResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="CommitUpload">
-                       <documentation>Confirm upload.
-Should be called after a file upload initiaded with StartUpload is finished.
-
-Input:
-
-destination: Upload destination URL (to match with the original request)
-
-Output:
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:CommitUploadRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="RecordTag">
-                       <documentation>Record a value of user tag.
-JP tags are either standalone or override values of their LB counterparts.
-However, JP tag values are still distinguishable those inherited from LB.
-JP tags may be either strings or blobs.
-
-Input:
-
-jobid:
-
-tag: structure containing name, timestamp, optional sequence number to order tag values
-without relying on timestamps, and string or blob value.
-
-Output: N/A
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:RecordTagRequest"/>
-                       <output message="tns:EmptyResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="FeedIndex">
-                       <documentation>Start feeding JP index server.
-Called by the index server to start batch feed, and optionally also subscribe for incremental feed.
-
-JP index server subscribes with JP primary storage using a query
-containing conditions on primary metadata and a list of queryable attributes
-of the index server (i.e. data which should be sent to the index server).
-
-When a matching job record is created or modified within the primary storage
-the job record data are sent to the subscribed index server.
-
-The subscription is soft-state, it expires after certain time unless refreshed by the client explicitely.
-
-In the batch mode the query has the same form
-with additional flag asking for all matching records (i.e.\ not only
-arriving afterwards).
-
-Input:
-
-destination: where to send the job record data
-
-attributes: which job record attributes should be sent to the requesting index server
-
-conditions: list of query conditions. Each conditions has the form Attribute Operator Value,
-where Attribute is any of job record attributes and Operator is one of EQUAL, UNEQUAL, LESS, GREATER, WITHIN.
-
-continuous: flag determining that the query is incremental (not batch) 
-
-Output:
-
-feedId: unique Id of the feed request, to be used in refresh, cancelation etc.
-
-expires: when the feed times out. Must be refreshed before this time.
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:FeedIndexRequest"/>
-                       <output message="tns:FeedIndexResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="FeedIndexRefresh">
-                       <documentation>Extend batch feed subscription (used by index server)
-
-Input: feedId returned previously by FeedIndex
-
-Output: the same as for FeedIndex
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:FeedIndexRefreshRequest"/>
-                       <output message="tns:FeedIndexResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-               <operation name="GetJob">
-                       <documentation>Retrieve job record URL's when jobid is known
-Used either to bypass JP index server query for this specific case, or after the index server query to
-retrieve actual job record.
-
-Input: jobid
-
-Output:
-
-jobLog, inputSandbox, outputSandbox, tags: URL's to components of the job record.
-
-Faults: GenericJPFault
-                       </documentation>
-                       <input message="tns:GetJobRequest"/>
-                       <output message="tns:GetJobResponse"/>
-                       <fault name="f" message="tns:GenericJPFault"/>
-               </operation>
-       </portType>
-       <binding name="JobProvenancePS" type="tns:JobProvenancePS_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="RegisterJob">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="StartUpload">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="CommitUpload">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="RecordTag">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="FeedIndex">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="FeedIndexRefresh">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="GetJob">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/jp"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-
-       <service name="JobProvenancePS">
-               <documentation>Job Provenance Primary Storage service</documentation>
-               <port name="JobProvenancePS" binding="tns:JobProvenancePS">
-                       <SOAP:address location="http://localhost:10001"/>
-               </port>
-       </service>
-</WSDL:definitions>
diff --git a/org.glite.jp/project/JobProvenanceTypes.wsdl b/org.glite.jp/project/JobProvenanceTypes.wsdl

deleted file mode 100644 (file)

index e1a6db4..0000000
--- a/org.glite.jp/project/JobProvenanceTypes.wsdl
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0"?>
-<WSDL:definitions
-       xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
-       xmlns="http://schemas.xmlsoap.org/wsdl/"
-       xmlns:jp="http://glite.org/wsdl/types/jp"
-       targetNamespace="http://glite.org/wsdl/types/jp"
-       name="JobProvenanceTypes">
-
-
-<WSDL:types>   
-
-<schema
-       targetNamespace="http://glite.org/wsdl/types/jp"
-       xmlns="http://www.w3.org/2001/XMLSchema"
-       elementFormDefault="unqualified" attributeFormDefault="unqualified">
-       <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-       <simpleType name="AttributeType">
-               <restriction base="xsd:string">
-                       <enumeration value="OWNER"/>
-                       <enumeration value="TIME"/>
-                       <enumeration value="TAG"/>
-               </restriction>
-       </simpleType>
-       <simpleType name="UploadClass">
-               <restriction base="xsd:string">
-                       <enumeration value="INPUT-SANDBOX"/>
-                       <enumeration value="OUTPUT-SANDBOX"/>
-                       <enumeration value="JOB-LOG"/>
-               </restriction>
-       </simpleType>
-       <simpleType name="QueryOp">
-               <restriction base="xsd:string">
-                       <enumeration value="EQUAL"/>
-                       <enumeration value="UNEQUAL"/>
-                       <enumeration value="LESS"/>
-                       <enumeration value="GREATER"/>
-                       <enumeration value="WITHIN"/>
-               </restriction>
-       </simpleType>
-       <complexType name="TagValue">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="true"/>
-                       <element name="sequence" type="xsd:int" minOccurs="0" maxOccurs="1"/>
-                       <element name="timestamp" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="stringValue" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="blobValue" type="xsd:base64Binary" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="Attribute">
-               <sequence>
-                       <element name="type" type="jp:AttributeType" minOccurs="1" maxOccurs="1"/>
-                       <element name="name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="Attributes">
-               <sequence>
-                       <element name="item" type="jp:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="GenericJPFaultType">
-               <sequence>
-                       <element name="source" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="code" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                       <element name="text" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                       <element name="reason" type="jp:GenericJPFaultType" minOccurs="0" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="PrimaryQueryElement">
-               <sequence>
-                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="value2" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="PrimaryQuery">
-               <sequence>
-                       <element name="item" type="jp:PrimaryQueryElement" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="IndexQueryRecord">
-               <sequence>
-                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="IndexQueryElement">
-               <sequence>
-                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                       <element name="record" type="jp:IndexQueryRecord" minOccurs="1"  maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="IndexQuery">
-               <sequence>
-                       <element name="item" type="jp:IndexQueryElement" minOccurs="1" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="JobRecord">
-               <sequence>
-                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="PSContact" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="JobRecords">
-               <sequence>
-                       <element name="record" type="jp:JobRecord" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-
-       <complexType name="AttrUpdate">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="AttrUpdates">
-               <sequence>
-                       <element name="item" type="jp:AttrUpdate" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="JobUpdate">
-               <sequence>
-                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="attributes" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-                       <element name="tags" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="UpdateJobsData">
-               <sequence>
-                       <element name="job" type="jp:JobUpdate" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-               
-       <complexType name="FeedIndexResponse">
-               <sequence>
-                       <element name="feedId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="expires" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="GetJobResponse">
-               <sequence>
-                       <element name="jobLog" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="inputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="outputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="tags" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="StartUploadResponse">
-               <sequence>
-                       <element name="destination" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="commitBefore" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <element name="GenericJPFault" type="jp:GenericJPFaultType"/>
-</schema>
-
-</WSDL:types>
-</WSDL:definitions>
diff --git a/org.glite.jp/project/JobProvenanceTypes.xsd b/org.glite.jp/project/JobProvenanceTypes.xsd

deleted file mode 100644 (file)

index 743126f..0000000
--- a/org.glite.jp/project/JobProvenanceTypes.xsd
+++ /dev/null
@@ -1,146 +0,0 @@
-<schema
-       targetNamespace="http://glite.org/wsdl/types/jp"
-       xmlns="http://www.w3.org/2001/XMLSchema"
-       elementFormDefault="unqualified" attributeFormDefault="unqualified">
-       <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-
-       <simpleType name="AttributeType">
-               <restriction base="xsd:string">
-                       <enumeration value="OWNER"/>
-                       <enumeration value="TIME"/>
-                       <enumeration value="TAG"/>
-               </restriction>
-       </simpleType>
-       <simpleType name="UploadClass">
-               <restriction base="xsd:string">
-                       <enumeration value="INPUT-SANDBOX"/>
-                       <enumeration value="OUTPUT-SANDBOX"/>
-                       <enumeration value="JOB-LOG"/>
-               </restriction>
-       </simpleType>
-       <simpleType name="QueryOp">
-               <restriction base="xsd:string">
-                       <enumeration value="EQUAL"/>
-                       <enumeration value="UNEQUAL"/>
-                       <enumeration value="LESS"/>
-                       <enumeration value="GREATER"/>
-                       <enumeration value="WITHIN"/>
-               </restriction>
-       </simpleType>
-       <complexType name="TagValue">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1" nillable="true"/>
-                       <element name="sequence" type="xsd:int" minOccurs="0" maxOccurs="1"/>
-                       <element name="timestamp" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="stringValue" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="blobValue" type="xsd:base64Binary" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="Attribute">
-               <sequence>
-                       <element name="type" type="jp:AttributeType" minOccurs="1" maxOccurs="1"/>
-                       <element name="name" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="Attributes">
-               <sequence>
-                       <element name="item" type="jp:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="GenericJPFaultType">
-               <sequence>
-                       <element name="source" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="code" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                       <element name="text" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                       <element name="reason" type="jp:GenericJPFaultType" minOccurs="0" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="PrimaryQueryElement">
-               <sequence>
-                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="value2" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="PrimaryQuery">
-               <sequence>
-                       <element name="item" type="jp:PrimaryQueryElement" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="IndexQueryRecord">
-               <sequence>
-                       <element name="op" type="jp:QueryOp" minOccurs="1" maxOccurs="1"/>
-                       <element name="value" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="IndexQueryElement">
-               <sequence>
-                       <element name="attr" type="jp:Attribute" minOccurs="1" maxOccurs="1"/>
-                       <element name="record" type="jp:IndexQueryRecord" minOccurs="1"  maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="IndexQuery">
-               <sequence>
-                       <element name="item" type="jp:IndexQueryElement" minOccurs="1" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-       <complexType name="JobRecord">
-               <sequence>
-                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="PSContact" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="JobRecords">
-               <sequence>
-                       <element name="record" type="jp:JobRecord" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-
-       <complexType name="AttrUpdate">
-               <sequence>
-                       <element name="name" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="AttrUpdates">
-               <sequence>
-                       <element name="item" type="jp:AttrUpdate" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="JobUpdate">
-               <sequence>
-                       <element name="jobid" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                       <element name="attributes" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-                       <element name="tags" type="jp:AttrUpdates" minOccurs="1" maxOccurs="1"/>
-               </sequence>
-       </complexType>
-       <complexType name="UpdateJobsData">
-               <sequence>
-                       <element name="job" type="jp:JobUpdate" minOccurs="0" maxOccurs="unbounded"/>
-               </sequence>
-       </complexType>
-               
-       <complexType name="FeedIndexResponse">
-               <sequence>
-                       <element name="feedId" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="expires" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="GetJobResponse">
-               <sequence>
-                       <element name="jobLog" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="inputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="outputSandbox" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="tags" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <complexType name="StartUploadResponse">
-               <sequence>
-                       <element name="destination" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                       <element name="commitBefore" type="xsd:dateTime" minOccurs="0" maxOccurs="1" nillable="true"/>
-               </sequence>
-       </complexType>
-       <element name="GenericJPFault" type="jp:GenericJPFaultType"/>
-</schema>
diff --git a/org.glite.jp/project/properties.xml b/org.glite.jp/project/properties.xml

deleted file mode 100755 (executable)

index eb879c4..0000000
--- a/org.glite.jp/project/properties.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the gLite LB modules
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-                        Alberto Di Meglio <alberto.di.meglio@cern.ch>          
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1  2004/09/14 12:32:26  ljocha
-       *** empty log message ***
-       
-       Revision 1.2  2004/06/18 23:05:53  dimeglio
-       Added/upgraded default build scripts
-       
--->
-
-<project name="Job Provenance subsystem common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property name="subsystem.build.properties.file" value="./project/build.properties" />
-       <property file="${subsystem.build.properties.file}" />  
-
-       <!-- ======================================================
-          Define subsystem properties
-                ====================================================== -->
-       
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="org.glite.jp"/>
-       
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="jp"/>
-       
-       <!-- ======================================================
-          Define general subsystem properties
-                ====================================================== -->
-               
-       <!-- Include common subsystem properties -->
-       <import file="${subsystem.general.properties.file}" />
-       
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                       
-               
-</project>
diff --git a/org.glite.jp/project/taskdefs.xml b/org.glite.jp/project/taskdefs.xml

deleted file mode 100755 (executable)

index 0e0a223..0000000
--- a/org.glite.jp/project/taskdefs.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common Ant task definition file for the gLite Logging and Bookeeping modules
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-                        Alberto Di Meglio <alberto.di.meglio@cern.ch>          
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1  2004/09/14 12:32:29  ljocha
-       *** empty log message ***
-       
-       Revision 1.2  2004/06/18 23:05:53  dimeglio
-       Added/upgraded default build scripts
-       
--->
-
-<project name="Logging and Bookeeping subsystem common tasks and types definitions">
-       
-       <!-- ======================================================
-                Subsystem task definitions
-                ====================================================== -->
-       
-</project>
-\ No newline at end of file
diff --git a/org.glite.lb.client-interface/.cvsignore b/org.glite.lb.client-interface/.cvsignore

deleted file mode 100644 (file)

index 1df717b..0000000
--- a/org.glite.lb.client-interface/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.lb.client-interface/LICENSE b/org.glite.lb.client-interface/LICENSE

deleted file mode 100644 (file)

index 259a91f..0000000
--- a/org.glite.lb.client-interface/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware\r
-================================\r
-\r
-Copyright (c) 2004 on behalf of the EU EGEE Project: \r
-The European Organization for Nuclear Research (CERN), \r
-Istituto Nazionale di Fisica Nucleare (INFN), Italy\r
-Datamat Spa, Italy\r
-Centre National de la Recherche Scientifique (CNRS), France\r
-CS Systeme d'Information (CSSI), France\r
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden\r
-Universiteit van Amsterdam (UvA), Netherlands\r
-University of Helsinki (UH.HIP), Finlan\r
-University of Bergen (UiB), Norway\r
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom\r
-\r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are\r
-met: \r
-\r
-1. Redistributions of source code must retain the above copyright\r
-notice, this list of conditions and the following disclaimer.\r
-\r
-2. Redistributions in binary form must reproduce the above copyright\r
-notice, this list of conditions and the following disclaimer in the\r
-documentation and/or other materials provided with the distribution.\r
-\r
-3. The end-user documentation included with the redistribution, if\r
-any, must include the following acknowledgment: "This product includes\r
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."\r
-Alternatively, this acknowledgment may appear in the software itself, if\r
-and wherever such third-party acknowledgments normally appear.\r
-\r
-4. The names EGEE and the EU EGEE Project must not be\r
-used to endorse or promote products derived from this software without\r
-prior written permission. For written permission, please contact\r
-<email address>.\r
-\r
-5. You are under no obligation whatsoever to provide anyone with any\r
-bug fixes, patches, or upgrades to the features, functionality or\r
-performance of the Software ("Enhancements") that you may develop over\r
-time; however, if you choose to provide your Enhancements to The EU\r
-EGEE Project, or if you choose to otherwise publish or distribute your\r
-Enhancements, in source code form without contemporaneously requiring\r
-end users of The EU EGEE Proejct to enter into a separate written license\r
-agreement for such Enhancements, then you hereby grant The EU EGEE Project\r
-a non-exclusive, royalty-free perpetual license to install, use, copy,\r
-modify, prepare derivative works, incorporate into the EGEE Middleware\r
-or any other computer software, distribute, and sublicense your\r
-Enhancements or derivative works thereof, in binary and source code\r
-form (if any), whether developed by The EU EGEE Project or third parties.\r
-\r
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\r
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE\r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\r
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\r
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\r
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\r
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
-This software consists of voluntary contributions made by many\r
-individuals on behalf of the EU EGEE Prject. For more information on The\r
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on\r
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/\r
-\r
-\r
diff --git a/org.glite.lb.client-interface/Makefile b/org.glite.lb.client-interface/Makefile

deleted file mode 100644 (file)

index 2178b0e..0000000
--- a/org.glite.lb.client-interface/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# Default values
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-client-interface
-version=0.0.0
-PREFIX=/opt/glite
-
--include Makefile.inc
-
-SUFFIXES = .T
-
-VPATH=${top_srcdir}/interface
-AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
-
-STAGETO=include/${globalprefix}/${lbprefix}
-STATIC_H=consumer.h context.h dump.h load.h notification.h notifid.h purge.h \
-       Notification.h CountRef.h Job.h LoggingExceptions.h ServerConnection.h
-GEN_H=events.h jobstat.h producer.h Event.h JobStatus.h
-
-
-generate: ${GEN_H}
-
-all compile: generate
-
-check: 
-       @echo No unit test required for interface-only module.
-
-%.h: %.h.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-stage: generate
-       $(MAKE) install PREFIX=${top_srcdir}/${stagedir}
-
-dist: distsrc distbin
-
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=${top_srcdir}/tmpbuilddir
-       cd ${top_srcdir}/tmpbuilddir && tar -czf ${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *
-       rm -rf ${top_srcdir}/tmpbuilddir
-       
-install:
-       -mkdir -p ${PREFIX}/${STAGETO}
-       -mkdir -p ${PREFIX}/share/doc/${package}-${version}
-       install -m 644 ${GEN_H} ${PREFIX}/${STAGETO}
-       install -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       cd ${top_srcdir}/interface && install -m 644 ${STATIC_H} ${PREFIX}/${STAGETO}
-
-clean:
-       rm -f *.h
-       
diff --git a/org.glite.lb.client-interface/build.xml b/org.glite.lb.client-interface/build.xml

deleted file mode 100755 (executable)

index f0f6a1a..0000000
--- a/org.glite.lb.client-interface/build.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite LB Client Interface module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.5  2004/08/05 15:22:34  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.4  2004/07/06 17:47:31  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.3  2004/06/22 15:51:36  dimeglio
-       Added handling of *.T, *.pm and at3
-       
-       Revision 1.2  2004/06/21 16:02:16  dimeglio
-       Modified to search support files in module project directory
-       
--->
-
-<project name="client-interface" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite LB Client Interface Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-
-       <!-- =========================================
-                Load configure options (order is important)
-            ========================================= -->
-       <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>
-       
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-        <!-- Copy support files from the subsystem project to the component project-->
-               <copy toDir="${module.project.dir}">
-                       <fileset dir="${subsystem.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </copy> 
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-               <delete>
-                       <fileset dir="${module.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </delete>       
-       </target>
-       
-       <!-- =========================================
-            RPM settings
-            ========================================= -->
-
-       <property name="build.package.summary" value="L&amp;B client library header files" />
-       <property name="build.package.description" value="
-Logging &amp; Bookkeeping (L&amp;B) client library C/C++ header files." />
-
-</project>             
diff --git a/org.glite.lb.client-interface/interface/CountRef.h b/org.glite.lb.client-interface/interface/CountRef.h

deleted file mode 100644 (file)

index a8f61cf..0000000
--- a/org.glite.lb.client-interface/interface/CountRef.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_COUNTREF_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_COUNTREF_HPP__
-
-#define EWL_BEGIN_NAMESPACE namespace glite { namespace lb {
-#define EWL_END_NAMESPACE } }
-
-EWL_BEGIN_NAMESPACE;
-
-template<typename T>
-class CountRef {
-public:
-       CountRef(void *);
-//     CountRef(void *,void (*)(void *));
-
-       void use(void);
-       void release(void);
-
-       void    *ptr;
-private:
-       int     count;
-//     void    (*destroy)(void *);
-};
-
-template <typename T>
-CountRef<T>::CountRef(void *p)
-{
-       ptr = p;
-       count = 1;
-}
-
-template <typename T>
-void CountRef<T>::release(void)
-{
-       if (--count == 0) {
-               T::destroyFlesh(ptr);
-               delete this;
-       }
-}
-
-template <typename T>
-void CountRef<T>::use(void)
-{
-       count++;
-}
-
-EWL_END_NAMESPACE;
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/Event.h.T b/org.glite.lb.client-interface/interface/Event.h.T

deleted file mode 100644 (file)

index 64b4958..0000000
--- a/org.glite.lb.client-interface/interface/Event.h.T
+++ /dev/null
@@ -1,148 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_EVENT_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_EVENT_HPP__
-
-
-#include <utility>
-#include <vector>
-#include <string>
-
-#include "glite/wmsutils/jobid/JobId.h"
-#include "glite/lb/CountRef.h"
-
-#ident "$Header$"
-
-/** @file Event.h
- *  @version $Revision$
- */
-
-/*
-@@@AUTO
-*/
-@@@LANG: C++
-
-#include "glite/lb/events.h"
-#include "glite/lb/notifid.h"
-
-EWL_BEGIN_NAMESPACE;
-
-class Event {
-       friend class Job;
-       friend class ServerConnection;
-       friend class CountRef<Event>;
-public:
-       /** Event type codes.
-        * Identify which of the event fields are valid.
-        */
-
-       enum Type {
-               UNDEF = 0,
-@@@{
-       for my $e ($event->getTypesOrdered) {
-               my $u = uc $e;
-               my $c = getTypeComment $event $e;
-               gen "\t\t$u,\t/**< $c */\n";
-       }
-@@@}
-               TYPE_MAX
-       };
-
-       /** Event attribute symbolic identifier. */
-       enum Attr {
-@@@{
-       for (sort {$a cmp $b} getAllFields $event) {
-               my $u = $_;
-# $u =~ s/([a-z])([A-Z])/$1_$2/g;
-               $u = uc $u;
-
-               my $c = "\t/**\n";
-               for my $t (sort $event->getFieldOccurence($_)) {
-                       selectType $event $t;
-                       my $cc = getFieldComment $event $_;
-                       $t = 'common' if $t eq '_common_';
-                       $c .= "\t * $t: $cc\n";
-               }
-               $c .= "\t */\n";
-
-               gen "$c\t\t$u,\n";
-       }
-@@@}
-               ATTR_MAX
-       };
-
-@@@{
-       for my $f (getAllFields $event) {
-               for my $t (getFieldOccurence $event $f) {
-                       my $ff;
-                       my $ut;
-                       my $utf;
-                       if ($t eq '_common_') {
-                               $ff = $f;
-                               $ut = '';
-                               $utf = '';
-                       }
-                       else {
-                               selectType $event $t;
-                               selectField $event $f;
-                               $ff = getField $event;
-                               $ut = uc $t . '_';
-                               $utf = ucfirst $t;
-                       }
-                       if ($ff->{codes}) {
-                               gen qq{
-!      enum ${utf}Code \{
-};
-                               for (@{$ff->{codes}}) {
-                                       gen qq{
-!              $ut$_->{name},  /**< $_->{comment} */
-};
-                               }
-                               gen qq{
-!      \};
-};
-                       }
-               }
-       }
-@@@}
-
-       enum AttrType { INT_T, STRING_T, TIMEVAL_T, PORT_T, LOGSRC_T, JOBID_T, NOTIFID_T };
-
-       Type    type;
-
-       Event(void);
-        Event(edg_wll_Event *);
-       Event(const Event &);
-       ~Event(void);
-
-
-       /** Assign new Event to an existing instance. */
-       Event & operator= (const Event &);
-
-       /** String representation of the event type */
-       const std::string & name(void) const;
-
-       /** Retrieve integer attribute */
-       int     getValInt(Attr) const;
-
-       /** Retrieve string attribute */
-       std::string getValString(Attr) const;
-
-        /** Retrieve time attribute */
-        struct timeval getValTime(Attr) const;
-               
-        /** Retrieve jobid attribute */
-        const glite::wmsutils::jobid::JobId getValJobId(Attr) const;
-
-       /** Attribute name */
-       const std::string & getAttrName(Attr) const;
-
-       /** List of attributes and types valid for this instance */
-       const std::vector<std::pair<Attr,AttrType> >  & getAttrs(void) const;
-
-private:
-       static void     destroyFlesh(void *);
-       CountRef<Event> *flesh;
-};
-
-EWL_END_NAMESPACE;
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/Job.h b/org.glite.lb.client-interface/interface/Job.h

deleted file mode 100644 (file)

index 8f69ed8..0000000
--- a/org.glite.lb.client-interface/interface/Job.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_JOB_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_JOB_HPP__
-
-#ident "$Header$"
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-#include "glite/lb/Event.h"
-#include "glite/lb/JobStatus.h"
-#include "glite/lb/ServerConnection.h"
-
-
-/**
- * @file Job.h
- * @version $Revision$
- */
-
-EWL_BEGIN_NAMESPACE;
-
-/** L&B job.
- * Implementation of L&B job-specific calls.
- * Connection to the server is maintained transparently.
-*/
-  
-class Job {
-public:
-  Job(void);
-  Job(const glite::wmsutils::jobid::JobId &);
-  ~Job();
-  
-  /** Assign new JobId to an existing instance.
-   * Connection to server is preserved if possible.
-   */
-  
-  Job & operator= (const glite::wmsutils::jobid::JobId &);
-
-/**
- * Status retrieval bitmasks. Used ORed as Job::status() argument,
- * determine which status fields are actually retrieved.
- */
-  static const int STAT_CLASSADS;       /**< various job description fields */
-  static const int STAT_CHILDREN;       /**< list of subjob JobId's */
-  static const int STAT_CHILDSTAT;      /**< apply the flags recursively to subjobs */
-
-  /** Return job status */
-  JobStatus status(int) const;
-  
-  /** Return all events corresponding to this job */
-  void log(std::vector<Event> &) const;
-  const std::vector<Event> log(void) const;
-  
-  /** Return last known address of a listener associated to the job.
-   * \param name name of the listener
-   * \return hostname and port number
-   */
-  const std::pair<std::string,uint16_t> queryListener(const std::string & name) const;
-  
-  /** Manipulate LB parameters, the same as for edg_wll_Context in C */
-  void setParam(edg_wll_ContextParam, int); 
-  void setParam(edg_wll_ContextParam, const std::string); 
-  void setParam(edg_wll_ContextParam, const struct timeval &); 
-
-  int getParamInt(edg_wll_ContextParam) const;
-  std::string getParamString(edg_wll_ContextParam) const;
-  struct timeval getParamTime(edg_wll_ContextParam) const;
-  
-private:
-  ServerConnection     server;
-  glite::wmsutils::jobid::JobId                        jobId;
-};
-
-EWL_END_NAMESPACE;
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/JobStatus.h.T b/org.glite.lb.client-interface/interface/JobStatus.h.T

deleted file mode 100644 (file)

index 8b63de1..0000000
--- a/org.glite.lb.client-interface/interface/JobStatus.h.T
+++ /dev/null
@@ -1,151 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTATUS_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTATUS_HPP__
-
-/*
-@@@AUTO
-*/
-
-@@@LANG: C++
-
-#include <sys/time.h>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-#include "glite/lb/jobstat.h"
-#include "glite/lb/CountRef.h"
-
-EWL_BEGIN_NAMESPACE;
-
-/**
- * Description of job status.
- * The status is computed from a sequence of logged events
- */
-
-
-class JobStatus {
-       friend class Job;
-       friend class CountRef<JobStatus>;
-public:
-       enum Code {
-               UNDEF = 0,      /**< indicates invalid, i.e. uninitialized instance */
-@@@{
-       for my $stat ($status->getTypesOrdered)
-       {
-               my $u = uc($stat);
-               my $c = getTypeComment $status $stat;
-               gen qq{
-!              $u,     /**< $c */
-};
-       }
-@@@}
-               CODE_MAX
-       };
-
-       enum Attr {
-@@@{
-       selectType $status '_common_';
-       for my $u (sort {$a cmp $b} getAllFields $status) {
-               selectField $status $u;
-               my $f = getField $status;
-               $u =~ s/([a-z])([A-Z])/$1_$2/g;
-               $u = uc $u;
-
-               gen "\t/** $f->{comment} */\n\t\t$u,\n";
-       }
-@@@}
-               ATTR_MAX
-       };
-
-@@@{
-       selectType $status '_common_';
-       for my $n (getAllFields $status) {
-               selectField $status $n;
-               my $f = getField $status;
-               if ($f->{codes}) {
-                        my $n = uc getName $f;
-                       gen qq{
-!      enum \{
-};
-                       for (@{$f->{codes}}) {
-                               gen qq{
-!              $n\_$_->{name}, /**< $_->{comment} */
-};
-                       }
-                       gen qq{
-!      \};
-};
-               }
-       }
-@@@}
-       enum AttrType { INT_T, 
-                       STRING_T, 
-                       TIMEVAL_T, 
-                       BOOL_T,
-                       JOBID_T,
-                       INTLIST_T, 
-                       STRLIST_T, 
-                       TAGLIST_T, 
-                       STSLIST_T 
-       };
-  
-       /** Numeric status code */
-       Code    status;
-  
-       /** String representation of the status code */
-       const std::string & name(void) const;
-  
-       /** Retrieve integer attribute */
-       int     getValInt(Attr) const;
-  
-       /** Retrieve string attribute */
-       std::string getValString(Attr) const;
-  
-       /** Retrieve time attribute */
-       struct timeval  getValTime(Attr) const;
-  
-       /** Retrieve jobid attribute */
-       const glite::wmsutils::jobid::JobId  getValJobId(Attr) const;
-
-       /** Retrieve bool attribute */
-       bool getValBool(Attr) const;
-
-       /** Retrieve int list attribute */
-       const std::vector<int> getValIntList(Attr) const;
-
-       /** Retrieve string list attribute */
-       const std::vector<std::string> getValStringList(Attr) const;
-
-       /** Retrieve tag list attribute */
-       const std::vector<std::pair<std::string,std::string> > getValTagList(Attr) const;
-
-       /** Retrieve job status list attribute */
-       const std::vector<JobStatus> getValJobStatusList(Attr) const;
-
-       /** Attribute name */
-       const std::string& getAttrName(Attr) const;
-  
-       /** List of attributes and types valid for this instance */
-       const std::vector<std::pair<Attr,AttrType> >& getAttrs(void) const;
-  
-       JobStatus(void);
-       JobStatus(const JobStatus &);
-       JobStatus & operator=(const JobStatus &);
-       JobStatus(const edg_wll_JobStat &);
-       JobStatus & operator=(const edg_wll_JobStat&);
-       virtual ~JobStatus();
-
-protected:
-       edg_wll_JobStat *c_ptr(void);
-
-private:
-       static void     destroyFlesh(void *);
-       CountRef<JobStatus> *flesh;
-};
-
-EWL_END_NAMESPACE;
-
-#endif
-
diff --git a/org.glite.lb.client-interface/interface/LoggingExceptions.h b/org.glite.lb.client-interface/interface/LoggingExceptions.h

deleted file mode 100644 (file)

index 1d22a2e..0000000
--- a/org.glite.lb.client-interface/interface/LoggingExceptions.h
+++ /dev/null
@@ -1,144 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_LOGGING_EXCEPTIONS_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_LOGGING_EXCEPTIONS_HPP__
-
-#ident "$Header$"
-
-/** @file LoggingExceptions.h
- *  @version $Revision$
- */
-
-#include "glite/wmsutils/exception/Exception.h"
-
-#include <pthread.h>
-
-EWL_BEGIN_NAMESPACE;
-
-class Exception: public glite::wmsutils::exception::Exception {
-public:
-       
-       /* constructor for mandatory fields */
-       Exception(const std::string& source,
-                 int line_number,
-                 const std::string& method,
-                 int   code,
-                 const std::string& exception) 
-               : glite::wmsutils::exception::Exception(source, 
-                                                             line_number, 
-                                                             method, 
-                                                             code, 
-                                                             "glite::lb::Exception")
-               { error_message = exception; };
-       
-       /* constructor for mandatory fields AND exception chain */
-       Exception(const std::string& source,
-                 int line_number,
-                 const std::string& method,
-                 int   code,
-                 const std::string& exception,
-                 const glite::wmsutils::exception::Exception &exc)
-               : glite::wmsutils::exception::Exception(source, 
-                                                             line_number, 
-                                                             method, 
-                                                             code, 
-                                                             "glite::lb::Exception")
-               { error_message = exception + ": " + exc.what(); };
-};
-
-
-class LoggingException: public Exception {
-public:
-       
-       /* constructor for mandatory fields */
-       LoggingException(const std::string& source,
-                        int line_number,
-                        const std::string& method,
-                        int   code,
-                        const std::string& exception) 
-               : Exception(source, line_number, method, code, exception)
-               {};
-       
-       /* constructor for mandatory fields AND exception chain */
-       LoggingException(const std::string& source,
-                        int line_number,
-                        const std::string& method,
-                        int   code,
-                        const std::string& exception, 
-                        const glite::wmsutils::exception::Exception &exc)
-               : Exception(source, line_number, method, code, exception)
-               {};
-};
-
-
-class OSException: public Exception {
-public:
-       
-       /* constructor for mandatory fields */
-       OSException(const std::string& source,
-                   int line_number,
-                   const std::string& method,
-                   int   code,
-                   const std::string& exception)
-               : Exception(source, 
-                           line_number, 
-                           method, 
-                           code, 
-                           exception + ": " + strerror(code))
-               {};
-       
-       /* constructor for mandatory fields AND exception chain */
-       OSException(const std::string& source,
-                   int line_number,
-                   const std::string& method,
-                   int   code,
-                   const std::string& exception,
-                   const glite::wmsutils::exception::Exception &exc)
-               : Exception(source, 
-                           line_number, 
-                           method, 
-                           code, 
-                           exception + ": " + strerror(code))
-               {};
-};
-
-
-#define EXCEPTION_MANDATORY                           \
-       __FILE__,                                     \
-        __LINE__,                                     \
-        std::string(CLASS_PREFIX) + __FUNCTION__         
-
-#define STACK_ADD                                     
-
-/* note: we can use __LINE__ several times in macro, it is expanded into one row */
-#define throw_exception(context, exception)           \
-{ STACK_ADD;                                          \
-  {                                                   \
-     char *text, *desc;                               \
-     int  code;                                       \
-     std::string exc;                                      \
-                                                      \
-     code = edg_wll_Error((context), &text, &desc);   \
-     exc = exception;                                 \
-     if (text) {                                     \
-       exc += ": ";                                  \
-       exc += text;                                  \
-     }                                               \
-     if (desc) {                                     \
-       exc += ": ";                                  \
-       exc += desc;                                  \
-     }                                               \
-     free(text);                                      \
-     free(desc);                                      \
-     throw LoggingException(EXCEPTION_MANDATORY,      \
-                           code,                     \
-                           exc);                     \
-  }                                                  \
-}
- 
-#define check_result(code, context, desc)             \
-  if((code)) throw_exception((context), desc)
-
-
-
-EWL_END_NAMESPACE;
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/Notification.h b/org.glite.lb.client-interface/interface/Notification.h

deleted file mode 100644 (file)

index b8e8b27..0000000
--- a/org.glite.lb.client-interface/interface/Notification.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_HPP__
-
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/notification.h"
-#include "glite/lb/JobStatus.h"
-
-
-EWL_BEGIN_NAMESPACE; 
-
-
-/** Manage LB notifications.
- * Simplified API, covers only a subset of C API functinality
- */
-
-class Notification {
-public:
-       /** Create an empty object
-        * to be used for new notifications, i.e. with Register()
-        */
-       Notification();
-
-       /** Create from server,port pair
-        * to be used for new notifications, i.e. with Register()
-        * \param host
-        * \param port
-        */
-       Notification(const std::string,const u_int16_t);
-
-       /** Create from NotifId
-        * to be used for existing notifications, i.e. with Bind()
-        * \param notifId
-        */
-       Notification(const std::string);
-
-       ~Notification();
-
-       std::string getNotifId() const; /**< retrieve NotifId */
-       time_t getValid() const;        /**< retrieve time until when it is valid */
-       int getFd() const;              /**< retrieve local listener filedescriptor */
-
-       /** Add this job to the list.
-        * Local operation only, Register() has to be called
-        * to propagate changes to server 
-        */
-       void addJob(const glite::wmsutils::jobid::JobId &); 
-
-       /** Remove job from the list, local op again. */
-       void removeJob(const glite::wmsutils::jobid::JobId &);
-
-       /** Get jobs on the list */
-       std::string getJobs();
-
-       /** Receive notifications on these states */
-       void setStates(const std::vector<glite::lb::JobStatus::Code> &);
-
-       /** Get states */
-       std::string getStates();
-
-       /** Register (or re-register, i.e. change and extend) 
-        * with the server
-        */
-       void Register();
-
-       /** Bind to the existing notification at the server
-        * i.e. change the receiving local address
-        * \param address_override
-        */
-       void Bind(const std::string);
-
-       /** Receive notification.
-        * Blocks at most the specified timeout (maybe 0 for local polling).
-        * \retval 0 OK
-        * \retval 1 timeout 
-        */
-       int receive(glite::lb::JobStatus &,timeval &);
-
-private:
-       std::vector<glite::wmsutils::jobid::JobId>      jobs;
-       std::vector<glite::lb::JobStatus::Code> states;
-
-       edg_wll_Context ctx;
-       edg_wll_NotifId notifId;
-       time_t          valid;
-};
-
-
-EWL_END_NAMESPACE;
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/ServerConnection.h b/org.glite.lb.client-interface/interface/ServerConnection.h

deleted file mode 100644 (file)

index 333d0bd..0000000
--- a/org.glite.lb.client-interface/interface/ServerConnection.h
+++ /dev/null
@@ -1,306 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_SERVERCONNECTION_HPP__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_SERVERCONNECTION_HPP__
-
-#ident "$Header$"
-
-/**
- * @file ServerConnection.h
- * @version $Revision$
- */
-
-#include <string.h>
-#include <list>
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-#include "glite/lb/Event.h"
-#include "glite/lb/JobStatus.h"
-#include "glite/lb/consumer.h"
-
-EWL_BEGIN_NAMESPACE;
-
-/** Auxiliary class to hold an atomic query condition. */
-class QueryRecord {
-public:
-       friend class ServerConnection;
-       friend edg_wll_QueryRec *convertQueryVector(const std::vector<QueryRecord> &in);
-
-       /* IMPORTANT: must match lbapi.h */
-       enum Attr {
-               UNDEF=0,        /**< Not-defined value, used to terminate lists etc. */
-               JOBID,          /**< Job Id \see _edg_wll_QueryRec */
-               OWNER,          /**< Job owner \see _edg_wll_QueryRec */
-               STATUS,         /**< Current job status */
-               LOCATION,       /**< Where is the job processed */
-               DESTINATION,    /**< Destination CE */
-               DONECODE,       /**< Minor done status (OK,fail,cancel) */
-               USERTAG,        /**< User tag (not implemented yet) */
-               TIME,           /**< Timestamp \see _edg_wll_QueryRec */
-               LEVEL,          /**< Logging level (see "dglog.h") * \see _edg_wll_QueryRec */
-               HOST,           /**< Where the event was generated */
-               SOURCE,         /**< Source component */
-               INSTANCE,       /**< Instance of the source component */
-               EVENT_TYPE,     /**< Event type \see _edg_wll_QueryRec */
-               CHKPT_TAG,      /**< Checkpoint tag */
-               RESUBMITTED,    /**< Job was resubmitted */
-               PARENT,         /**< Job was resubmitted */
-               EXITCODE,       /**< Unix exit code */
-       };
-
-       enum Op {
-               EQUAL=EDG_WLL_QUERY_OP_EQUAL,
-               LESS=EDG_WLL_QUERY_OP_LESS,
-               GREATER=EDG_WLL_QUERY_OP_GREATER,
-               WITHIN=EDG_WLL_QUERY_OP_WITHIN,
-               UNEQUAL=EDG_WLL_QUERY_OP_UNEQUAL
-       };
-  
-       QueryRecord();
-
-       /* copy and assignment */
-       QueryRecord(const QueryRecord &);
-       QueryRecord& operator=(const QueryRecord &);
-
-       /* constructors for simple attribute queries */
-       QueryRecord(const Attr, const Op, const std::string &);
-       QueryRecord(const Attr, const Op, const int);
-       QueryRecord(const Attr, const Op, const struct timeval &);
-       QueryRecord(const Attr, const Op, const glite::wmsutils::jobid::JobId&);
-       /* this one is for attr==TIME and particular state */
-       QueryRecord(const Attr, const Op, const int, const struct timeval &);
-       
-       /* constructors for WITHIN operator */
-       QueryRecord(const Attr, const Op, const std::string &, const std::string &);
-       QueryRecord(const Attr, const Op, const int, const int);
-       QueryRecord(const Attr, const Op, const struct timeval &, const struct timeval &);
-       QueryRecord(const Attr, const Op, const int, const struct timeval &, const struct timeval &);
-
-       /* convenience for user tags */
-       QueryRecord(const std::string &, const Op, const std::string &);
-       QueryRecord(const std::string &, const Op, const std::string &, const std::string &);
-       
-       ~QueryRecord();
-  
-       static const std::string AttrName(const Attr) ;
-  
-protected:
-
-       /* conversion to C API type */
-       operator edg_wll_QueryRec() const;
-
-private:
-       Attr    attr;
-       Op      oper;
-       std::string tag_name;
-       int state;
-       std::string string_value;
-       glite::wmsutils::jobid::JobId jobid_value;
-        int     int_value;
-        struct timeval timeval_value;
-       std::string string_value2;
-        int     int_value2;
-        struct timeval timeval_value2;
-};
-
-
-/** Supported aggregate operations */
-enum AggOp { AGG_MIN=1, AGG_MAX, AGG_COUNT };
-
-
-/**
- * Connection to the L&B server.
- * Maintain connection to the server.
- * Implement non job-specific API calls
- */
-
-class ServerConnection {
-public:
-       friend class Job;
-
-       ServerConnection(void);
-
-       /* DEPRECATED: do not use
-        * connections are now handled automagically inside the implementation
-        */
-       ServerConnection(const std::string &);
-
-       /** Open connection to a given server */
-       void open(const std::string &);
-
-       /** Close the current connection */
-       void close(void);
-
-       /* END DEPRECATED */
-
-       /* set & get parameter methods */
-
-       /* consumer parameter settings */
-       void setQueryServer(const std::string&, int);
-       void setQueryTimeout(int);
-
-       void setX509Proxy(const std::string&);
-       void setX509Cert(const std::string&, const std::string&);
-
-       std::pair<std::string, int> getQueryServer() const;
-       int getQueryTimeout() const;
-
-       std::string getX509Proxy() const;
-       std::pair<std::string, std::string> getX509Cert() const;
-
-       /* end of set & get */
-
-       virtual ~ServerConnection();
-
-
-       /* consumer API */
-
-       /** Retrieve the set of single indexed attributes.
-        * outer vector elements correspond to indices
-        * inner vector elements correspond to index columns
-        * if .first of the pair is USERTAG, .second is its name
-        * if .first is TIME, .second is state name
-        * otherwise .second is meaningless (empty string anyway)
-        */
-       std::vector<std::vector<std::pair<QueryRecord::Attr,std::string> > >
-               getIndexedAttrs(void);
-
-       /** Retrieve hard and soft result set size limit */
-       std::pair<int,int> getLimits(void) const;
-
-       /** Set the soft result set size limit */
-       void setQueryJobsLimit(int);
-       void setQueryEventsLimit(int);
-  
-       /** Retrieve all events satisfying the query records
-        * @param job_cond, event_cond - vectors of conditions to be satisfied 
-        *  by jobs as a whole or particular events, conditions are ANDed
-        * @param events vector of returned events
-        */
-       void queryEvents(const std::vector<QueryRecord>& job_cond,
-                        const std::vector<QueryRecord>& event_cond,
-                        std::vector<Event>&) const;
-  
-       const std::vector<Event> queryEvents(const std::vector<QueryRecord>& job_cond,
-                                            const std::vector<QueryRecord>& event_cond) const;
-
-       const std::list<Event> queryEventsList(const std::vector<QueryRecord>& job_cond,
-                                              const std::vector<QueryRecord>& event_cond) const;
-
-
-       /** The same as queryEvents but return only an aggregate.
-        * @param job_cond, event_cond - vectors of conditions to be satisfied 
-        *  by jobs as a whole or particular events, conditions are ANDed
-        * @param op aggregate operator to apply
-        * @param attr attribute to apply the operation to
-        */
-       std::string queryEventsAggregate(const std::vector<QueryRecord>& job_cond,
-                                        const std::vector<QueryRecord>& event_cond,
-                                        enum AggOp const op,
-                                        std::string const attr) const;
-  
-
-       /** Retrieve all events satisfying the query records
-        * @param job_cond, event_cond - vectors of vectors of job or event conditions, 
-        * respectively. The inner vectors are logically ANDed, the outer are ORed
-        * (cond1 AND cond2 AND ...) OR (condN AND ...)
-        * @param events vector of returned events
-        */
-       void queryEvents(const std::vector<std::vector<QueryRecord> >& job_cond,
-                        const std::vector<std::vector<QueryRecord> >& event_cond,
-                        std::vector<Event>&) const;
-  
-       const std::vector<Event> 
-       queryEvents(const std::vector<std::vector<QueryRecord> >& job_cond,
-                   const std::vector<std::vector<QueryRecord> >& event_cond) const;
-
-       
-       /** Retrieve jobs satisfying the query records, including their states
-        * @param query vector of Query records that are anded to form the
-        *      query
-        * @param ids vector of returned job id's
-        * @param states vector of returned job states
-        */
-  
-       void queryJobs(const std::vector<QueryRecord>& query,
-                      std::vector<glite::wmsutils::jobid::JobId>& ids) const;
-  
-       const std::vector<glite::wmsutils::jobid::JobId>
-       queryJobs(const std::vector<QueryRecord>& query) const;
-  
-       
-       /** Retrieve jobs satisfying the query records, including their states
-        * @param query vector of Query record vectors that are ORed and ANDed to form the
-        *      query
-        * @param ids vector of returned job id's
-        * @param states vector of returned job states
-        */
-   
-       void queryJobs(const std::vector<std::vector<QueryRecord> >& query,
-                      std::vector<glite::wmsutils::jobid::JobId>& ids) const;
-  
-       const std::vector<glite::wmsutils::jobid::JobId>
-       queryJobs(const std::vector<std::vector<QueryRecord> >& query) const;
-
-       /** Retrieve jobs satisfying the query records, including status
-        * information
-        * @param query vector of Query records that are anded to form the
-        *      query
-        * @param ids vector of returned job id's
-        * @param states vector of returned job states
-        */
-       void queryJobStates(const std::vector<QueryRecord>& query, 
-                           int flags,
-                           std::vector<JobStatus> & states) const;
-       const std::vector<JobStatus>  queryJobStates(const std::vector<QueryRecord>& query, 
-                                                    int flags) const;
-
-       const std::list<JobStatus>  queryJobStatesList(const std::vector<QueryRecord>& query,
-                                                    int flags) const;
-  
-       /** Retrieve jobs satisfying the query records, including status
-        * information
-        * @param query vector of Query records that are anded to form the
-        *      query
-        * @param ids vector of returned job id's
-        * @param states vector of returned job states
-        */
-       void queryJobStates(const std::vector<std::vector<QueryRecord> >& query, 
-                           int flags,
-                           std::vector<JobStatus> & states) const;
-       const std::vector<JobStatus>  
-       queryJobStates(const std::vector<std::vector<QueryRecord> >& query, 
-                      int flags) const;
-  
-       /** States of all user's jobs.
-        * Convenience wrapper around queryJobs.
-        */
-       void userJobStates(std::vector<JobStatus>& stateList) const;
-       const std::vector<JobStatus> userJobStates() const;
-  
-  
-       /** JobId's of all user's jobs.
-        * Convenience wrapper around queryJobs.
-        */
-       void userJobs(std::vector<glite::wmsutils::jobid::JobId> &) const;
-       const std::vector<glite::wmsutils::jobid::JobId> userJobs() const;
-
-       /** Manipulate LB parameters, the same as for edg_wll_Context in C */
-       void setParam(edg_wll_ContextParam, int); 
-       void setParam(edg_wll_ContextParam, const std::string); 
-       void setParam(edg_wll_ContextParam, const struct timeval &); 
-
-       int getParamInt(edg_wll_ContextParam) const;
-       std::string getParamString(edg_wll_ContextParam) const;
-       struct timeval getParamTime(edg_wll_ContextParam) const;
-  
-protected:
-
-       edg_wll_Context getContext(void) const;
-
-private:
-       edg_wll_Context context;
-};
-
-EWL_END_NAMESPACE;
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/consumer.h b/org.glite.lb.client-interface/interface/consumer.h

deleted file mode 100644 (file)

index ccd1b37..0000000
--- a/org.glite.lb.client-interface/interface/consumer.h
+++ /dev/null
@@ -1,290 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__
-
-/*!
- * \file client/consumer.h  (lbapi.h originaly)
- * \brief L&B consumer API
- *
- * General rules:
- * - functions return 0 on success, nonzero on error, errror details can 
- *   be found via edg_wll_ErrorCode()
- * - OUT are ** types, functions malloc()-ate objects and fill in the pointer 
- *   pointed to by the OUT argument
- * - returned lists of pointers are NULL-terminated malloc()-ed arrays
- * - edg_wll_Query + wrapper terminate arrays with EDG_WLL_EVENT_UNDEF event
- * - OUT is NULL if the list is empty
- */
-
-#ident "$Header$"
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/context.h"
-#include "glite/lb/events.h"
-#include "glite/lb/jobstat.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- * Predefined types for query attributes
- */
-typedef enum _edg_wll_QueryAttr{
-       EDG_WLL_QUERY_ATTR_UNDEF=0,     /**< Not-defined value, used to terminate lists etc. */
-       EDG_WLL_QUERY_ATTR_JOBID,       /**< Job Id \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_ATTR_OWNER,       /**< Job owner \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_ATTR_STATUS,      /**< Current job status */
-       EDG_WLL_QUERY_ATTR_LOCATION,    /**< Where is the job processed */
-       EDG_WLL_QUERY_ATTR_DESTINATION, /**< Destination CE */
-       EDG_WLL_QUERY_ATTR_DONECODE,    /**< Minor done status (OK,fail,cancel) */
-       EDG_WLL_QUERY_ATTR_USERTAG,     /**< User tag */
-       EDG_WLL_QUERY_ATTR_TIME,        /**< Timestamp \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_ATTR_LEVEL,       /**< Logging level (see "dglog.h") * \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_ATTR_HOST,        /**< Where the event was generated */
-       EDG_WLL_QUERY_ATTR_SOURCE,      /**< Source component */
-       EDG_WLL_QUERY_ATTR_INSTANCE,    /**< Instance of the source component */
-       EDG_WLL_QUERY_ATTR_EVENT_TYPE,  /**< Event type \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_ATTR_CHKPT_TAG,   /**< Checkpoint tag */
-       EDG_WLL_QUERY_ATTR_RESUBMITTED, /**< Job was resubmitted */
-       EDG_WLL_QUERY_ATTR_PARENT,      /**< Job was resubmitted */
-       EDG_WLL_QUERY_ATTR_EXITCODE,    /**< Unix exit code */
-       EDG_WLL_QUERY_ATTR__LAST
-/*     if adding new attribute, add conversion string to common/xml_conversions.c too !! */
-} edg_wll_QueryAttr;
-
-
-/*!
- * Predefined types for query operands
- */
-typedef enum _edg_wll_QueryOp{
-       EDG_WLL_QUERY_OP_EQUAL,         /**< attribute is equal to the operand value \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_OP_LESS,          /**< attribute is grater than the operand value \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_OP_GREATER,       /**< attribute is less than the operand value \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_OP_WITHIN,        /**< attribute is in given interval \see _edg_wll_QueryRec */
-       EDG_WLL_QUERY_OP_UNEQUAL,       /**< attribute is not equal to the operand value \see _edg_wll_QueryRec */
-} edg_wll_QueryOp;
-
-
-/*!
- * Single query condition for edg_wll_Query().
- * Those records are composed to form an SQL \a where clause
- * when processed at the L&B server
- */
-typedef struct _edg_wll_QueryRec {
-       edg_wll_QueryAttr       attr;   /**< attribute to query */
-       edg_wll_QueryOp         op;     /**< query operation */
-
-/**
- * Specification of attribute to query
- */
-       union {
-               char *                  tag;    /**< user tag name */
-               edg_wll_JobStatCode     state;  /**< job status code */ 
-       } attr_id;
-/**
- * Query operand.
- * The appropriate type is uniquely defined by the attr member
- */
-       union edg_wll_QueryVal {
-               int     i;      /**< integer query attribute value */
-               char    *c;     /**< character query attribute value */
-               struct timeval  t;      /**< time query attribute value */
-               edg_wlc_JobId   j;      /**< JobId query attribute value */
-       } value, value2;
-} edg_wll_QueryRec;
-
-/************************************************
- * API FUNCTION DECLARATIONS                   *
- */
-
-
-#ifdef CLIENT_SBIN_PROG
-extern int edg_wll_http_send_recv(
-       edg_wll_Context,
-       char *, const char * const *, char *,
-       char **,char ***,char **
-);
-
-extern int http_check_status(
-       edg_wll_Context,
-       char *,
-       char **
-);
-
-extern int set_server_name_and_port(
-       edg_wll_Context,
-       const edg_wll_QueryRec **
-);
-
-#endif
-
-/**
- * \name Server querying
- *
- *@{
- */
-
-/**
- * General query on events.
- * Return events satysfying all conditions 
- * query records represent conditions in the form 
- * \a attr \a op \a value eg. time > 87654321.
- * \see edg_wll_QueryRec
- *
- * \param context IN: context to work with
- * \param job_conditions IN: query conditions (ANDed) on current job status, null (i.e. ATTR_UNDEF) terminated list. NULL means empty list, i.e. always TRUE
- * \param event_conditions: conditions on events, null terminated list, NULL means empty list, i.e. always TRUE
- * \param events OUT: list of matching events
- */
-int edg_wll_QueryEvents(
-       edg_wll_Context                 context,
-       const edg_wll_QueryRec *        job_conditions,
-       const edg_wll_QueryRec *        event_conditions,
-       edg_wll_Event **                events
-);
-
-int edg_wll_QueryEventsExt(
-       edg_wll_Context                 context,
-       const edg_wll_QueryRec **       job_conditions,
-       const edg_wll_QueryRec **       event_conditions,
-       edg_wll_Event **                events
-);
-
-/** 
- * General query on jobs.
- * Return jobs (and possibly their states) for which an event satisfying the conditions
- * exists.
- * \see edg_wll_QueryEvents
- * \param context IN: context to work with
- * \param conditions IN: query records (ANDed), null (i.e. EDG_WLL_ATTR_UNDEF) terminated list
- * \param flags IN: additional status fields to retrieve (\see edg_wll_JobStatus)
- * \param jobs OUT: list of job ids. May be NULL.
- * \param states OUT: list of corresponding states (returned only if not NULL)
- */
-int edg_wll_QueryJobs(
-       edg_wll_Context                 context,
-       const edg_wll_QueryRec *        conditions,
-       int                             flags,
-       edg_wlc_JobId **                jobs,
-       edg_wll_JobStat **              states
-);
-
-int edg_wll_QueryJobsExt(
-       edg_wll_Context                 context,
-       const edg_wll_QueryRec **       conditions,
-       int                             flags,
-       edg_wlc_JobId **                jobs,
-       edg_wll_JobStat **              states
-);
-
-/**
- * Bitmasks for edg_wll_JobStatus() flags argument.
- * Settings these flags causes the status calls to retrieve additional
- * information.
- */
-#define EDG_WLL_STAT_CLASSADS  1       /**< various job description fields */
-#define EDG_WLL_STAT_CHILDREN  2       /**< list of subjob JobId's */
-#define EDG_WLL_STAT_CHILDSTAT 4       /**< apply the flags recursively to subjobs */
-/* starting from bit 10 private flags begins - do not add 1024 and more! */
-
-/** Return status of a single job.
- * \param context IN: context to operate on
- * \param jobid IN: query this job
- * \param flags IN: specifies optional status fields to retrieve,
- *     \see EDG_WLL_STAT_CLASSADS, EDG_WLL_STAT_CHILDREN, EDG_WLL_STAT_CHILDSTAT
- */
-
-int edg_wll_JobStatus(
-       edg_wll_Context         context,
-       const edg_wlc_JobId             jobid,
-       int                     flags,
-       edg_wll_JobStat         *status
-);
-
-/**
- * Return all events related to a single job.
- * Convenience wrapper around edg_wll_Query()
- * \param context IN: context to work with
- * \param jobId IN: job to query
- * \param events OUT: list of events 
- */
-
-int edg_wll_JobLog(
-       edg_wll_Context         context,
-       const edg_wlc_JobId     jobId,
-       edg_wll_Event **        events
-);
-
-/**
- * All current user's jobs.
- * \param context IN: context to work with
- * \param jobs OUT: list of the user's jobs
- * \param states OUT: list of the jobs' states
- */
-int edg_wll_UserJobs(
-       edg_wll_Context         context,
-       edg_wlc_JobId **        jobs,
-       edg_wll_JobStat **      states
-);
-
-/**
- * Server supported indexed attributes
- * \see DataGrid-01-TEN-0125
- * \param context IN: context to work with
- * \param attrs OUT: configured indices (each index is an UNDEF-terminated
- *             array of QueryRec's from which only attr (and attr_id 
- *             eventually) are meaningful
- */
-int edg_wll_GetIndexedAttrs(
-       edg_wll_Context         context,
-       edg_wll_QueryRec        ***attrs
-);
-
-/**
- * Retrieve limit on query result size (no. of events or jobs).
- * FIXME: not implemented.
- * \see DataGrid-01-TEN-0125
- * \param context IN: context to work with
- * \param limit OUT: server imposed limit
- */
-int edg_wll_GetServerLimit(
-       edg_wll_Context context,
-       int             *limit
-);
-
-/**
- * UI port for the job
- * \param context IN: context to work with
- * \param jobId IN: job to query
- * \param name IN: name of the UI-port
- * \param host OUT: hostname of port
- * \param port OUT: port number
- */
-int edg_wll_QueryListener(
-       edg_wll_Context context,
-       edg_wlc_JobId           jobId,
-       const char *    name,
-       char **         host,
-       uint16_t *      port
-);
-
-/*@}*/
-
-/*
- * edg_wll_QueryRec manipulation
- */
-
-/** Free edg_wll_QueryRec internals, not the structure itself */
-void edg_wll_QueryRecFree(edg_wll_QueryRec *);
-
-/**
- * default and maximal query timeout (in seconds)
- */
-#define EDG_WLL_QUERY_TIMEOUT_DEFAULT   120
-#define EDG_WLL_QUERY_TIMEOUT_MAX       1800
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_CONSUMER_H__ */
diff --git a/org.glite.lb.client-interface/interface/context.h b/org.glite.lb.client-interface/interface/context.h

deleted file mode 100644 (file)

index bbca14f..0000000
--- a/org.glite.lb.client-interface/interface/context.h
+++ /dev/null
@@ -1,214 +0,0 @@
-#ifndef _EDG_WORKLOAD_LOGGING_CLIENT_CONTEXT_H
-#define _EDG_WORKLOAD_LOGGING_CLIENT_CONTEXT_H
-
-/**
- * \file edg/workload/logging/client/context.h
- * \brief L&B API common context (publicly visible) and related definitions
- */
-
-#include "glite/wmsutils/exception/exception_codes.h"
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#ident "$Header$"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Opaque context type */
-typedef struct _edg_wll_Context *edg_wll_Context;
-
-/** Constants defining the context parameters */
-typedef enum _edg_wll_ContextParam {
-       EDG_WLL_PARAM_HOST,             /**< hostname to appear as event orgin */
-       EDG_WLL_PARAM_SOURCE,           /**< event source component */
-       EDG_WLL_PARAM_INSTANCE,         /**< instance of the source component */
-       EDG_WLL_PARAM_LEVEL,            /**< logging level */
-       EDG_WLL_PARAM_DESTINATION,      /**< logging destination host */
-       EDG_WLL_PARAM_DESTINATION_PORT, /**< logging destination port */
-       EDG_WLL_PARAM_LOG_TIMEOUT,      /**< logging timeout (asynchronous) */
-       EDG_WLL_PARAM_LOG_SYNC_TIMEOUT, /**< logging timeout (synchronous) */
-       EDG_WLL_PARAM_QUERY_SERVER,     /**< default server name to query */
-       EDG_WLL_PARAM_QUERY_SERVER_PORT,/**< default server port to query */
-       EDG_WLL_PARAM_QUERY_SERVER_OVERRIDE,/**< host:port parameter setting override even values in jobid (useful for debugging & hacking only) */
-       EDG_WLL_PARAM_QUERY_TIMEOUT,    /**< query timeout */
-       EDG_WLL_PARAM_QUERY_JOBS_LIMIT, /**< maximal query jobs result size */
-       EDG_WLL_PARAM_QUERY_EVENTS_LIMIT,/**< maximal query events result size */
-       EDG_WLL_PARAM_QUERY_RESULTS,    /**< maximal query result size */
-       EDG_WLL_PARAM_QUERY_CONNECTIONS,/**< maximal number of open connections in ctx->connPoll */
-       EDG_WLL_PARAM_NOTIF_SERVER,     /**< default notification server name */
-       EDG_WLL_PARAM_NOTIF_SERVER_PORT,/**< default notification server port */
-       EDG_WLL_PARAM_NOTIF_TIMEOUT,    /**< notif timeout */
-       EDG_WLL_PARAM_X509_PROXY,       /**< proxy file to use for authentication */
-       EDG_WLL_PARAM_X509_KEY,         /**< key file to use for authentication */
-       EDG_WLL_PARAM_X509_CERT,        /**< certificate file to use for authentication */
-       EDG_WLL_PARAM__LAST,            /**< marker, LB internal use only */
-} edg_wll_ContextParam;
-
-/** sets returned query results */
-typedef enum _edg_wll_QueryResults {
-       EDG_WLL_QUERYRES_UNDEF,         /* uninitialized value */
-       EDG_WLL_QUERYRES_NONE,
-       EDG_WLL_QUERYRES_ALL,
-       EDG_WLL_QUERYRES_LIMITED,
-       EDG_WLL_QUERYRES__LAST          /* marker, for internal use only */
-} edg_wll_QueryResults;
-
-/** identification of logging component */
-typedef enum _edg_wll_Source {
-       EDG_WLL_SOURCE_NONE,            /* uninitialized value */
-       EDG_WLL_SOURCE_USER_INTERFACE,
-       EDG_WLL_SOURCE_NETWORK_SERVER,
-       EDG_WLL_SOURCE_WORKLOAD_MANAGER,
-       EDG_WLL_SOURCE_BIG_HELPER,
-       EDG_WLL_SOURCE_JOB_SUBMISSION,
-       EDG_WLL_SOURCE_LOG_MONITOR,
-       EDG_WLL_SOURCE_LRMS,
-       EDG_WLL_SOURCE_APPLICATION,
-       EDG_WLL_SOURCE__LAST            /* marker, for internal use only */
-} edg_wll_Source;
-
-
-/** Allocate an initialize a new context object.
- * \param context OUT returned context
- * \return 0 on success, ENOMEM if malloc() fails
- */
-int edg_wll_InitContext(edg_wll_Context *context);
-
-/** Destroy and free context object.
- * Also performs necessary cleanup (closing connections etc.)
- * \param context IN context to free
- */
-void edg_wll_FreeContext(edg_wll_Context context);
-
-/** Set a context parameter.
- * \param context INOUT context to work with
- * \param param IN parameter to set
- * \param ... IN value to set (if NULL or 0, default is used)
- * \retval 0 success
- * \retval EINVAL param is not a valid parameter, or invalid value
- */
-int edg_wll_SetParam(
-       edg_wll_Context context,
-       edg_wll_ContextParam param,
-       ...
-);
-
-struct timeval;        /* gcc, shut up! */
-
-int edg_wll_SetParamInt(edg_wll_Context,edg_wll_ContextParam,int);
-int edg_wll_SetParamString(edg_wll_Context,edg_wll_ContextParam,const char *);
-int edg_wll_SetParamTime(edg_wll_Context,edg_wll_ContextParam,const struct timeval *);
-
-/** Get current parameter value.
- * \param context INOUT context to work with
- * \param param IN parameter to retrieve
- * \param ... OUT pointer to output variable
- * \retval 0 success
- * \retval EINVAL param is not a valid parameter
- */
-int edg_wll_GetParam(
-       edg_wll_Context context,
-       edg_wll_ContextParam param,
-       ...
-);
-
-
-/**
- * L&B subsystem specific error codes.
- * Besides them L&B functions return standard \a errno codes in their usual
- * meaning.
- */
-
-/* XXX: cleanup required */
-
-typedef enum _edg_wll_ErrorCode {
-/** Base for L&B specific code. Use the constant from common/ */
-       EDG_WLL_ERROR_BASE = GLITE_WMS_LOGGING_ERROR_BASE,
-       EDG_WLL_ERROR_PARSE_BROKEN_ULM, /**< Parsing ULM line into edg_wll_Event structure */
-       EDG_WLL_ERROR_PARSE_EVENT_UNDEF, /**< Undefined event name */
-       EDG_WLL_ERROR_PARSE_MSG_INCOMPLETE, /**< Incomplete message (missing fields) */
-       EDG_WLL_ERROR_PARSE_KEY_DUPLICITY, /**< Duplicate entry in message */
-       EDG_WLL_ERROR_PARSE_KEY_MISUSE, /**< Entry not allowed for this message type */
-       EDG_WLL_ERROR_PARSE_OK_WITH_EXTRA_FIELDS, /**< Additional, not understood fields found in message.
-               The rest is OK therefore this is not a true error. */
-        EDG_WLL_ERROR_XML_PARSE, /**< Error in parsing XML protocol. */
-        EDG_WLL_ERROR_SERVER_RESPONSE, /**< Generic failure on server. See syslog on the server machine for details. */
-        EDG_WLL_ERROR_JOBID_FORMAT, /**< Malformed jobid */
-       EDG_WLL_ERROR_DB_CALL, /**< Failure of underlying database engine.
-               See errDesc returned by edg_wll_ErrorCode(). */
-       EDG_WLL_ERROR_URL_FORMAT, /**< Malformed URL */
-       EDG_WLL_ERROR_MD5_CLASH, /**< MD5 hash same for different strings. Very unlikely :-). */
-       EDG_WLL_ERROR_GSS, /**< Generic GSSAPI error. See errDesc returned by edg_wll_Error(). */
-       EDG_WLL_ERROR_NOJOBID,  /**< Attmepted call requires calling edg_wll_SetLoggingJob() first. */
-       EDG_WLL_ERROR_NOINDEX,  /**< Query does not contain any conidion on indexed attribute. */
-       EDG_WLL_IL_PROTO,       /**< Interlogger to lbserver communication protocol error. */
-       EDG_WLL_IL_SYS,         /**< Interlogger internal error. */
-       EDG_WLL_IL_EVENTS_WAITING, /**< Interlogger still has events pending delivery. */
-       EDG_WLL_ERROR_DNS, /**< DNS resolver error. See errDesc returned by edg_wll_Error(). */
-} edg_wll_ErrorCode;
-
-/**
- * Retrieve error details on recent API call
- * \param context IN: context to work with
- * \param errText OUT: standard error text
- *      (may be NULL - no text returned)
- * \param errDesc OUT: additional error description
- *      (may be NULL - no text returned)
- * \return Error code of the recent error
- */
-
-int edg_wll_Error(
-       edg_wll_Context context,
-       char            **errText,
-       char            **eddDesc
-);
-
-/** Convert source code to printable string 
- */
-char * edg_wll_SourceToString(edg_wll_Source src);
-
-/** Convert name to source code
- * \return Matching code or EDG_WLL_SOURCE_NONE
- */
-edg_wll_Source edg_wll_StringToSource(const char *name);
-
-/** Convert Query result code to printable string 
- */
-char * edg_wll_QResultToString(edg_wll_QueryResults res);
-
-/** Convert name to Query result code
- * \return Matching code or EDG_WLL_SOURCE_NONE
- */
-edg_wll_QueryResults edg_wll_StringToQResult(const char *name);
-
-/**
- * type of sequence code (used when setting to the context)
- */
-#define EDG_WLL_SEQ_NORMAL      1
-#define EDG_WLL_SEQ_DUPLICATE   11
-
-/**
- * initial sequence code for BigHelper
- */
-
-#define EDG_WLL_SEQ_BIGHELPER_INITIAL "UI=2:NS=0:WM=0:BH=1:JSS=0:LM=0:LRMS=0:APP=0"
-
-/** Retrieve current sequence code from the context */
-char * edg_wll_GetSequenceCode(
-       const edg_wll_Context   context
-);
-
-/**
- * retrieve the current logging JobId from the context
- */
-int edg_wll_GetLoggingJob(
-       const edg_wll_Context   context,
-       edg_wlc_JobId   *jobid_out
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif 
diff --git a/org.glite.lb.client-interface/interface/dump.h b/org.glite.lb.client-interface/interface/dump.h

deleted file mode 100644 (file)

index 37f9dd7..0000000
--- a/org.glite.lb.client-interface/interface/dump.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_DUMP_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_DUMP_H__
-
-#ident "$Header$"
-
-#define EDG_WLL_DUMP_NOW       -1
-#define EDG_WLL_DUMP_LAST_START        -2
-#define EDG_WLL_DUMP_LAST_END  -3
-/*      if adding new attribute, add conversion string to common/xml_conversions.c too !! */
-
-typedef struct {
-       time_t  from,to;
-} edg_wll_DumpRequest;
-
-typedef struct {
-       char    *server_file;
-       time_t  from,to;
-} edg_wll_DumpResult;
-
-/** Dump events in a given time interval
- */
-
-int edg_wll_DumpEvents(
-       edg_wll_Context,
-       const edg_wll_DumpRequest *,
-       edg_wll_DumpResult *
-);
-
-
-#endif
-
diff --git a/org.glite.lb.client-interface/interface/events.h.T b/org.glite.lb.client-interface/interface/events.h.T

deleted file mode 100644 (file)

index e37be1f..0000000
--- a/org.glite.lb.client-interface/interface/events.h.T
+++ /dev/null
@@ -1,332 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_EVENTS_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_EVENTS_H__
-
-/**
- * \file edg/workload/logging/client/events.h
- * \brief contains definition of event type codes for use both by lbapi.h and dglog.h
- */
-
-#ident "$Header$"
-/*
-@@@AUTO
-*/
-@@@LANG: C
-
-#include <sys/time.h>
-#include <inttypes.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/context.h"
-#include "glite/lb/notifid.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * Predefined type for ULM string 
- */
-typedef char *edg_wll_LogLine;
-
-
-/**
- * \typedef edg_wll_EventCode
- * Predefined event types 
- */
-typedef enum _edg_wll_EventCode {
-/** invalid code, e.g. uninitialized variable */
-        EDG_WLL_EVENT_UNDEF = 0,
-@@@{
-for my $e (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $u = uc $e;
-       my $c = getTypeComment $event $e;
-       gen "\tEDG_WLL_EVENT_$u,\t/**< $c */\n";
-}
-@@@}
-        EDG_WLL_EVENT__LAST,   /**< last currently supported event code */
-} edg_wll_EventCode;
-
-/**
- * \fn edg_wll_EventCode edg_wll_StringToEvent(char *name)
- * \param name         a string event name (e.g. "JobTransfer")
- * \return corresponding numeric code (edg_wll_EventCode)
- * \brief convert a string event name to the corresponding numeric code
- */
-
-extern edg_wll_EventCode edg_wll_StringToEvent(char *);
-
-/**
- * \fn char *edg_wll_EventToString(edg_wll_EventCode event)
- * \param event                an event numeric code (edg_wll_EventCode)
- * \return corresponding string (e.g. "JobTransfer")
- * \brief convert an event numeric code to the corresponding string
- */
-
-extern char *edg_wll_EventToString(edg_wll_EventCode);
-
-
-/**
- * \typedef edg_wll_KeyNameCode
- * Predefined ULM key types
- */
-typedef enum _edg_wll_KeyNameCode {
-       UNDEFINED,              /**< undefined */
-       EDG_WLL_EVNT,           /**< event type */
-@@@{
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = getName $f 'ULM';
-       my $fnu = uc $fn;
-       my $c = $f->{comment};
-       if (hasAlias $f 'ULM') {
-               gen "\tULM\_$fnu,\t\t/**< $c */\n";
-       } else {
-               gen "\tEDG_WLL\_COMMON\_$fnu,\t\t/**< $c */\n";
-       }
-}
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fnu = uc $f->{name};
-               my $c = $f->{comment};
-               gen "\tEDG_WLL\_$tu\_$fnu,\t/**< $c */\n";
-       }
-}
-@@@}
-       EDG_WLL_INTERNAL_TYPE,          /**< internal message type */
-} edg_wll_KeyNameCode;
-
-/**
- * \fn edg_wll_KeyNameCode edg_wll_StringToKeyName(char *name)
- * \param name         a string ULM key name (e.g. "DG.JOB.TRANSFER.DEST")
- * \return corresponding numeric code (edg_wll_KeyNameCode)
- * \brief convert a string ULM key name to the corresponding numeric code
- */
-
-extern edg_wll_KeyNameCode edg_wll_StringToKeyName(char *);
-
-/**
- * \fn char *edg_wll_KeyNameToString(edg_wll_KeyNameCode key)
- * \param key          a ULM key name numeric code (edg_wll_KeyNameCode)
- * \return corresponding string (e.g. "DG.JOB.TRANSFER.DEST")
- * \brief convert a ULM key name numeric code to the corresponding string
- */
-
-extern char *edg_wll_KeyNameToString(edg_wll_KeyNameCode);
-
-
-/**
- * Predefined _code_ types and
- * related StringTo_code and _code_ToString function prototypes
- */
-@@@{
-$indent = "\t";
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       if ($f->{codes}) {
-               my $fn = ucfirst($f->{name});
-               my $fnu = uc $fn;
-               my $c = "${fn}"; # new code
-               my $enum = "enum edg_wll\_$c"; # new enum name
-
-# enum
-               gen qq{
-/**
- * \\enum $enum
- * $fn codes 
- */
-$enum \{
-};
-               gen $indent."EDG_WLL_${fnu}_UNDEFINED,\t/**< undefined code */ \n";
-               for (@{$f->{codes}}) {
-                       gen $indent."EDG_WLL_${fnu}_$_->{name},\t/**< $_->{comment} */ \n";
-               }
-               gen "};\n";
-
-# function StringTo:
-               gen qq{
-/**
- * \\fn $enum edg_wll_StringTo${c}(char *name);
- * \\param name                a string representing $fn code (e.g. \"${$f->{codes}}[1]->{name}\")
- * \\return corresponding numeric code ($enum)
- * \\brief converts a string $fn code to corresponding numeric code
- */
-extern $enum edg_wll_StringTo${c}(char *name);
-};
-
-# function ToString:
-               gen qq{
-/**
- * \\fn char *edg_wll\_${c}ToString($enum code);
- * \\param code                a $fn numeric code ($enum)
- * \\return corresponding string (e.g. \"${$f->{codes}}[1]->{name}\")
- * \\brief converts a $fn numeric code to corresponding string
- */
-extern char *edg_wll\_${c}ToString($enum code);
-\n};
-       }
-}
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t . '_';
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               if ($f->{codes}) {
-                       my $fn = ucfirst($f->{name});
-                       my $c = "$t${fn}"; # new code
-                       my $enum = "enum edg_wll\_$c"; # new enum name
-
-# enum
-                       gen qq{
-/**
- * \\enum $enum
- * $fn codes of the $t event
- */
-$enum \{
-};
-                       gen $indent."EDG_WLL_${tu}UNDEFINED,\t/**< undefined code */ \n";
-                       for (@{$f->{codes}}) {
-                               gen $indent."EDG_WLL_$tu$_->{name},\t/**< $_->{comment} */ \n";
-                       }
-                       gen "};\n";
-
-# function StringTo:
-                       gen qq{
-/**
- * \\fn $enum edg_wll_StringTo${c}(char *name);
- * \\param name                a string representing $t $fn code (e.g. \"${$f->{codes}}[1]->{name}\")
- * \\return corresponding numeric code ($enum)
- * \\brief converts a string $t $fn code to corresponding numeric code
- */
-extern $enum edg_wll_StringTo${c}(char *name);
-};
-
-# function ToString:
-                       gen qq{
-/**
- * \\fn char *edg_wll\_${c}ToString($enum code);
- * \\param code                a $t $fn numeric code ($enum)
- * \\return corresponding string (e.g. \"${$f->{codes}}[1]->{name}\")
- * \\brief converts a $t $fn numeric code to corresponding string
- */
-extern char *edg_wll\_${c}ToString($enum code);
-\n};
-               }
-       }
-}
-@@@}
-
-
-/**
- * common fields of all event types: 
- */
-
-@@@{
-$indent = "\t";
-gen "#define _EDG_WLL_EVENT_COMMON \\\n";
-gen $indent."edg_wll_EventCode\t\ttype;\\\n";
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = $f->{name};
-       my $tn = $f->getType;
-       gen $indent."$tn\t\t$fn;\t\\\n";
-}
-gen "\n";
-@@@}
-
-typedef struct _edg_wll_AnyEvent {
-_EDG_WLL_EVENT_COMMON
-} edg_wll_AnyEvent;
-
-
-/**
- *  Event types specific structures: 
- */
-@@@{
-$indent = "\t";
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $s = "edg_wll_${t}Event";
-# typedef struct
-       gen qq{
-/**
-* \\typedef $s
-* structure definition for $t event 
-*/
-typedef struct \_$s \{
-_EDG_WLL_EVENT_COMMON
-};
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $fnu = ucfirst $fn;
-               my $c = $f->{comment};
-               my $tn;
-               if ($f->{codes}) {
-                       $tn = "enum edg_wll\_$t${fnu}";
-               } else {
-                       $tn = $f->getType;
-               }
-               gen $indent."$tn\t$fn;\t/**< $c */\n";
-       }
-       gen "\} $s;\n";
-}
-@@@}
-
-#undef _EDG_WLL_EVENT_COMMON
-
-
-/**
- * \union edg_wll_Event
- * \brief All event types union
- */
-typedef union _edg_wll_Event {
-        edg_wll_EventCode           type; /* it is probably never used */
-        edg_wll_AnyEvent            any;
-@@@{
-$indent = "\t";
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tl = lcfirst $t;
-       gen $indent."edg_wll_${t}Event\t${tl};\n";
-}
-@@@}
-} edg_wll_Event;
-
-
-/**
- * Initialise an event structure
- * \return pointer to initialised event structure
- */
-extern edg_wll_Event *edg_wll_InitEvent(edg_wll_EventCode eventcode);
-
-
-/**
- * Free the contents of event structure
- * \param IN event structure to be freed
- * \warning As event structures are likely to be allocated in arrays,
- *      the structure itself is not freed.
- *      Its the responsibility of the caller to call free(event)
- *      if appropriate.
- */
-void edg_wll_FreeEvent(
-       edg_wll_Event * event
-);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_EVENTS_H__ */
diff --git a/org.glite.lb.client-interface/interface/jobstat.h.T b/org.glite.lb.client-interface/interface/jobstat.h.T

deleted file mode 100644 (file)

index 129b61d..0000000
--- a/org.glite.lb.client-interface/interface/jobstat.h.T
+++ /dev/null
@@ -1,141 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTAT_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTAT_H__
-
-/* 
-@@@AUTO
-*/
-
-/*!
- * \file client/jobstat.h  
- * \brief edg_wll_JobStat definition and related stuff
- */
-
-#ident "$Header$"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * Miscelaneous job status numeric codes
- */
-
-@@@{
-       for my $n ($status->getAllFieldsOrdered) {
-# XXX: we've got only _common_ in jobStatus, no clash possible
-               my $f = selectField $status $n;
-               if ($f->{codes}) {
-                       my $n = ucfirst getName $f;
-                       gen qq{
-!enum edg_wll_Stat$n \{
-};
-                       for (@{$f->{codes}}) {
-                               my $uc = uc $_->{name};
-                               gen qq{
-!      EDG_WLL_STAT_$uc,       /**< $_->{comment} */
-};
-                       }
-                       gen qq{
-!\};
-};
-               }
-       }
-@@@}
-
-
-/*!
- *
- * Job status numeric code
- */
-
-typedef enum _edg_wll_JobStatCode {
-/** Indicates invalid edg_wll_JobStat structure */
-       EDG_WLL_JOB_UNDEF = 0,
-@@@{
-       for my $stat ($status->getTypesOrdered) {
-               my $u = uc $stat;
-               my $c = getTypeComment $status $stat;
-               gen qq{
-!      EDG_WLL_JOB_$u, /**< $c */
-};
-       }
-@@@}
-       EDG_WLL_NUMBER_OF_STATCODES /**< Number of meaningful status codes */
-} edg_wll_JobStatCode;
-
-/*!
- *
- * Pair tag = value.
- */
-typedef struct _edg_wll_TagValue {
-        char *  tag;    /**< User-specified information tag */
-        char *  value;  /**< Value assigned to user-specified information tag */
-} edg_wll_TagValue;
-
-
-/*!
- *
- * Description of the job status.
- * Returned by the edg_wll_JobStatus() function
- */
-typedef struct _edg_wll_JobStat {
-       edg_wll_JobStatCode     state;          /**< status code */
-@@@{
-       for my $n (getAllFieldsOrdered $status) {
-               selectField $status $n;
-               my $f = getField $status;
-               my $type = getType $f;
-               my $name = getName $f;
-               my $fucname = ucfirst $name;
-               $type = "enum edg_wll_Stat$fucname" if $f->{codes};
-               my $comment = getComment $f;
-               gen qq{
-!      $type   $name;  /**< $comment */
-};
-       }
-@@@}
-
-} edg_wll_JobStat;
-
-/**
- * \name edg_wll_JobStat manipulation
- */
-
-/*@{*/
-
-/**
- * Initialize empty status structure.
- * Fills in the stucture with NULL's or values with no meaning
- */
- 
-extern int edg_wll_InitStatus(edg_wll_JobStat *);
-
-/**
- * Initialize dest structure and copy source status to this destination
- */
- 
-extern edg_wll_JobStat *edg_wll_CpyStatus(const edg_wll_JobStat *,edg_wll_JobStat *);
-
-/** 
- * Free status structure contents.
- * \warning The structure itself is not freed.
- */
-extern void edg_wll_FreeStatus(edg_wll_JobStat *);
-
-/**
- * Convert string job status to numeric code.
- */
-extern edg_wll_JobStatCode edg_wll_StringToStat(const char *);
-
-/** 
- * Convert numeric job status code to string representation
- */
-extern char *edg_wll_StatToString(edg_wll_JobStatCode);
-
-/*@}*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_JOBSTAT_H__ */
diff --git a/org.glite.lb.client-interface/interface/load.h b/org.glite.lb.client-interface/interface/load.h

deleted file mode 100644 (file)

index 5ca8ead..0000000
--- a/org.glite.lb.client-interface/interface/load.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_LOAD_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_LOAD_H__
-
-#ident "$Header$"
-
-typedef struct {
-       char    *server_file;
-} edg_wll_LoadRequest;
-
-typedef struct {
-       char    *server_file;
-       time_t  from,to;
-} edg_wll_LoadResult;
-
-/** Load events from a given file into the database
- * \retval EPERM       operation not permitted
- * \retval ENOENT      file not found
- */
-
-int edg_wll_LoadEvents(
-       edg_wll_Context,
-       const edg_wll_LoadRequest *,
-       edg_wll_LoadResult *
-);
-
-#endif
-
diff --git a/org.glite.lb.client-interface/interface/notification.h b/org.glite.lb.client-interface/interface/notification.h

deleted file mode 100644 (file)

index a16215d..0000000
--- a/org.glite.lb.client-interface/interface/notification.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_NOTIFICATION_H__
-
-#ident "$Header$"
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/notifid.h"
-#include "glite/lb/context.h"
-#include "glite/lb/consumer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * default and maximal notif timeout (in seconds)
- */
-#define EDG_WLL_NOTIF_TIMEOUT_DEFAULT   120
-#define EDG_WLL_NOTIF_TIMEOUT_MAX       1800
-
-
-/** Register for receiving notifications.
- * Connects to the server specified by EDG_WLL_NOTIF_SERVER context parameter
- * (temporary workaround, should be resolved by registry in future).
- * \param conditions: the same conditions as for \see edg_wll_QueryJobsExt.
- *             currently one or more JOBID's are required.
- *             Only a single occurence of a specific attribute is allowed
- *             among ANDed conditions (due to the ability to modify them
- *             further).
- * \param fd = -1 create or reuse the default listening socket (one per context)
- *          >= 0 non-default listening socket 
- * \param address_override if not NULL, use this address instead of extracting it
- *             from the connection (useful when multiple interfaces are present,
- *             circumventing NAT problems etc.)
- * \param valid until when the registration is valid (NULL means no interest in
- *             the value
- * \retval 0 OK
- * \retval EINVAL restrictions on conditions are not met
- * 
- */
-int edg_wll_NotifNew(
-       edg_wll_Context         context,
-       edg_wll_QueryRec        const * const *conditions,
-       int                     fd,
-       const char              *address_override,
-       edg_wll_NotifId         *id_out,
-       time_t                  *valid
-);
-
-
-/** Change the receiving local address.
- * Report the new address to the server.
- *
- * \param fd 
- * \param address_override 
- * \param valid all same as for \see edg_wll_NotifNew
- */
-
-int edg_wll_NotifBind(
-       edg_wll_Context         context,
-       const edg_wll_NotifId   id,
-       int                     fd,
-       const char              *address_override,
-       time_t                  *valid
-);
-
-typedef enum _edg_wll_NotifChangeOp {
-       EDG_WLL_NOTIF_NOOP = 0,
-       EDG_WLL_NOTIF_REPLACE,
-       EDG_WLL_NOTIF_ADD,
-       EDG_WLL_NOTIF_REMOVE
-/*      if adding new attribute, add conversion string to common/xml_conversions.c too !! */
-} edg_wll_NotifChangeOp;
-
-/** Modify the query conditions for this notification.
- *
- * If op is either EDG_WLL_NOTIF_ADD or EDG_WLL_NOTIF_REMOVE, for the sake
- * of uniqueness the original conditions must have contained only a single
- * OR-ed row of conditions on the attributes infolved in the change.
- * 
- * \param op action to be taken on existing conditions,
- *     \see edg_wll_NotifChangeOp
- */
-int edg_wll_NotifChange(
-       edg_wll_Context         context,
-       const edg_wll_NotifId   id,
-       edg_wll_QueryRec        const * const * conditions,
-       edg_wll_NotifChangeOp   op
-);
-
-/** Refresh the registration, i.e. extend its validity period.
- * \param valid until when the registration is valid (NULL means no interest in
- *             the value
- */
-
-int edg_wll_NotifRefresh(
-       edg_wll_Context         context,
-       const edg_wll_NotifId   id,
-       time_t                  *valid
-);
-
-/** Drop the registration.
- * Server is instructed not to send notifications anymore, pending ones
- * are discarded, listening socket is closed, and allocated memory freed.
- */
-
-int edg_wll_NotifDrop(
-       edg_wll_Context         context,
-       edg_wll_NotifId         *id
-);
-
-/** Receive notification.
- * The first incoming notification is returned.
- * \param fd receive on this socket (-1 means the default for the context)
- * \param timeout wait atmost this time long. (0,0) means polling, NULL waiting
- *     indefinitely
- *     
- * \retval 0 notification received, state_out contains the current job state
- * \retval EAGAIN no notification available, timeout occured
- */
-
-int edg_wll_NotifReceive(
-       edg_wll_Context         context,
-       int                     fd,
-       const struct timeval    *timeout,
-       edg_wll_JobStat         *state_out,
-       edg_wll_NotifId         *id_out
-);
-
-
-/** Default socket descriptor where to select(2) for notifications.
- * Even if nothing is available for reading freom the socket, 
- * there may be some data cached so calling \see edg_wll_NotifReceive
- * may return notifications immediately.
- *
- * \retval >=0 socket descriptor
- * \retval -1 error, details set in context
- */
-
-int edg_wll_NotifGetFd(
-       edg_wll_Context         context
-);
-
-/** Close the default local listening socket.
- * Useful to force following \see edg_wll_NotifBind to open
- * a new one.
- */
-
-int edg_wll_NotifCloseFd(
-       edg_wll_Context         context
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/org.glite.lb.client-interface/interface/notifid.h b/org.glite.lb.client-interface/interface/notifid.h

deleted file mode 100644 (file)

index fc52d01..0000000
--- a/org.glite.lb.client-interface/interface/notifid.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_NOTIFID_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_NOTIFID_H__
-
-#ident "$Header$"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Notification handle.
- * Refers to a particular registration for receiving notifications.
- */
-typedef void *edg_wll_NotifId;
-
-/** Parse and unparse the Id. */
-int edg_wll_NotifIdParse(const char *,edg_wll_NotifId *);
-char* edg_wll_NotifIdUnparse(const edg_wll_NotifId);
-
-int edg_wll_NotifIdCreate(const char *,int,edg_wll_NotifId *);
-void edg_wll_NotifIdFree(edg_wll_NotifId);
-
-void edg_wll_NotifIdGetServerParts(const edg_wll_NotifId, char **, unsigned int *);
-char *edg_wll_NotifIdGetUnique(const edg_wll_NotifId);
-int edg_wll_NotifIdSetUnique(edg_wll_NotifId *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/org.glite.lb.client-interface/interface/producer.h.T b/org.glite.lb.client-interface/interface/producer.h.T

deleted file mode 100644 (file)

index b00b7d9..0000000
--- a/org.glite.lb.client-interface/interface/producer.h.T
+++ /dev/null
@@ -1,385 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_PRODUCER_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_PRODUCER_H__
-
-/**
- * \file edg/workload/logging/client/producer.h
- * \brief client API for storing data into L&B service
- */
-
-#ident "$Header$"
-/*
-@@@AUTO
-*/
-@@@LANG: C
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "glite/lb/context.h"
-#include "glite/lb/events.h"
-
-/* Event sources: */
-
-#if 0 /* obsolete */
-#define EDG_WLL_SOURCE_UI           "UserInterface"
-#define EDG_WLL_SOURCE_RB           "ResourceBroker"
-#define EDG_WLL_SOURCE_JSS          "JobSubmissionService"  /* aka Condor-G */
-#define EDG_WLL_SOURCE_JOBMGR       "GlobusJobmanager"
-#define EDG_WLL_SOURCE_LRMS         "LocalResourceManager"
-#define EDG_WLL_SOURCE_APP          "Application"
-
-#define EDG_WLL_SOURCE_NS      "NetworkServer"
-#define EDG_WLL_SOURCE_WM      "WorkloadManager"
-#define EDG_WLL_SOURCE_BH      "BigHelper"
-#define EDG_WLL_SOURCE_LM      "LogMonitor"
-
-#endif
-
-/* Event formats: */
-
-#define EDG_WLL_FORMAT_COMMON  "DATE=%s HOST=\"%|Us\" PROG=edg-wms LVL=%s DG.PRIORITY=%d DG.SOURCE=\"%|Us\" DG.SRC_INSTANCE=\"%|Us\" DG.EVNT=\"%s\" DG.JOBID=\"%s\" DG.SEQCODE=\"%|Us\" "
-#define EDG_WLL_FORMAT_USER    "DG.USER=\"%|Us\" "
-@@@{
-# FIXME:
-# this is all functional, but doesn't fit to all common fields (eg. USER)
-#
-#gen "#define EDG_WLL_FORMAT_COMMON\t\"";
-#selectType $event '_common_';
-#for ($event->getFieldsOrdered) {
-#      my $f = selectField $event $_;
-#      my $fn = getName $f 'ULM';
-#      my $fnu = uc $fn;
-#      if (hasAlias $f 'ULM') {
-#              gen "$fnu=%s ";
-#      } else {
-#              gen "DG\.$fnu=";
-#                      gen $f->toFormatString;
-#                      gen " ";
-#      }
-#}
-#gen "\"\n";
-#
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       gen "#define EDG_WLL_FORMAT_$tu\t\"";
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $fnu = uc $fn;
-               gen "DG.$tu.$fnu=\\\"";
-               if ($f->{codes}) {
-                       gen "%s";
-               } else {
-                       gen $f->toFormatString;
-               }
-               gen "\\\" ";
-       }
-       gen "\"\n";
-}
-@@@}
-#define EDG_WLL_FORMAT_NOTIFICATION_COMMON     "DATE=%s HOST=\"%|Us\" PROG=edg-wms LVL=%s DG.SOURCE=\"%|Us\" DG.SRC_INSTANCE=\"%|Us\" DG.TYPE=\"notification\" "
-#define EDG_WLL_FORMAT_SYSCMPSTAT      "DG.SCHED.STATUS=\"%|Us\" "
-#define EDG_WLL_FORMAT_SYSCLSTAT       "DG.SCHED.NODE=\"%|Us\" DG.SCHED.STATUS=\"%|Us\" "
-
-
-/* edg_wll_LogEvent shortcuts */
-@@@{
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $a = "(edg_wll_Context context";
-       my $b = "(context,EDG_WLL_EVENT_$tu,EDG_WLL_FORMAT_$tu";
-       my $doc = qq{
- * \\param context\tcontext to work with,
-};
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $ft;
-                if ($f->{codes}) {
-#                        $ft = "enum edg_wll\_$t" . ucfirst $fn;
-                        $ft = "char *";
-                } else {
-                        $ft = $f->getType;
-                }
-               $ft = "const ".$ft;
-               my $fc = $f->getComment;
-               $a = $a . ", $ft $fn";
-               $b = $b . ", $fn";
-               $doc = $doc . " * \\param $fn\t$fc\n";
-       }
-       $a = $a . ")";
-       $b = $b . ")";
-       gen qq{
-/**
- * \\fn int edg_wll_Log$t$a; 
- * \\brief simple wrapper around edg_wll_LogEvent for event $t} . $doc . qq{ * \\see edg_wll_LogEvent\(\)
- */
-};
-       gen "\nextern int edg_wll_Log$t$a;\n\n";
-#      gen qq{
-#int edg_wll_Log$t$a
-#\{
-#      return edg_wll_LogEvent$b;
-#\}\n
-#};
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $ft;
-                if ($f->{codes}) {
-#                        $ft = "enum edg_wll\_$t" . ucfirst $fn;
-                        $ft = "char *";
-                } else {
-                        $ft = $f->getType;
-                }
-               my $ftreg = $ft;
-               $ftreg =~ s/\*/\\\*/g;
-               $ftreg = "const ".$ftreg;
-               my $fc = $f->getComment;
-               if ($f->{codes}) {
-                       for (@{$f->{codes}}) {
-                               my $code = uc $_->{name};
-                               my $c = $a;
-                               my $d = $b;
-                               my $e = $doc;
-                               $c =~ s/, $ftreg $fn//g;
-                               $d =~ s/$fn/"$code"/g;
-                               $e =~ s/ \* \\param $fn\t$fc\n//g;
-                               gen qq{
-/**
- * \\fn int edg_wll_Log$t$code$c; 
- * \\brief simple wrapper around edg_wll_LogEvent for event $t, $fn $code} . $e . qq{ * \\see edg_wll_LogEvent\(\)
- */
-};
-                               gen "\nextern int edg_wll_Log$t$code$c;\n\n";
-#                              gen qq{
-#int edg_wll_Log$t$code$c
-#\{
-#      return edg_wll_LogEvent$d;
-#\}\n
-#};
-                       }
-               }
-       }
-}
-@@@}
-
-
-/**
- * Formats a logging message and sends it asynchronously to local-logger
- * \brief generic asynchronous logging function
- * \param context      INOUT context to work with,
- * \param event                IN type of the event,
- * \param fmt          IN printf()-like format string,
- * \param ...          IN event specific values/data according to fmt,
- * \retval 0           successful completition,
- * \retval EINVAL      bad jobId, unknown event code, or the format string together with the remaining arguments does not form a valid event,
- * \retval ENOSPC      L&B infrastructure failed to accept the event due to lack of disk space etc.,
- * \retval ENOMEM      failed to allocate memory,
- * \retval ECONNREFUSED        cannot connect to the specified local logger,
- * \retval EAGAIN      non blocking return from the call, the event may or may not get logged,
- * \retval EDG_WLL_ERROR_NOJOBID logging call attempted without assigning jobId to the context.
- */
-extern int edg_wll_LogEvent(
-       edg_wll_Context context,
-       edg_wll_EventCode event,
-       char *fmt, ...);
-
-
-/**
- * Formats a logging message and sends it synchronously to local-logger
- * \brief generic synchronous logging function
- * \param context      INOUT context to work with,
- * \param event                IN type of the event,
- * \param fmt          IN printf()-like format string,
- * \param ...          IN event specific values/data according to fmt,
- * \retval 0           successful completition,
- * \retval EINVAL      bad jobId, unknown event code, or the format string together with the remaining arguments does not form a valid event,
- * \retval ENOSPC      L&B infrastructure failed to accept the event due to lack of disk space etc.,
- * \retval ENOMEM      failed to allocate memory,
- * \retval ECONNREFUSED        cannot connect to the specified local logger,
- * \retval EAGAIN      non blocking return from the call, the event may or may not get logged,
- * \retval EDG_WLL_ERROR_NOJOBID logging call attempted without assigning jobId to the context,
- * \retval EPERM       the user is not authorized to add events to this job,
- * \retval EDG_WLL_ERROR_DB_DUP_KEY exactly the same event has been already stored.
- */
-extern int edg_wll_LogEventSync(
-       edg_wll_Context context,
-       edg_wll_EventCode event,
-       char *fmt, ...);
-
-
-/**
- * Instructs interlogger to to deliver all pending events related to current job
- * \brief flush events from interlogger
- * \note sort of status query more than a command
- * \param context      INOUT context to work with,
- * \param timeout      INOUT wait at most this much time for completition, remaining time on return,
- * \retval 0           successful completition,
- * \retval EDG_WLL_ERROR_INTERLOG_TIMEOUT the inter-logger did not respond within the timeout,
- * \retval EDG_WLL_ERROR_INTERLOG_CONLOST inter-logger lost connection to one or more servers,
- * \retval EDG_WLL_ERROR_INTERLOG_AGAIN   not all pending events were delivered within the timeout.
- */
-extern int edg_wll_LogFlush(
-       edg_wll_Context context,
-       struct timeval *timeout);
-
-
-/**
- * Instructs interlogger to to deliver all pending events
- * \brief flush all events from interlogger
- * \note same as edg_wll_LogFlush() for all jobs known to interlogger
- * \see edg_wll_LogFlush()
- */
-extern int edg_wll_LogFlushAll(
-       edg_wll_Context context,
-       struct timeval *timeout);
-
-/**
- * Set a current job for given context.
- * \note Should be called before any logging call.
- * \param context INOUT context to work with
- * \param job IN further logging calls are related to this job
- * \param code IN sequence code as obtained from previous component
- * \param flags IN flags on code handling (\see API documentation)
- */
-extern int edg_wll_SetLoggingJob(
-       edg_wll_Context context,
-       const edg_wlc_JobId     job,
-       const char *            code,
-       int                     flags
-);
-
-
-/**
- * Register job with L&B service.
- * Done via logging REGJOB event, may generate subjob id's and create
- * the parent-children associations.
- * Set the job as current for the context and initialize sequence code.
- *
- * Partitionable jobs should set num_subjobs=0 initially,
- * and re-register when number of subjobs becomes known.
- *
- * \param type EDG_WLL_JOB_SIMPLE,  EDG_WLL_JOB_DAG, or EDG_WLL_JOB_PARTITIONABLE
- * \param jdl user-specified JDL
- * \param ns network server contact
- * \param num_subjobs number of subjobs to create
- * \param seed seed used for subjob id's generator.
- *     Use non-NULL value to be able to regenerate the set of jobid's
- * \param subjobs returned subjob id's
- */
-
-/* backward compatibility */
-#define EDG_WLL_JOB_SIMPLE     EDG_WLL_REGJOB_SIMPLE
- 
-extern int edg_wll_RegisterJob(
-       edg_wll_Context         context,
-       const edg_wlc_JobId     job,
-       enum edg_wll_RegJobJobtype      type,
-       const char *            jdl,
-       const char *            ns,
-       int                     num_subjobs,
-       const char *            seed,
-       edg_wlc_JobId **        subjobs
-);
-
-/** 
- * Synchronous variant of edg_wll_RegisterJob
- */
-
-extern int edg_wll_RegisterJobSync(
-       edg_wll_Context         context,
-       const edg_wlc_JobId     job,
-       enum edg_wll_RegJobJobtype      type,
-       const char *            jdl,
-       const char *            ns,
-       int                     num_subjobs,
-       const char *            seed,
-       edg_wlc_JobId **        subjobs
-);
-
-/**
- * Register subjobs in a batch.
- * Mainly used to provide JDL's of individual subjobs in a more efficient
- * way than logging them one by one.
- * \param jdls array of JDL's
- * \param subjobs      array of jobid's in the same order
- */
-
-extern int edg_wll_RegisterSubjobs(
-       edg_wll_Context         context,
-       const edg_wlc_JobId     parent,
-       char const * const *    jdls,
-       const char *            ns,
-       edg_wlc_JobId const *   subjobs
-);
-
-
-/**
- * Generate or regenerate set of subjob ID's.
- * Calls the same algorithm used to generate subjob ID's in edg_wll_RegisterJob().
- * Local semantics only, server is not contacted.
- */
-
-extern int edg_wll_GenerateSubjobIds(
-       edg_wll_Context         context,
-       const edg_wlc_JobId     parent,
-       int                     num_subjobs,
-       const char *            seed,
-       edg_wlc_JobId **        subjobs
-);
-
-
-enum edg_wll_Permission {
-       EDG_WLL_PERM_READ  = 1,
-       EDG_WLL_PERM_WRITE = 4,
-       EDG_WLL_PERM_ADMIN = 8,
-};
-
-enum edg_wll_PermissionType {
-       EDG_WLL_PERM_ALLOW,
-       EDG_WLL_PERM_DENY,
-};
-
-enum edg_wll_ACLOperation {
-       EDG_WLL_ACL_ADD,
-       EDG_WLL_ACL_REMOVE,
-};
-
-enum edg_wll_UserIdType {
-       EDG_WLL_USER_SUBJECT,           /* X.509 subject name */
-       EDG_WLL_USER_VOMS_GROUP,        /* VOMS group membership */
-};
-
-/**
- * Change ACL for given job.
- * \param specification of user's credential
- * \param user_id_type type of user_id,
- *    for EDG_WLL_USER_SUBJECT the user_id parameter is expected to be user's subject name
- *    for EDG_WLL_USER_VOMS_GROUP the user_id is expected to be of the form VO:group specifying required group membersip as managed by VOMS
- * \param permission ACL permission to change
- * \param permission_type type of given permission (allow or deny operation) 
- * \param operation operation to perform with ACL (add or remove record)
- */
- 
-extern int edg_wll_ChangeACL(
-       edg_wll_Context         context,
-       const edg_wlc_JobId     job,
-       const char *            user_id,
-       enum edg_wll_UserIdType user_id_type,
-       enum edg_wll_Permission         permission,
-       enum edg_wll_PermissionType     permission_type,
-       enum edg_wll_ACLOperation       operation
-);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_PRODUCER_H__ */
diff --git a/org.glite.lb.client-interface/interface/purge.h b/org.glite.lb.client-interface/interface/purge.h

deleted file mode 100644 (file)

index 531c903..0000000
--- a/org.glite.lb.client-interface/interface/purge.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_PURGE_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_PURGE_H__
-
-#ident "$Header$"
-
-/** Purge or dump request */
-typedef struct _edg_wll_PurgeRequest {
-       char    **jobs;         /**< list of jobid's to work on */ 
-
-/** Purge jobs that are in the given states and "untouched" at least for the
-  * specified interval.
-  * Currently applicable for CLEARED, ABORTED, CANCELLED and OTHER (catchall).
-  * The other array members are for future extensions.
-  * Negative values stand for server defaults.
-  */
-       time_t  timeout[EDG_WLL_NUMBER_OF_STATCODES];
-#define EDG_WLL_PURGE_JOBSTAT_OTHER    EDG_WLL_JOB_UNDEF
-
-
-/**
- * Actions to be taken and information required.
- */
-       int     flags;
-
-/** no dry run */
-#define EDG_WLL_PURGE_REALLY_PURGE     1
-/** return list of jobid matching the purge/dump criteria */
-#define EDG_WLL_PURGE_LIST_JOBS                2
-/** dump to a file on the sever */
-#define EDG_WLL_PURGE_SERVER_DUMP      4
-/** TODO: stream the dump info to the client */
-#define EDG_WLL_PURGE_CLIENT_DUMP      8
-/* ! when addning new constant, add it also to common/xml_conversions.c ! */
-
-       
-/** private request processing data (for the reentrant functions) */
-/* TODO */
-       
-} edg_wll_PurgeRequest;
-
-/** Output data of a purge or dump */
-typedef struct _edg_wll_PurgeResult {
-       char    *server_file;   /**< filename of the dump at the server */
-       char    **jobs;         /**< affected jobs */
-/* TODO: output of the streaming interface */
-} edg_wll_PurgeResult;
-
-
-/** Client side purge/dump 
- * \retval EAGAIN only partial result returned, call repeatedly to get all
- *     output data
- */
-int edg_wll_Purge(
-       edg_wll_Context ctx,
-       edg_wll_PurgeRequest *request,
-       edg_wll_PurgeResult     *result
-);
-
-#endif
diff --git a/org.glite.lb.client-interface/project/build.properties b/org.glite.lb.client-interface/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.lb.client-interface/project/configure.properties.xml b/org.glite.lb.client-interface/project/configure.properties.xml

deleted file mode 100644 (file)

index d23218e..0000000
--- a/org.glite.lb.client-interface/project/configure.properties.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Client Interface module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.3  2004/06/23 00:16:08  dimeglio
-       Added globalprefix and lbprefix parameters
-       
-       Revision 1.2  2004/06/22 15:49:56  dimeglio
-       Added configuration options
-       
-       Revision 1.1  2004/06/21 16:00:23  dimeglio
-       First version of this file
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Client Interface configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.dir}
-distdir=${dist.dir}
-package=${module.package.name}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-PREFIX=${install.dir}
-version=${module.version}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.lb.client-interface/project/properties.xml b/org.glite.lb.client-interface/project/properties.xml

deleted file mode 100755 (executable)

index 31d958b..0000000
--- a/org.glite.lb.client-interface/project/properties.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Client Interface component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.2  2004/06/21 14:21:07  dimeglio
-       Updated format
-       
--->
-
-<project name="LB Client Interface component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${lb.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${lb.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="client-interface" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.lb.client-interface/project/tar_exclude b/org.glite.lb.client-interface/project/tar_exclude

deleted file mode 100644 (file)

index e1fcd1a..0000000
--- a/org.glite.lb.client-interface/project/tar_exclude
+++ /dev/null
@@ -1,10 +0,0 @@
-tar_exclude
-CVS
-build.xml
-build
-build.properties
-properties.xml
-configure.properties.xml
-.cvsignore
-.project
-.cdtproject
diff --git a/org.glite.lb.client-interface/project/version.properties b/org.glite.lb.client-interface/project/version.properties

deleted file mode 100644 (file)

index 0073ad6..0000000
--- a/org.glite.lb.client-interface/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:06:19 CEST 2004
-module.version=0.2.0
-module.build=49
-module.age=1
diff --git a/org.glite.lb.client/.cvsignore b/org.glite.lb.client/.cvsignore

deleted file mode 100644 (file)

index 1df717b..0000000
--- a/org.glite.lb.client/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.lb.client/LICENSE b/org.glite.lb.client/LICENSE

deleted file mode 100644 (file)

index 259a91f..0000000
--- a/org.glite.lb.client/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware\r
-================================\r
-\r
-Copyright (c) 2004 on behalf of the EU EGEE Project: \r
-The European Organization for Nuclear Research (CERN), \r
-Istituto Nazionale di Fisica Nucleare (INFN), Italy\r
-Datamat Spa, Italy\r
-Centre National de la Recherche Scientifique (CNRS), France\r
-CS Systeme d'Information (CSSI), France\r
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden\r
-Universiteit van Amsterdam (UvA), Netherlands\r
-University of Helsinki (UH.HIP), Finlan\r
-University of Bergen (UiB), Norway\r
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom\r
-\r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are\r
-met: \r
-\r
-1. Redistributions of source code must retain the above copyright\r
-notice, this list of conditions and the following disclaimer.\r
-\r
-2. Redistributions in binary form must reproduce the above copyright\r
-notice, this list of conditions and the following disclaimer in the\r
-documentation and/or other materials provided with the distribution.\r
-\r
-3. The end-user documentation included with the redistribution, if\r
-any, must include the following acknowledgment: "This product includes\r
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."\r
-Alternatively, this acknowledgment may appear in the software itself, if\r
-and wherever such third-party acknowledgments normally appear.\r
-\r
-4. The names EGEE and the EU EGEE Project must not be\r
-used to endorse or promote products derived from this software without\r
-prior written permission. For written permission, please contact\r
-<email address>.\r
-\r
-5. You are under no obligation whatsoever to provide anyone with any\r
-bug fixes, patches, or upgrades to the features, functionality or\r
-performance of the Software ("Enhancements") that you may develop over\r
-time; however, if you choose to provide your Enhancements to The EU\r
-EGEE Project, or if you choose to otherwise publish or distribute your\r
-Enhancements, in source code form without contemporaneously requiring\r
-end users of The EU EGEE Proejct to enter into a separate written license\r
-agreement for such Enhancements, then you hereby grant The EU EGEE Project\r
-a non-exclusive, royalty-free perpetual license to install, use, copy,\r
-modify, prepare derivative works, incorporate into the EGEE Middleware\r
-or any other computer software, distribute, and sublicense your\r
-Enhancements or derivative works thereof, in binary and source code\r
-form (if any), whether developed by The EU EGEE Project or third parties.\r
-\r
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\r
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE\r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\r
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\r
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\r
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\r
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
-This software consists of voluntary contributions made by many\r
-individuals on behalf of the EU EGEE Prject. For more information on The\r
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on\r
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/\r
-\r
-\r
diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile

deleted file mode 100644 (file)

index 7d76562..0000000
--- a/org.glite.lb.client/Makefile
+++ /dev/null
@@ -1,182 +0,0 @@
-# Default values
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-client
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-
--include Makefile.inc
-
-VPATH=${top_srcdir}/src:${top_srcdir}/test
-AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
-
-SUFFIXES = .T 
-
-DEBUG:=-g -O0 -Wall
-
-GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
-GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour}
-
-CFLAGS:=${DEBUG} \
-       -I${top_srcdir}/src -I${top_srcdir}/interface \
-       -I${stagedir}/include \
-       -I${glite_location}/include \
-       -I${expat_prefix}/include \
-       -I${ares_prefix}/include \
-       ${COVERAGE_FLAGS} 
-
-
-CXXFLAGS:=${CFLAGS}
-
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour} \
-
-GLOBUS_THRLIBS:=-L${globus_prefix}/lib \
-       -lglobus_common_${thrflavour} \
-       -lglobus_gssapi_gsi_${thrflavour}
-
-EXPAT_LIBS:=-L${expat_prefix}/lib \
-       -lexpat
-
-ARES_LIBS:=-L${ares_prefix}/lib \
-       -lares
-
-EXT_LIB:= ${EXPAT_LIBS} \
-    ${ARES_LIBS}
-
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
-TEST_INC:=-I${cppunit_prefix}/include
-
-LDFLAGS:=-L${stagedir}/lib \
-       ${COVERAGE_FLAGS}
-
-COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-CXXCOMPILE:=libtool --mode=compile ${CXX} ${CXXFLAGS}
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS}
-INSTALL:=libtool --mode=install install
-
-LIBOBJS:=connection.o consumer.o notification.o prod_proto.o \
-       producer.o uiwrap.o
-
-PLUSOBJS:=Event.o Job.o JobStatus.o Notification.o ServerConnection.o
-PUB_HDRS:=CountRef.h Event.h JobJobStatus.h Notification.h ServerConnection.h \
-       LoggingExceptions.h
-
-LIBTHROBJS:=${LIBOBJS:.o=.thr.o}
-LIBLOBJS:=${LIBOBJS:.o=.lo}
-LIBTHRLOBJS:=${LIBOBJS:.o=.thr.lo}
-
-PLUSTHROBJS:=${PLUSOBJS:.o=.thr.o}
-PLUSLOBJS:=${PLUSOBJS:.o=.lo}
-PLUSTHRLOBJS:=${PLUSOBJS:.o=.thr.lo}
-
-LIB:=libglite_lb_client_${nothrflavour}.la
-THRLIB:=libglite_lb_client_${thrflavour}.la
-
-PLUSLIB:=libglite_lb_clientpp_${nothrflavour}.la
-THRPLUSLIB:=libglite_lb_clientpp_${thrflavour}.la
-
-TOOLS:=dump load purge
-
-${LIB}: ${LIBOBJS}
-       ${LINK} -o $@ ${LIBLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${nothrflavour}
-
-${THRLIB}: ${LIBTHROBJS}
-       ${LINK} -o $@ ${LIBTHRLOBJS} -rpath ${glite_location}/lib -lglite_lb_common_${thrflavour}
-
-${PLUSLIB}: ${PLUSOBJS}
-       ${LINK} -o $@ ${PLUSLOBJS} -rpath ${glite_location}/lib ${LIB}
-
-${THRPLUSLIB}: ${PLUSTHROBJS}
-       ${LINK} -o $@ ${PLUSTHRLOBJS} -rpath ${glite_location}/lib ${THRLIB}
-
-logevent: logevent.o args.o
-       ${LINK} -o $@ logevent.o args.o ${LIB} ${EXT_LIB} ${GLOBUS_LIBS}
-
-${TOOLS}: %: %.o
-       ${LINK} -o $@ $< ${LIB} ${EXT_LIB} ${GLOBUS_LIBS}
-
-${TOOLS}: ${LIB}
-
-${PLUSOBJS}: %.o: %.cpp
-       ${CXXCOMPILE} ${GLOBUSINC} -c $<
-
-${PLUSTHROBJS}: %.thr.o: %.cpp
-       ${CXXCOMPILE} ${GLOBUSTHRINC} -o $@ -c $<
-
-${LIBOBJS}: %.o: %.c
-       ${COMPILE} ${GLOBUSINC} -c $<
-
-${LIBTHROBJS}: %.thr.o: %.c
-       ${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
-
-# catches $TOOLS and logevent compilation
-%.o: %.c 
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $<
-
-%.c: %.c.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-%.cpp: %.cpp.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-default: all
-
-compile all: ${LIB} ${THRLIB} ${TOOLS} logevent ${PLUSLIB} ${THRPLUSLIB}
-
-check: compile check.producer
-
-check.producer: producer_test
-       ./producer_test
-
-producer_test: producer_test.o prod_proto_test.o
-       ${LINKXX} -o $@ ${LIB} ${TEST_LIBS} $+ ${EXT_LIB} ${GLOBUS_LIBS}
-
-producer_test.o: %.o: %.cpp
-       ${CXX} -c ${CXXFLAGS} ${TEST_INC} $<
-       
-stage: compile
-       $(MAKE) install PREFIX=${stagedir}
-dist: distsrc distbin
-
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-       
-install:
-       mkdir -p ${PREFIX}/bin
-       mkdir -p ${PREFIX}/lib
-       mkdir -p ${PREFIX}/share/doc/${package}-${version}
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PLUSLIB} ${THRPLUSLIB} ${PREFIX}/lib
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       for p in ${TOOLS} logevent; do \
-               ${INSTALL} -m 755 "$$p" "${PREFIX}/bin/glite-lb-$$p"; \
-       done
-
-clean:
-
diff --git a/org.glite.lb.client/build.xml b/org.glite.lb.client/build.xml

deleted file mode 100755 (executable)

index df3de71..0000000
--- a/org.glite.lb.client/build.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.4  2004/07/28 12:18:12  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.3  2004/07/06 17:45:30  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.2  2004/06/23 00:29:33  dimeglio
-       Added standard comments and handling of support files
-       
--->
-
-<project name="client" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite LB Client Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                Load configure options (order is important)
-            ========================================= -->
-       <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>
-
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-        <!-- Copy support files from the subsystem project to the component project-->
-               <copy toDir="${module.project.dir}">
-                       <fileset dir="${subsystem.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </copy> 
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-               <delete>
-                       <fileset dir="${module.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </delete>       
-       </target>
-       
-       <!-- =========================================
-            RPM settings
-            ========================================= -->
-
-       <property name="build.package.summary" value="L&amp;B client API and tools" />
-       <property name="build.package.description" value="
-Logging &amp; Bookkeeping (L&amp;B) C and C++ client libraries,&#xA;command
-for logging of L&amp;B events from shell scripts,&#xA;and utilities
-for (remote) bookkeeping server maintenance." />
-
-</project>             
diff --git a/org.glite.lb.client/project/build.properties b/org.glite.lb.client/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.lb.client/project/configure.properties.xml b/org.glite.lb.client/project/configure.properties.xml

deleted file mode 100644 (file)

index 17c4c40..0000000
--- a/org.glite.lb.client/project/configure.properties.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.2  2004/07/06 20:47:11  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Client configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-cppunit_prefix=${with.cppunit.prefix}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.lb.client/project/properties.xml b/org.glite.lb.client/project/properties.xml

deleted file mode 100755 (executable)

index d067cbd..0000000
--- a/org.glite.lb.client/project/properties.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Client component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.2  2004/06/23 00:30:55  dimeglio
-       First version of this file
-       
--->
-
-<project name="LB Client component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${lb.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${lb.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="client" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.lb.client/project/tar_exclude b/org.glite.lb.client/project/tar_exclude

deleted file mode 100644 (file)

index e1fcd1a..0000000
--- a/org.glite.lb.client/project/tar_exclude
+++ /dev/null
@@ -1,10 +0,0 @@
-tar_exclude
-CVS
-build.xml
-build
-build.properties
-properties.xml
-configure.properties.xml
-.cvsignore
-.project
-.cdtproject
diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties

deleted file mode 100644 (file)

index 1cd8f4c..0000000
--- a/org.glite.lb.client/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:08:55 CEST 2004
-module.version=0.2.0
-module.build=48
-module.age=1
diff --git a/org.glite.lb.client/src/Event.cpp.T b/org.glite.lb.client/src/Event.cpp.T

deleted file mode 100644 (file)

index 7e32f62..0000000
--- a/org.glite.lb.client/src/Event.cpp.T
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-@@@AUTO
-*/
-
-#include <utility>
-#include <vector>
-#include <string>
-#include <stdio.h>
-
-#include <errno.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "glite/lb/Event.h"
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
-#include "glite/lb/LoggingExceptions.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/events.h"
-#include "glite/lb/notifid.h"
-
-EWL_BEGIN_NAMESPACE;
-
-#define CLASS_PREFIX "glite::lb::Event::"
-
-@@@{
-sub typeswitch {
-       my $ftype = shift;
-       my $resc = shift;
-       local $_;
-       my %ctype;
-       $ctype{$_} = 1 while $_ = shift;
-
-       $resc = 'break;' unless $resc;
-
-       gen $indent."switch (attr) {\n";
-       selectType $event $ftype;
-       for (getFields $event) {
-               my $f = selectField $event $_;
-               if($ctype{$f->{type}}) {
-                 my $cstr = $ftype eq '_common_' ? 'any' : lcfirst $ftype;
-                 my $cname = getName $f 'C';
-                 gen "$indent\tcase Event::".uc($f->{name}).": return(cev->$cstr.$cname);\n";
-               } elsif (($f->{type} eq "int") && 
-                        ($ctype{"string"}) && 
-                        $f->{codes}) {
-                 # conversion from int to string (well, enum to string)
-                 my $cstr = $ftype eq '_common_' ? 'any' : lcfirst $ftype;
-                 my $cname = getName $f 'C';
-                 my $fn = $ftype eq '_common_' ? "" : ucfirst $ftype;
-                 my $c =  $fn . ucfirst $f->{name}; 
-                 $cast = ($c eq 'Level') ? "(edg_wll_Level)" : "";
-                 gen "$indent\tcase Event::".uc($f->{name}).": return((const char *)edg_wll_${c}ToString(${cast}cev->$cstr.$cname));\n";
-               } elsif (($f->{type} eq "jobid") &&
-                        ($ctype{"string"})) {
-                  # conversion from jobid to string
-               }
-       }
-       gen "$indent\tdefault: $resc\n" if $resc;
-       gen "$indent\}\n";
-}
-@@@}
-
-Event::Event(void)
-{
-  type = UNDEF;
-  flesh = 0;
-}
-
-
-Event::Event(const Event &in)
-{
-  type = in.type;
-  flesh = in.flesh;
-  if (flesh) flesh->use();
-}
-
-
-Event::Event(edg_wll_Event *in)
-{
-  type = (Type)in->type;
-  flesh = new CountRef<Event>((void*)in);
-}
-
-
-Event::~Event(void)
-{
-  if (flesh) flesh->release();
-}
-
-
-Event & 
-Event::operator= (const Event &in)
-{
-  if (flesh) flesh->release();
-  type = in.type;
-  flesh = in.flesh;
-  if (flesh) flesh->use();
-  
-  return *this;
-}
-
-int Event::getValInt(Attr attr)        const
-{
-       edg_wll_Event const     *cev = (edg_wll_Event *) flesh->ptr;
-
-@@@{
-       $indent = "\t";
-       typeswitch '_common_',undef,'int','port','logsrc';
-@@@}
-
-       switch (cev->type) {
-@@@{
-       $indent = "\t\t";
-       for my $t (getTypes $event) {
-               gen "\t\tcase ".uc($t).":\n";
-               typeswitch $t,'goto badattr;','int','port','logsrc';
-       }
-@@@}
-               default:
-                 STACK_ADD;
-                 throw(Exception(EXCEPTION_MANDATORY, EINVAL,
-                                 "attribute is not of int type"));
-        }
-badattr:
-        STACK_ADD;
-        throw(Exception(EXCEPTION_MANDATORY, ENOENT, "invalid attribute"));
-       return -1; /* gcc, shut up! */
-}
-
-static char const *get_string_val(const edg_wll_Event *cev, Event::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_',undef,'string';
-@@@}
-
-       switch (cev->type) {
-@@@{
-       $indent = "\t\t";
-       for my $t (getTypes $event) {
-               gen "\t\tcase Event::".uc($t).":\n";
-               typeswitch $t,'goto badattr;','string';
-       }
-@@@}
-               default:
-                 STACK_ADD;
-                 throw(Exception(EXCEPTION_MANDATORY, EINVAL, 
-                                 "attribute is not of string type and can not be converted"));
-       }
-badattr:
-       STACK_ADD;
-       throw(Exception(EXCEPTION_MANDATORY, ENOENT, "invalid attribute"));
-       return NULL; /* gcc, shut up! */
-}
-
-
-std::string 
-Event::getValString(Attr attr) const
-{
-  edg_wll_Event const *cev = (edg_wll_Event *) flesh->ptr;
-  std::string  ret;
-  
-  try {
-    char const *s = get_string_val(cev,attr);
-    if (s) ret.assign(s);
-    return ret;
-  } catch (Exception &e) {
-    STACK_ADD;
-    throw;
-  }
-}
-
-
-struct timeval 
-Event::getValTime(Attr attr) const
-{
-  edg_wll_Event const *cev = (edg_wll_Event *) flesh->ptr;
-@@@{
-    $indent = "\t";
-    typeswitch '_common_',undef,'timeval';
-@@@}
-  
-  /* XXX
-   * to make things simpler we don't include this here as there are no
-   * type specific timeval attributes currently
-   *
-   *   switch (cev->type) {
-   */
-
-  STACK_ADD; 
-  throw(Exception(EXCEPTION_MANDATORY, ENOENT, "invalid attribute"));
-}
-
-static
-edg_wlc_JobId 
-get_val_jobid(edg_wll_Event const *cev, Event::Attr attr) 
-{
-@@@{
-        $indent = "\t";
-        typeswitch '_common_', undef,'jobid';
-@@@}
-       switch (cev->type) {
-@@@{
-       $indent = "\t\t";
-       for my $t (getTypes $event) {
-               gen "\t\tcase Event::".uc($t).":\n";
-               typeswitch $t,'goto badattr;','jobid';
-       }
-@@@}
-               default:
-                 STACK_ADD;
-                 throw(Exception(EXCEPTION_MANDATORY, EINVAL, 
-                                 "attribute is not of jobid type"));
-       }
-badattr:
-       STACK_ADD;
-       throw(Exception(EXCEPTION_MANDATORY, ENOENT, "invalid attribute"));
-       return NULL; /* gcc, shut up! */
-}
-
-const 
-glite::wmsutils::jobid::JobId 
-Event::getValJobId(Attr attr) const
-{
-       edg_wll_Event const *cev = (edg_wll_Event *) flesh->ptr;
-       try {
-               edg_wlc_JobId job_id = get_val_jobid(cev,attr);
-               return(glite::wmsutils::jobid::JobId(job_id));
-       } 
-       catch (Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-
-}
-
-
-static std::string const names[Event::TYPE_MAX] = {
-  "undefined",
-@@@{
-  for (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-        $event->getTypes)
-  {
-    gen "\t\"$_\",\n";
-  }
-@@@}
-};
-
-const std::string  & 
-Event::name(void) const
-{
-  if (type<0 || type>TYPE_MAX) {
-    STACK_ADD;
-    throw(Exception(EXCEPTION_MANDATORY, EINVAL, "invalid event type"));
-  }
-  return names[type];
-}
-
-
-static 
-std::string const attr_names[Event::ATTR_MAX] = {
-@@@{
-       for (sort {$a cmp $b} getAllFields $event) {
-               gen "\t\"$_\",\n";
-       }
-@@@}
-};
-
-
-const std::string & 
-Event::getAttrName(Attr attr) const
-{
-  if (attr<0 || attr>=ATTR_MAX) {
-    STACK_ADD;
-    throw(Exception(EXCEPTION_MANDATORY, EINVAL, "invalid attribute"));
-  }
-  return attr_names[attr];
-}
-
-
-typedef std::pair<Event::Attr,Event::AttrType> tpair;
-static std::vector<tpair> attrs[Event::TYPE_MAX];
-
-#define apush(etype,attr,atype) \
-       attrs[etype].push_back(tpair(attr,atype))
-
-static bool attrs_inited = false;
-
-static void init_attrs(void)
-{
-@@@{
-       for my $t (getTypes $event) {
-               my $tu = uc $t;
-               selectType $event '_common_';
-               for (getFields $event) {
-                       my $fu = uc $_;
-                       my $f = selectField $event $_;
-                       my $ftu = uc "$f->{type}_T";
-                       gen "\tapush(Event::$tu,Event::$fu,Event::$ftu);\n";
-               }
-               selectType $event $t;
-               for (getFields $event) {
-                       my $fu = uc $_;
-                       my $f = selectField $event $_;
-                       my $ftu = uc "$f->{type}_T";
-                       gen "\tapush(Event::$tu,Event::$fu,Event::$ftu);\n";
-               }
-       }
-@@@}
-}
-
-std::vector<std::pair<Event::Attr,Event::AttrType> > const & Event::getAttrs(void) const
-{
-  if (type<0 || type>=TYPE_MAX) {
-    STACK_ADD;
-    throw(Exception(EXCEPTION_MANDATORY, EINVAL, "invalid event type"));
-  }
-  
-  /* FIXME: thread safety */
-  if (!attrs_inited) {
-    init_attrs();
-    attrs_inited = true;
-  }
-  
-  return attrs[type];
-}
-
-
-void 
-Event::destroyFlesh(void *in) 
-{
-  edg_wll_FreeEvent((edg_wll_Event *) in);
-  free(in);
-}
-
-EWL_END_NAMESPACE;
diff --git a/org.glite.lb.client/src/Job.cpp b/org.glite.lb.client/src/Job.cpp

deleted file mode 100644 (file)

index 81ddbe4..0000000
--- a/org.glite.lb.client/src/Job.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-#ident "$Header$"
-
-/**
- * @file Job.cpp
- * @version $Revision$
- */
-
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
-
-#include "glite/lb/Job.h"
-#include "glite/lb/LoggingExceptions.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-
-EWL_BEGIN_NAMESPACE;
-
-#define CLASS_PREFIX "glite::lb::Job::"
-
-const int Job::STAT_CLASSADS = EDG_WLL_STAT_CLASSADS;
-const int Job::STAT_CHILDREN = EDG_WLL_STAT_CHILDREN;
-const int Job::STAT_CHILDSTAT = EDG_WLL_STAT_CHILDSTAT;
-
-Job::Job(void) 
-{
-}
-
-
-Job::Job(const glite::wmsutils::jobid::JobId &in) 
-{
-  try {
-    jobId = in;
-  } catch (Exception &e) {
-    STACK_ADD;
-    throw;
-  }
-}
-
-
-Job::~Job(void) 
-{
-}
-
-
-Job & Job::operator= (const glite::wmsutils::jobid::JobId &in) 
-{
-  try {
-    jobId = in;
-    return *this;
-  } catch (Exception &) {
-    STACK_ADD;
-    throw;
-  }
-}
-
-
-JobStatus 
-Job::status(int flags) const
-{
-  JobStatus      jobStatus;
-
-  try {
-    edg_wll_JobStat    *cstat = jobStatus.c_ptr();
-    int ret = edg_wll_JobStatus(server.getContext(),
-                               jobId, // automagically converted by member operator
-                               flags,
-                               cstat);
-    check_result(ret,
-                server.getContext(),
-                "edg_wll_JobStatus");
-
-/* XXX the enums match due to automatic generation */
-    jobStatus.status = (JobStatus::Code) cstat->state;
-    
-    return(jobStatus);
-
-  } catch (Exception &e) {
-    STACK_ADD;
-    throw;
-  }
-}
-
-
-void 
-Job::log(std::vector<Event> &eventList) const
-{
-  edg_wll_Event *events = NULL,*ev;
-  int             result, qresults_param;
-  char            *errstr = NULL;
-  edg_wll_Context context;
-
-  try {
-    context = server.getContext();
-    result = edg_wll_JobLog(context, jobId, &events);
-    if (result == E2BIG) {
-           edg_wll_Error(context, NULL, &errstr);
-           check_result(edg_wll_GetParam(context,
-                                   EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                           context,
-                           "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-           if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                   edg_wll_SetError(context, result, errstr);
-                   check_result(result, context,"edg_wll_JobLog");
-               }
-    } else {
-           check_result(result, context,"edg_wll_JobLog");
-    }
-
-    for (int i=0; events[i].type != EDG_WLL_EVENT_UNDEF; i++) {
-       ev = (edg_wll_Event *) malloc(sizeof *ev);
-       memcpy(ev,events+i,sizeof *ev);
-      eventList.push_back(Event(ev)); 
-    }
-
-    free(events);
-
-    if (result) {
-           edg_wll_SetError(context, result, errstr);
-           check_result(result, context,"edg_wll_JobLog");
-    }
-  } catch (Exception &e) {
-    if(errstr) free(errstr);
-
-    STACK_ADD;
-    throw;
-  }
-
-}
-
-
-const std::vector<Event> 
-Job::log(void) const
-{
-  std::vector<Event>   eventList;
-  
-  log(eventList);
-  return(eventList);
-}
-
-
-const std::pair<std::string,u_int16_t> 
-Job::queryListener(std::string const & name) const
-{
-  std::string  host;
-  char *c_host = NULL;
-  uint16_t   port;
-
-  try {
-    int ret = edg_wll_QueryListener(server.getContext(),
-                                      jobId,
-                                      name.c_str(),
-                                      &c_host,
-                                      &port);
-    check_result(ret,
-                server.getContext(),
-                "edg_wll_QueryListener");
-    
-    host = c_host;
-    free(c_host);
-    return(std::pair<std::string,u_int16_t>(host,port));    
-
-  } catch (Exception &e) {
-    if(c_host) free(c_host);
-    STACK_ADD;
-    throw;
-  }
-}
-
-
-void Job::setParam(edg_wll_ContextParam par, int val)
-{
-       server.setParam(par,val);
-}
-
-void Job::setParam(edg_wll_ContextParam par, const std::string val)
-{
-       server.setParam(par,val);
-}
- 
-void Job::setParam(edg_wll_ContextParam par, const struct timeval & val)
-{
-       server.setParam(par,val);
-}
- 
-
-int Job::getParamInt(edg_wll_ContextParam par) const
-{
-       return server.getParamInt(par);
-}
-
-std::string Job::getParamString(edg_wll_ContextParam par) const
-{
-       return server.getParamString(par);
-}
-
-struct timeval Job::getParamTime(edg_wll_ContextParam par) const
-{
-       return server.getParamTime(par);
-}
-
-  
-
-EWL_END_NAMESPACE;
diff --git a/org.glite.lb.client/src/JobStatus.cpp.T b/org.glite.lb.client/src/JobStatus.cpp.T

deleted file mode 100644 (file)

index df9609b..0000000
--- a/org.glite.lb.client/src/JobStatus.cpp.T
+++ /dev/null
@@ -1,481 +0,0 @@
-#include <utility>
-#include <vector>
-#include <string>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-#include "glite/lb/JobStatus.h"
-#include "glite/lb/LoggingExceptions.h"
-#include "glite/lb/consumer.h"
-
-
-EWL_BEGIN_NAMESPACE;
-
-#define CLASS_PREFIX "glite::lb::JobStatus::"
-
-@@@{
-sub typeswitch {
-        my ($ftype,$ctype,$resc) = @_;
-        local $_;
-
-       $resc = "break;" unless $resc;
-
-        gen $indent."switch (attr) {\n";
-        selectType $status $ftype;
-        for (getFields $status) {
-                my $f = selectField $status $_;
-                if($f->{type} eq $ctype) {
-                 my $fnu = $f->{name};
-                 $fnu =~ s/([a-z])([A-Z])/$1_$2/g;
-                 $fnu = uc $fnu;
-                 my $cname = getName $f 'C';
-                 gen "$indent\tcase JobStatus::$fnu: return cstat->$cname;\n"
-               };
-               # XXX: when there are conversion functions, we may get these as strings as well
-               #elsif (($f->{type} eq "int") && 
-               #        ($ctype eq "string") && 
-               #        $f->{codes}) {
-               #  my $fnu = $f->{name};
-               #  $fnu =~ s/([a-z])([A-Z])/$1_$2/g;
-               #  $fnu = uc $fnu;
-               #  my $cname = getName $f 'C';
-               #  my $fn = $ftype eq '_common_' ? "" : ucfirst $ftype;
-               #  my $c =  $fn . ucfirst $f->{name}; 
-               #  $cast = ($c eq 'Level') ? "(edg_wll_Level)" : "";
-               #  gen "$indent\tcase JobStatus::$fnu: return((const char *)edg_wll_${c}ToString(${cast}cstat->$cname));\n";            }
-        }
-        gen "$indent\tdefault: $resc\n" if $resc;
-        gen "$indent\}\n";
-}
-@@@}
-
-JobStatus::JobStatus(void)
-{
-  status = UNDEF;
-  flesh = 0;
-}
-
-JobStatus::JobStatus(const JobStatus & in)
-{
-  status = in.status;
-  flesh = in.flesh;
-  if (flesh) flesh->use();
-}
-
-JobStatus & 
-JobStatus::operator=(const JobStatus & in)
-{
-  if (flesh) flesh->release();
-  status = in.status;
-  flesh = in.flesh;
-  if (flesh) flesh->use();
-  return *this;
-}
-
-JobStatus::JobStatus(const edg_wll_JobStat & in)
-{
-  status = (Code)in.state;
-  flesh = new CountRef<JobStatus>((void*)&in);
-}
- 
-JobStatus & 
-JobStatus::operator=(const edg_wll_JobStat & in)
-{
-  if(flesh)
-    flesh->release();
-  status = (Code)in.state;
-  flesh = new CountRef<JobStatus>((void*)&in);
-  return(*this);
-}
-
-JobStatus::~JobStatus()
-{
-  if (flesh) flesh->release();
-}
-
-edg_wll_JobStat *
-JobStatus::c_ptr(void)
-{
-  edg_wll_JobStat *s;
-
-  if(flesh)
-    return((edg_wll_JobStat*)flesh->ptr);
-
-  s = new edg_wll_JobStat;
-  // XXX - is it neccessary? new should throw exception itself... 
-  if(!s) throw(Exception(EXCEPTION_MANDATORY,
-                        ENOMEM,
-                        "out of memory allocating c-struct for JobStatus"));
-
-  edg_wll_InitStatus(s);
-  flesh = new CountRef<JobStatus>((void*)s);
-  return(s);
-}
-
-
-static std::string const names[JobStatus::CODE_MAX] = {
-       "undefined",
-@@@{
-       for (sort { $status->{order}->{$a} <=> $status->{order}->{$b} }
-               $status->getTypes)
-       {
-               gen "\t\"$_\",\n";
-       }
-@@@}
-};
-
-const std::string& JobStatus::name(void) const
-{
-  if (status<0 || status>=CODE_MAX) {
-    STACK_ADD;
-    throw(Exception(EXCEPTION_MANDATORY, 
-                   EINVAL,
-                   "status code invalid"));
-  }
-  return names[status];
-}
-
-int JobStatus::getValInt(JobStatus::Attr attr) const
-{
-  edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-@@@{
-    $indent = "\t";
-    typeswitch '_common_','int';
-@@@}
-
- STACK_ADD; 
- throw(Exception(EXCEPTION_MANDATORY,
-                ENOENT,
-                "no such attribute"));
- return -1;    /* make gcc shut up -- never returns */
-}
-
-bool JobStatus::getValBool(JobStatus::Attr attr) const
-{
-  edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-@@@{
-    $indent = "\t";
-    typeswitch '_common_','bool';
-@@@}
-
- STACK_ADD; 
- throw(Exception(EXCEPTION_MANDATORY,
-                ENOENT,
-                "no such attribute"));
- return -1;    /* make gcc shut up -- never returns */
-}
-
-static const char *
-get_string_val(const edg_wll_JobStat *cstat,JobStatus::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','string';
-@@@}
- STACK_ADD;
- throw(Exception(EXCEPTION_MANDATORY,
-                ENOENT,
-                "no such attribute"));
- return 0;     /* make gcc shut up -- never returns */
-}
-
-std::string 
-JobStatus::getValString(JobStatus::Attr attr) const
-{
-  edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-  std::string  ret;
-  
-  try{
-    const char *s = get_string_val(cstat,attr);
-    if (s) ret.assign(s);
-    return ret;
-  } catch (Exception &e) {
-    STACK_ADD;
-    throw;
-  }
-}
-
-
-struct timeval 
-JobStatus::getValTime(Attr attr) const
-{
-  edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','timeval';
-@@@}
- STACK_ADD;
- throw(Exception(EXCEPTION_MANDATORY,
-                ENOENT,
-                "no such attribute"));
-}
-
-
-const
-edg_wlc_JobId 
-get_val_jobid(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','jobid';
-@@@}
- STACK_ADD;
- throw(Exception(EXCEPTION_MANDATORY,
-                ENOENT,
-                "no such attribute"));
- return 0;     /* make gcc shut up -- never returns */
-}
-
-
-const 
-glite::wmsutils::jobid::JobId  
-JobStatus::getValJobId(Attr attr) const
-{
-  edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-
-  try {
-         edg_wlc_JobId job_id = get_val_jobid(cstat, attr);
-         return(glite::wmsutils::jobid::JobId(job_id));
-  }
-  catch(Exception &e) {
-         STACK_ADD;
-         throw;
-  }
-}
-
-const
-int *
-get_val_intlist(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','intlist';
-@@@}
-  STACK_ADD;
-  throw(Exception(EXCEPTION_MANDATORY,
-                 ENOENT,
-                 "no such attribute"));
-  return 0;    /* make gcc shut up -- never returns */
-}
-
-
-const 
-std::vector<int>
-JobStatus::getValIntList(Attr attr) const
-{
-       edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-
-       std::vector<int> result;
-       const int *r;
-       
-       try {
-               r = get_val_intlist(cstat, attr);
-               if(r)
-                       for(int i = 1; i <= r[0]; i++)
-                               result.push_back(r[i]);
-       } catch(Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-       return result;
-}
-
-
-char ** const
-get_val_stringlist(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','strlist';
-@@@}
-  STACK_ADD;
-  throw(Exception(EXCEPTION_MANDATORY,
-                 ENOENT,
-                 "no such attribute"));
-  return 0;    /* make gcc shut up -- never returns */
-}
-
-
-const
-std::vector<std::string>
-JobStatus::getValStringList(Attr attr) const
-{
-       edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-
-       std::vector<std::string> result;
-       char **r , **p;
-
-       try {
-               r = (char**)get_val_stringlist(cstat, attr);
-               if(r)
-                       for(p = r; *p; p++)
-                               result.push_back(std::string(*p));
-       } catch(Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-       return result;
-}
-
-
-edg_wll_TagValue * const
-get_val_taglist(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','taglist';
-@@@}
-  STACK_ADD;
-  throw(Exception(EXCEPTION_MANDATORY,
-                 ENOENT,
-                 "no such attribute"));
-  return 0;    /* make gcc shut up -- never returns */
-}
-
-
-const
-std::vector<std::pair<std::string,std::string> >
-JobStatus::getValTagList(Attr attr) const
-{
-       edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-
-       std::vector<std::pair<std::string,std::string> > result;
-       edg_wll_TagValue *r , *p;
-
-       try {
-               r = get_val_taglist(cstat, attr);
-               if(r)
-                       for(p = r; p->tag ; p++)
-                               result.push_back(std::pair<std::string,std::string>
-                                                       (std::string(p->tag),std::string(p->value)));
-       } catch(Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-       return result;
-}
-
-
-const
-edg_wll_JobStat *
-get_val_stslist(edg_wll_JobStat const *cstat, JobStatus::Attr attr)
-{
-@@@{
-       $indent = "\t";
-       typeswitch '_common_','stslist';
-@@@}
-  STACK_ADD;
-  throw(Exception(EXCEPTION_MANDATORY,
-                 ENOENT,
-                 "no such attribute"));
-  return 0;    /* make gcc shut up -- never returns */
-}
-
-
-const
-std::vector<JobStatus>
-JobStatus::getValJobStatusList(Attr attr) const
-{
-       edg_wll_JobStat const *cstat = (edg_wll_JobStat *) flesh->ptr;
-
-       std::vector<JobStatus> result;
-       const edg_wll_JobStat *r, *p;
-
-       try {
-               r = get_val_stslist(cstat, attr);
-               if(r)
-                       for(p=r; p->state != EDG_WLL_JOB_UNDEF; p++) {
-                               edg_wll_JobStat *jsep = new edg_wll_JobStat;
-                               if (!edg_wll_CpyStatus(p,jsep)) {
-                                       STACK_ADD;
-                                       throw(Exception(EXCEPTION_MANDATORY,
-                                       ENOMEM,
-                                       "cannot copy edg_wll_JobStat"));
-                               }
-                               result.push_back(JobStatus(*jsep));
-                       }
-       } catch(Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-       return(result);
-}
-
-
-static std::string const attr_names[JobStatus::ATTR_MAX] = {
-@@@{
-       for (sort {$a cmp $b} getAllFields $status) {
-               gen "\t\"$_\",\n";
-       }
-@@@}
-};
-
-const std::string & 
-JobStatus::getAttrName(JobStatus::Attr attr) const
-{
-  if (attr<0 || attr>=ATTR_MAX) {
-    STACK_ADD;
-    throw(Exception(EXCEPTION_MANDATORY,
-                   ENOENT,
-                   "no such attribute"));
-  }
-
-  return attr_names[attr];
-}
-
-
-typedef std::pair<JobStatus::Attr,JobStatus::AttrType> tpair;
-static std::vector<tpair> attrs;
-
-static bool attrs_inited = false;
-
-static void init_attrs(void)
-{
-/* XXX: currently only common attributes in JobStatus */
-@@@{
-       selectType $status '_common_';
-       for (getFields $status) {
-               my $fu = $_;
-               my $f = selectField $status $_;
-                my $ftu = uc "$f->{type}_T";
-               $fu =~ s/([a-z])([A-Z])/$1_$2/g;
-               $fu = uc $fu;
-
-               gen "\tattrs.push_back(tpair(JobStatus::$fu,JobStatus::$ftu));\n";
-       }
-@@@}
-}
-
-
-const std::vector<tpair>& 
-JobStatus::getAttrs(void) const
-{
-  if (status<0 || status>=CODE_MAX) {
-    STACK_ADD;
-    throw(Exception(EXCEPTION_MANDATORY,
-                   EINVAL,
-                   "status code invalid"));
-  }
-
-/* FIXME: thread safety */
-  if (!attrs_inited) {
-    init_attrs();
-    attrs_inited = true;
-  }
-  return attrs;
-}
-
-void 
-JobStatus::destroyFlesh(void *p)
-{
-  edg_wll_JobStat *stat = (edg_wll_JobStat *) p;
-  if (stat) {
-    edg_wll_FreeStatus(stat);
-    free(stat);
-  }
-}
-
-EWL_END_NAMESPACE;
diff --git a/org.glite.lb.client/src/Notification.cpp b/org.glite.lb.client/src/Notification.cpp

deleted file mode 100644 (file)

index 0441626..0000000
--- a/org.glite.lb.client/src/Notification.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-#ident "$Header$"
-
-/**
- * @file Notification.cpp
- * @version $Revision$
- */
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <string>
-#include <vector>
-
-#include "glite/lb/Notification.h"
-#include "glite/lb/JobStatus.h"
-#include "glite/lb/LoggingExceptions.h"
-#include "glite/lb/ServerConnection.h"
-
-#include "glite/lb/notifid.h"
-#include "glite/lb/notification.h"
-
-EWL_BEGIN_NAMESPACE;
-
-#define CLASS_PREFIX "glite::lb::Notification::"
-
-/* external prototypes */
-extern edg_wll_QueryRec **
-convertQueryVectorExt(const std::vector<std::vector<glite::lb::QueryRecord> > &);
-
-extern void
-freeQueryRecVector(edg_wll_QueryRec *);
-
-/* Constructors */
-Notification::Notification(void) 
-{
-   try {
-       int ret = edg_wll_InitContext(&this->ctx);
-       check_result(ret,this->ctx,"edg_wll_InitContext");
-       this->notifId = NULL;
-       this->valid = 0;
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-Notification::Notification(const std::string notifid_str)
-{
-   try {
-       char *host;
-       unsigned int port;
-       int ret = edg_wll_InitContext(&this->ctx);
-       check_result(ret,this->ctx,"edg_wll_InitContext");
-       ret = edg_wll_NotifIdParse(notifid_str.c_str(),&this->notifId);
-       check_result(ret,this->ctx,"edg_wll_NotifIdParse");
-       edg_wll_NotifIdGetServerParts(this->notifId,&host,&port);
-       edg_wll_SetParam(this->ctx, EDG_WLL_PARAM_NOTIF_SERVER, host);
-       edg_wll_SetParam(this->ctx, EDG_WLL_PARAM_NOTIF_SERVER_PORT, port);
-       free(host);
-       this->valid = 0;
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-Notification::Notification(const std::string host,const u_int16_t port)
-{
-   try {
-       int ret = edg_wll_InitContext(&ctx);
-       check_result(ret,ctx,"edg_wll_InitContext");
-       edg_wll_SetParam(ctx, EDG_WLL_PARAM_NOTIF_SERVER, host.c_str());
-       edg_wll_SetParam(ctx, EDG_WLL_PARAM_NOTIF_SERVER_PORT, port);
-       this->notifId = NULL;
-       this->valid = 0;
-       check_result(ret,ctx,"edg_wll_NotifIdCreate");
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-/* Destructor */
-Notification::~Notification(void) 
-{ 
-   try {
-       edg_wll_FreeContext(this->ctx);
-       edg_wll_NotifIdFree(this->notifId);
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-/* Methods */
-std::string
-Notification::getNotifId(void) const
-{
-   try {
-       std::string notifid_str;
-       if (this->notifId != NULL) {
-               notifid_str = edg_wll_NotifIdUnparse(this->notifId);
-               return(notifid_str);
-       } else {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "notifId not known at the moment");
-       }
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-time_t
-Notification::getValid(void) const
-{
-   return(this->valid);
-}
-
-int
-Notification::getFd(void) const
-{
-   try {
-       int ret = edg_wll_NotifGetFd(this->ctx);
-       check_result(ret,this->ctx,"edg_wll_NotifGetFd");
-       return(ret);
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-void
-Notification::addJob(const glite::wmsutils::jobid::JobId &jobId)
-{
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
-
-   try {
-       if (this->notifId != NULL) {
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, EINVAL, "adding jobs allowed only before registering");
-       }
-       for( it = jobs.begin(); it != jobs.end(); it++ ) {
-               if ( (*it).toString() == jobId.toString() ) {
-                       STACK_ADD;
-                       throw Exception(EXCEPTION_MANDATORY, EINVAL, "job already exists");
-               }
-       }
-       jobs.push_back(jobId);
-
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-void
-Notification::removeJob(const glite::wmsutils::jobid::JobId &jobId)
-{
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
-   int removed = 0;
-
-   try {
-       if (this->notifId != NULL) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "removing jobs allowed only before registering");
-       }
-       for( it = jobs.begin(); it != jobs.end(); it++ ) {
-               if ( (*it).toString() == jobId.toString() ) {
-                       jobs.erase(it);
-                       removed += 1;
-//                     break;
-               }
-       }
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-
-   if (removed == 0) {
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, EINVAL, "no job to remove");
-   }
-}
-
-/* XXX: obsolete, used only for debugging purposes */
-
-std::string 
-Notification::getJobs(void)
-{
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
-   std::string ret="";
-
-   try {
-       for( it = jobs.begin(); it != jobs.end(); it++ ) {
-               ret += (*it).toString();
-               ret += "\n";
-       }
-       return ret;
-
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-void
-Notification::setStates(const std::vector<glite::lb::JobStatus::Code> &jobStates)
-{
-       if (this->notifId != NULL) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "removing jobs allowed only before registering");
-       }
-       states = jobStates;     
-}
-
-std::string 
-Notification::getStates(void)
-{
-   std::vector<glite::lb::JobStatus::Code>::iterator it;
-   JobStatus js;
-   std::string ret="";
-
-   try {
-       for( it = states.begin(); it != states.end(); it++ ) {
-               js.status = (*it);
-               ret += js.name();
-               ret += "\n";
-       }
-       return ret;
-
-   } catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-void
-Notification::Register(void)
-{
-   int ret = 0;
-   std::vector<glite::wmsutils::jobid::JobId>::iterator it;
-   std::vector<glite::lb::JobStatus::Code>::iterator its;
-   std::vector<std::vector<glite::lb::QueryRecord> > queryExt;
-   edg_wll_QueryRec **conditions = NULL;
-   unsigned i;
-
-   try {
-       if (this->notifId != NULL) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "registering job allowed only once");
-       }
-       /* fill in the query: */
-       std::vector<glite::lb::QueryRecord> query;
-       for( it = jobs.begin(); it != jobs.end(); it++ ) {
-               QueryRecord r0(QueryRecord::JOBID,QueryRecord::EQUAL,*it);
-               query.push_back(r0);
-       }
-       queryExt.push_back(query);
-       query.clear();
-
-       for( its = states.begin(); its != states.end(); its++ ) {
-               QueryRecord r(QueryRecord::STATUS,QueryRecord::EQUAL,*its);
-               query.push_back(r);
-       }
-       queryExt.push_back(query);
-
-       /* convert query to conditions */
-       conditions = convertQueryVectorExt(queryExt);
-       /* register */
-       ret = edg_wll_NotifNew(ctx,conditions,-1,NULL,&notifId,&valid);
-       check_result(ret,ctx,"edg_wll_NotifNew");
-       /* clean */
-       if (conditions) {
-               for( i = 0; conditions[i]; i++ ) {
-// FIXME: not working :o(
-//                     freeQueryRecVector(conditions[i]);
-                       delete[] conditions[i];
-               }
-               delete[] conditions;
-       }
-   } catch (Exception &e) {
-       /* clean */
-       if (conditions) {
-               for( i = 0; conditions[i]; i++ ) {
-// FIXME: not working :o(
-//                     freeQueryRecVector(conditions[i]);
-                       delete[] conditions[i];
-               }
-               delete[] conditions;
-       }
-       STACK_ADD;
-       throw;
-   }
-}
-
-void
-Notification::Bind(const std::string address_override)
-{
-       try {
-               if (this->notifId == NULL) {
-                       STACK_ADD;
-                       throw Exception(EXCEPTION_MANDATORY, EINVAL, "binding allowed only for given notifId");
-               }
-               int ret = edg_wll_NotifBind(this->ctx,this->notifId,-1,address_override.c_str(),&this->valid);
-               check_result(ret,this->ctx,"edg_wll_NotifBind");
-       }
-       catch (Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-               
-
-int Notification::receive(glite::lb::JobStatus &jobStatus,timeval &timeout)
-{
-   try {
-       int ret = 0;
-       edg_wll_JobStat *status = (edg_wll_JobStat *) calloc(1,sizeof(edg_wll_JobStat));
-       if (status == NULL) {
-                       STACK_ADD;
-                       throw OSException(EXCEPTION_MANDATORY, ENOMEM, "allocating jobStatus");
-       }
-       ret = edg_wll_NotifReceive(ctx,-1,&timeout,status,&notifId);
-       if ( ret == ETIMEDOUT )
-               return 1;
-       check_result(ret,ctx,"edg_wll_NotifReceive");
-       jobStatus = JobStatus(*status);
-       return 0;
-   }
-   catch (Exception &e) {
-       STACK_ADD;
-       throw;
-   }
-}
-
-EWL_END_NAMESPACE;
diff --git a/org.glite.lb.client/src/ServerConnection.cpp b/org.glite.lb.client/src/ServerConnection.cpp

deleted file mode 100644 (file)

index 319bd0f..0000000
--- a/org.glite.lb.client/src/ServerConnection.cpp
+++ /dev/null
@@ -1,1302 +0,0 @@
-//#ident "$Header$"
-
-/**
- * @file ServerConnection.cpp
- * @version $Revision$
- */
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <time.h>
-#include <errno.h>
-#include <stdio.h>
-
-#include <expat.h>
-
-#include "glite/wmsutils/jobid/JobId.h"
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/xml_conversions.h"
-
-#include "glite/lb/ServerConnection.h"
-#include "glite/lb/LoggingExceptions.h"
-
-EWL_BEGIN_NAMESPACE;
-
-/**
- * definitions of QueryRecord class
- */
-#define CLASS_PREFIX "glite::lb::QueryRecord::"
-
-
-QueryRecord::QueryRecord(const Attr a, 
-                        const Op o, 
-                        const std::string & v)
-       : attr(a), oper(o),  state(EDG_WLL_JOB_UNDEF), string_value(v)
-{
-       switch(a) {
-       case OWNER:
-       case LOCATION:
-       case DESTINATION:
-       case HOST:
-       case INSTANCE:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "invalid value for attribute: " + v);
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a, 
-                        const Op o, 
-                        const int v)
-  : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), int_value(v)
-{
-       switch(a) {
-       case DONECODE:
-       case STATUS:
-       case SOURCE:
-       case EVENT_TYPE:
-       case LEVEL:
-       case EXITCODE:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of integer type");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a, 
-                        const Op o, 
-                        const struct timeval& v)
-  : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), timeval_value(v)
-{
-       switch(a) {
-       case TIME:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of timeval type");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a, 
-                        const Op o, 
-                        const glite::wmsutils::jobid::JobId& v)
-       : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), jobid_value(v)
-{
-       switch(a) {
-       case JOBID:
-       case PARENT:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of JobId type");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a,
-                        const Op o,
-                        const int s,
-                        const struct timeval &v)
-       : attr(a), oper(o), state(s), timeval_value(v)
-{
-       switch(a) {
-       case TIME:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of timeval type");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a,
-                        const Op o,
-                        const std::string &v1,
-                        const std::string &v2)
-       : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), string_value(v1), string_value2(v2)
-{
-       switch(a) {
-       case OWNER:
-       case LOCATION:
-       case DESTINATION:
-       case HOST:
-       case INSTANCE:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "invalid value for attribute type");
-       }
-       if(o != WITHIN) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "only operator WITHIN allowed with two values");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a,
-                        const Op o,
-                        const int v1,
-                        const int v2)
-       : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), int_value(v1), int_value2(v2)
-{
-       switch(a) {
-       case DONECODE:
-       case STATUS:
-       case SOURCE:
-       case EVENT_TYPE:
-       case LEVEL:
-       case EXITCODE:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of integer type");
-       }
-       if(o != WITHIN) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "only operator WITHIN allowed with two values");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a,
-                        const Op o,
-                        const struct timeval &v1,
-                        const struct timeval &v2)
-       : attr(a), oper(o), state(EDG_WLL_JOB_UNDEF), timeval_value(v1), timeval_value2(v2)
-{
-       switch(a) {
-       case TIME:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of timeval type");
-       }
-       if(o != WITHIN) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "only operator WITHIN allowed with two values");
-       }
-}
-
-
-QueryRecord::QueryRecord(const Attr a,
-                        const Op o,
-                        const int s,
-                        const struct timeval &v1,
-                        const struct timeval &v2)
-       : attr(a), oper(o), state(s), timeval_value(v1), timeval_value2(v2)
-{
-       switch(a) {
-       case TIME:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "attribute is not of timeval type");
-       }
-       if(o != WITHIN) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "only operator WITHIN allowed with two values");
-       }
-}
-
-
-QueryRecord::QueryRecord(const std::string &tag,
-                        const Op o,
-                        const std::string &val)
-       : attr(USERTAG), oper(o), tag_name(tag), state(EDG_WLL_JOB_UNDEF), string_value(val)
-{
-}
-
-
-QueryRecord::QueryRecord(const std::string &tag,
-                        const Op o,
-                        const std::string &v1,
-                        const std::string &v2)
-       : attr(USERTAG), oper(o), tag_name(tag), state(EDG_WLL_JOB_UNDEF), 
-         string_value(v1), string_value2(v2)
-         
-{
-       if(o != WITHIN) {
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "only operator WITHIN allowed with two values");
-       }
-}
-
-
-QueryRecord::QueryRecord(const QueryRecord &src)
-{
-       attr = src.attr;
-       oper = src.oper;
-
-       switch (attr) {
-
-       case USERTAG:
-               tag_name = src.tag_name;
-
-       case OWNER:
-       case LOCATION:
-       case DESTINATION:
-       case HOST:
-       case INSTANCE:
-               string_value = src.string_value;
-               if(src.oper == WITHIN)
-                       string_value2 = src.string_value2;
-               break;
-
-       case DONECODE:
-       case STATUS:
-       case SOURCE:
-       case EVENT_TYPE:
-       case LEVEL:
-       case EXITCODE:
-               int_value = src.int_value;
-               if(src.oper == WITHIN)
-                       int_value2 = src.int_value2;
-               break;
-
-       case TIME:
-               timeval_value = src.timeval_value;
-               if(src.oper == WITHIN)
-                       timeval_value2 = src.timeval_value2;
-               state = src.state;
-               break;
-
-       case JOBID:
-                       jobid_value = src.jobid_value;
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "query attribute not defined");
-       }
-}
-
-
-QueryRecord::QueryRecord() : attr(UNDEF), oper(EQUAL)
-{
-}
-
-
-QueryRecord::~QueryRecord()
-{
-}
-
-
-QueryRecord&
-QueryRecord::operator=(const QueryRecord &src)
-{
-        if(this == &src)
-          return(*this);
-
-       attr = src.attr;
-       oper = src.oper;
-
-       switch (attr) {
-
-       case USERTAG:
-               tag_name = src.tag_name;
-
-       case OWNER:
-       case LOCATION:
-       case DESTINATION:
-       case HOST:
-       case INSTANCE:
-               string_value = src.string_value;
-               if(oper == WITHIN)
-                       string_value2 = src.string_value2;
-               break;
-
-       case DONECODE:
-       case STATUS:
-       case SOURCE:
-       case EVENT_TYPE:
-       case LEVEL:
-       case EXITCODE:
-               int_value = src.int_value;
-               if(oper == WITHIN)
-                       int_value2 = src.int_value2;
-               break;
-
-       case TIME:
-               timeval_value = src.timeval_value;
-               state = src.state;
-               if(oper == WITHIN)
-                       timeval_value2 = src.timeval_value2;
-               break;
-
-       case JOBID:
-                       jobid_value = src.jobid_value;
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "query attribute not defined");
-       }
-
-       return *this;
-}
-
-
-QueryRecord::operator edg_wll_QueryRec() const
-{
-       edg_wll_QueryRec out;
-
-       out.attr = edg_wll_QueryAttr(attr);
-       out.op   = edg_wll_QueryOp(oper);
-
-       switch (attr) {
-
-       case USERTAG:
-               out.attr_id.tag = strdup(tag_name.c_str());
-
-       case OWNER:
-       case LOCATION:
-       case DESTINATION:
-       case HOST:
-       case INSTANCE:
-               out.value.c = strdup(string_value.c_str());
-               if(oper == WITHIN)
-                       out.value2.c = strdup(string_value2.c_str());
-               break;
-
-
-       case DONECODE:
-       case STATUS:
-       case SOURCE:
-       case EVENT_TYPE:
-       case LEVEL:
-       case EXITCODE:
-               out.value.i = int_value;
-               if(oper == WITHIN)
-                       out.value2.i = int_value2;
-               break;
-
-       case TIME:
-               out.value.t = timeval_value;
-               out.attr_id.state = (edg_wll_JobStatCode)state;
-               if(oper == WITHIN)
-                       out.value2.t = timeval_value2;
-               break;
-
-       case JOBID:
-               out.value.j = jobid_value;
-               break;
-
-       case UNDEF:
-               break;
-
-       default:
-               STACK_ADD;
-               throw Exception(EXCEPTION_MANDATORY, EINVAL, "query attribute not defined");
-       }
-
-       return(out);
-}
-
-const std::string QueryRecord::AttrName(const QueryRecord::Attr attr)
-{
-       char    *an = edg_wll_query_attrToString(edg_wll_QueryAttr(attr));
-       std::string     ret(an);
-       free(an);
-       return ret;
-}
-
-
-/** 
- * definitions of ServerConnection class 
- */
-#undef CLASS_PREFIX
-#define CLASS_PREFIX "glite::lb::ServerConnection::"
-
-ServerConnection::ServerConnection()
-{
-       int ret;
-       edg_wll_Context tmp_context;
-
-       if((ret=edg_wll_InitContext(&tmp_context)) < 0) {
-               STACK_ADD;
-               throw OSException(EXCEPTION_MANDATORY, ret, "initializing context");
-       }
-  
-       context = tmp_context;
-}
-
-
-ServerConnection::~ServerConnection()
-{
-       /* no exceptions should be thrown from destructors */
-       edg_wll_FreeContext(context);
-}
-
-
-/********************/
-/* BEGIN DEPRECATED */
-
-ServerConnection::ServerConnection(const std::string &in)
-{
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method deprecated");
-}
-
-
-void 
-ServerConnection::open(const std::string & in) 
-{
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method deprecated");
-}
-
-
-void 
-ServerConnection::close(void) 
-{
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method deprecated");
-}
-
-/* END DEPRECATED */
-/******************/
-
-
-void 
-ServerConnection::setQueryServer(const std::string& server, int port)
-{
-       check_result(edg_wll_SetParamString(context, 
-                                           EDG_WLL_PARAM_QUERY_SERVER,
-                                           server.c_str()),
-                    context,
-                    "setting query server address");
-       check_result(edg_wll_SetParamInt(context,
-                                        EDG_WLL_PARAM_QUERY_SERVER_PORT,
-                                        port),
-                    context,
-                    "setting query server port");
-}
-
-
-void 
-ServerConnection::setQueryTimeout(int timeout)
-{
-       check_result(edg_wll_SetParamInt(context,
-                                        EDG_WLL_PARAM_QUERY_TIMEOUT,
-                                        timeout),
-                    context,
-                    "setting query timeout");
-}
-
-
-void ServerConnection::setX509Proxy(const std::string& proxy)
-{
-       check_result(edg_wll_SetParamString(context,
-                                           EDG_WLL_PARAM_X509_PROXY,
-                                           proxy.c_str()),
-                    context,
-                    "setting X509 proxy");
-}
-
-
-void ServerConnection::setX509Cert(const std::string& cert, const std::string& key)
-{
-       check_result(edg_wll_SetParamString(context,
-                                           EDG_WLL_PARAM_X509_CERT,
-                                           cert.c_str()),
-                    context,
-                    "setting X509 certificate");
-       check_result(edg_wll_SetParamString(context,
-                                           EDG_WLL_PARAM_X509_KEY,
-                                           key.c_str()),
-                    context,
-                    "setting X509 key");
-}
-
-
-void 
-ServerConnection::setQueryEventsLimit(int max) {
-       check_result(edg_wll_SetParamInt(context,
-                                        EDG_WLL_PARAM_QUERY_EVENTS_LIMIT,
-                                        max),
-                    context,
-                    "setting query events limit");
-}
-
-void 
-ServerConnection::setQueryJobsLimit(int max) {
-       check_result(edg_wll_SetParamInt(context,
-                                        EDG_WLL_PARAM_QUERY_JOBS_LIMIT,
-                                        max),
-                    context,
-                    "setting query jobs limit");
-}
-
-
-std::pair<std::string, int>
-ServerConnection::getQueryServer() const
-{
-       /* FIXME: not implemented in C API */
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method not implemented");
-}
-
-
-int
-ServerConnection::getQueryTimeout() const
-{
-       /* FIXME: not implemented in C API */
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method not implemented");
-}
-
-
-std::string
-ServerConnection::getX509Proxy() const
-{
-       /* FIXME: not implemented in C API */
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method not implemented");
-}
-
-
-std::pair<std::string, std::string>
-ServerConnection::getX509Cert() const
-{
-       /* FIXME: not implemented in C API */
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method not implemented");
-}
-
-// static
-void freeQueryRecVector(edg_wll_QueryRec *v)
-{
-       for(; v->attr != EDG_WLL_QUERY_ATTR_UNDEF; v++)
-               edg_wll_QueryRecFree(v);
-}
-
-std::vector<std::vector<std::pair<QueryRecord::Attr,std::string> > >
-ServerConnection::getIndexedAttrs(void) {
-       edg_wll_QueryRec        **recs;
-       int     i,j;
-       std::vector<std::vector<std::pair<QueryRecord::Attr,std::string> > >    out;
-
-       check_result(edg_wll_GetIndexedAttrs(context,&recs),context,
-               "edg_wll_GetIndexedAttrs()");
-       
-       if (!recs) return out;
-
-       for (i=0; recs[i]; i++) {
-               std::vector<std::pair<QueryRecord::Attr,std::string> >  idx;
-               for (j=0; recs[i][j].attr; j++) {
-                       char    *s = strdup("");
-                       if (recs[i][j].attr == EDG_WLL_QUERY_ATTR_USERTAG)
-                               s = strdup(recs[i][j].attr_id.tag);
-                       else if (recs[i][j].attr == EDG_WLL_QUERY_ATTR_TIME)
-                               s = edg_wll_StatToString(recs[i][j].attr_id.state);
-                       idx.push_back(
-                               std::pair<QueryRecord::Attr,std::string>(
-                                       QueryRecord::Attr(recs[i][j].attr),s)
-                       );
-                       free(s);
-               }
-               freeQueryRecVector(recs[i]);
-               out.push_back(idx);
-       }
-       free(recs);
-       return out;
-}
-
-
-
-
-edg_wll_QueryRec *
-convertQueryVector(const std::vector<QueryRecord> &in)
-{
-       unsigned i;
-       edg_wll_QueryRec *out = new edg_wll_QueryRec[in.size() + 1];
-       QueryRecord empty;
-
-       if(out == NULL) {
-               STACK_ADD;
-               throw OSException(EXCEPTION_MANDATORY, ENOMEM, "allocating vector for conversion");
-       }
-
-       try {
-               for(i = 0; i < in.size(); i++) {
-                       out[i] = in[i];
-               }
-               out[i] = empty;
-       } catch (Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-       return(out);
-}
-
-
-edg_wll_QueryRec **
-convertQueryVectorExt(const std::vector<std::vector<QueryRecord> > &in)
-{
-       unsigned i;
-       edg_wll_QueryRec **out = new (edg_wll_QueryRec*)[in.size() + 1];
-
-       if(out == NULL) {
-               STACK_ADD;
-               throw OSException(EXCEPTION_MANDATORY, ENOMEM, "allocating vector for conversion");
-       }
-
-       try {
-               for(i = 0; i < in.size(); i++) {
-                       out[i] = convertQueryVector(in[i]);
-               }
-               out[i] = NULL;
-       } catch (Exception &e) {
-               STACK_ADD;
-               throw;
-       }
-       return(out);
-}
-
-void 
-ServerConnection::queryEvents(const std::vector<QueryRecord>& job_cond,
-                             const std::vector<QueryRecord>& event_cond,
-                             std::vector<Event> & eventList) const
-{
-       edg_wll_QueryRec    *job_rec = NULL, *event_rec = NULL;
-       edg_wll_Event       *events = NULL;
-       unsigned        i;
-       int             result, qresults_param;
-       char            *errstr = NULL;
-       
-       /* convert input */
-       try {
-               job_rec = convertQueryVector(job_cond);
-               event_rec = convertQueryVector(event_cond);
-
-               /* do the query */
-
-               result = edg_wll_QueryEvents(context, job_rec, event_rec, &events);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_QueryEvents");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_QueryEvents");
-               }
-               
-               /* convert output */
-               for (i=0; events[i].type != EDG_WLL_EVENT_UNDEF; i++) {
-                       edg_wll_Event   *ev = (edg_wll_Event *) malloc(sizeof *ev);
-                       memcpy(ev,events+i,sizeof *ev);
-                       Event   e(ev);
-      
-                       eventList.push_back(e);
-               }
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryEvents");
-               }
-    
-               free(events);
-               delete[] job_rec;
-               delete[] event_rec;
-
-       } catch(Exception &e) {
-               if(job_rec) delete[] job_rec;
-               if(event_rec) delete[] event_rec;
-               if(events) free(events);
-               if(errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-const std::vector<Event>  
-ServerConnection::queryEvents(const std::vector<QueryRecord>& job_cond,
-                             const std::vector<QueryRecord>& event_cond) const
-{
-       std::vector<Event>      eventList;
-
-       queryEvents(job_cond, event_cond,eventList);
-       return eventList;
-}
-
-const std::list<Event>
-ServerConnection::queryEventsList(const std::vector<QueryRecord>& job_cond,
-                       const std::vector<QueryRecord>& event_cond) const
-{
-       std::vector<Event> events;
-
-       queryEvents(job_cond, event_cond, events);
-       return std::list<Event>(events.begin(),events.end());
-}
-
-std::string 
-ServerConnection::queryEventsAggregate(const std::vector<QueryRecord>& job_cond,
-                                      const std::vector<QueryRecord>& event_cond,
-                                      enum AggOp const op,
-                                      std::string const attr) const
-{
-       STACK_ADD;
-       throw Exception(EXCEPTION_MANDATORY, 0, "method not implemented");
-       return ""; // gcc warning;
-}
-
-
-void 
-ServerConnection::queryEvents(const std::vector<std::vector<QueryRecord> >& job_cond,
-                             const std::vector<std::vector<QueryRecord> >& event_cond,
-                             std::vector<Event>& eventList) const
-{
-       edg_wll_QueryRec    **job_rec = NULL, **event_rec = NULL;
-       edg_wll_Event       *events = NULL;
-       unsigned        i;
-       
-       /* convert input */
-       try {
-               job_rec = convertQueryVectorExt(job_cond);
-               event_rec = convertQueryVectorExt(event_cond);
-
-               /* do the query */
-
-               check_result(edg_wll_QueryEventsExt(context, 
-                                                   (const edg_wll_QueryRec**)job_rec,
-                                                   (const edg_wll_QueryRec**)event_rec, 
-                                                   &events),
-                            context,
-                            "edg_wll_QueryEvents");
-    
-               /* convert output */
-               for (i=0; events[i].type != EDG_WLL_EVENT_UNDEF; i++) {
-                       edg_wll_Event   *ev = (edg_wll_Event *) malloc(sizeof *ev);
-                       memcpy(ev,events+i,sizeof *ev);
-                       Event   e(ev);
-      
-                       eventList.push_back(e);
-               }
-    
-               free(events);
-
-               for(i = 0 ; job_rec[i]; i++) delete[] job_rec[i];
-               for(i = 0 ; event_rec[i]; i++) delete[] event_rec[i];
-               delete[] job_rec;
-               delete[] event_rec;
-
-       } catch(Exception &e) {
-
-               if(job_rec) {
-                       for(i = 0 ; job_rec[i]; i++) delete[] job_rec[i];
-                       delete[] job_rec;
-               }
-               if(event_rec) { 
-                       for(i = 0 ; event_rec[i]; i++) delete[] event_rec[i];
-                       delete[] event_rec;
-               }
-               if(events) free(events);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-  
-const std::vector<Event> 
-ServerConnection::queryEvents(const std::vector<std::vector<QueryRecord> >& job_cond,
-                             const std::vector<std::vector<QueryRecord> >& event_cond) const
-{
-       std::vector<Event>      eventList;
-
-       queryEvents(job_cond, event_cond,eventList);
-       return eventList;
-}
-
-
-void ServerConnection::queryJobs(const std::vector<QueryRecord>& query,
-                                std::vector<glite::wmsutils::jobid::JobId> & ids) const
-{
-       edg_wll_QueryRec *cond = NULL;
-       edg_wlc_JobId *jobs, *j;
-       int     result, qresults_param;
-       char    *errstr = NULL;
-
-       try {
-               cond = convertQueryVector(query);
-    
-               result = edg_wll_QueryJobs(context, cond, 0, &jobs, NULL);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_QueryJobs");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_QueryJobs");
-               }
-
-               for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryJobs");
-               }
-
-               free(jobs);
-               freeQueryRecVector(cond);
-               delete[] cond;
-
-       } catch (Exception &e) {
-               if(cond) {
-                       freeQueryRecVector(cond);
-                       delete[] cond;
-               }
-               if (errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-const std::vector<glite::wmsutils::jobid::JobId>
-ServerConnection::queryJobs(const std::vector<QueryRecord>& query) const
-{
-       std::vector<glite::wmsutils::jobid::JobId> jobList;
-  
-       queryJobs(query, jobList);
-       return jobList;
-}
-
-
-void 
-ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query,
-                           std::vector<glite::wmsutils::jobid::JobId>& ids) const
-{
-       edg_wll_QueryRec **cond = NULL;
-       edg_wlc_JobId *jobs, *j;
-       int     result, qresults_param;
-        char    *errstr = NULL;
-
-       try {
-               cond = convertQueryVectorExt(query);
-    
-               result = edg_wll_QueryJobsExt(context, (const edg_wll_QueryRec**)cond, 
-                                              0, &jobs, NULL);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_QueryJobsExt");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_QueryJobsExt");
-               }
-
-               for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryJobsExt");
-               }
-
-               free(jobs);
-               {
-                       unsigned i;
-
-                       for(i = 0; cond[i]; i++) {
-                               freeQueryRecVector(cond[i]);
-                               delete[] cond[i];
-                       }
-                       delete[] cond;
-               }
-
-       } catch (Exception &e) {
-               unsigned i;
-               if(cond) {
-                       for(i = 0; cond[i]; i++) {
-                               freeQueryRecVector(cond[i]);
-                               delete[] cond[i];
-                       }
-                       delete[] cond;
-               }
-               if (errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-  
-const 
-std::vector<glite::wmsutils::jobid::JobId>
-ServerConnection::queryJobs(const std::vector<std::vector<QueryRecord> >& query) const
-{
-       std::vector<glite::wmsutils::jobid::JobId> jobList;
-  
-       queryJobs(query, jobList);
-       return jobList;
-}
-
-
-void
-ServerConnection::queryJobStates(const std::vector<QueryRecord>& query,
-                                int flags,
-                                std::vector<JobStatus> & states) const
-{
-       edg_wll_QueryRec *cond = NULL;
-       edg_wll_JobStat *jobs, *j;
-       int     result, qresults_param;
-       char    *errstr = NULL;
-
-       try {
-               cond = convertQueryVector(query);
-    
-               result = edg_wll_QueryJobs(context, cond, flags, NULL, &jobs);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_QueryJobs");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_QueryJobs");
-               }
-
-               for(j = jobs; j->state != EDG_WLL_JOB_UNDEF; j++) {
-                       edg_wll_JobStat *jsep = new edg_wll_JobStat;
-                       if (jsep != NULL) {
-                               memcpy(jsep, j, sizeof(*j));
-                               states.push_back(JobStatus(*jsep));
-                       }
-               }
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryJobs");
-               }
-
-               delete jobs;
-
-               freeQueryRecVector(cond);
-               delete[] cond;
-
-       } catch (Exception &e) {
-               if(cond) { 
-                       freeQueryRecVector(cond);
-                       delete[] cond;
-               }
-               if (errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-const std::vector<JobStatus>
-ServerConnection::queryJobStates(const std::vector<QueryRecord>& query,
-                                int flags) const
-{
-       std::vector<JobStatus> states;
-
-       queryJobStates(query, flags, states);
-       return(states);
-}
-
-const std::list<JobStatus>
-ServerConnection::queryJobStatesList(const std::vector<QueryRecord>& query,
-                                int flags) const
-{
-       std::vector<JobStatus> states;
-
-       queryJobStates(query, flags, states);
-       return std::list<JobStatus>(states.begin(),states.end());
-}
-
-
-void
-ServerConnection::queryJobStates(const std::vector<std::vector<QueryRecord> >& query,
-                                int flags,
-                                std::vector<JobStatus> & states) const
-{
-       edg_wll_QueryRec **cond = NULL;
-       edg_wll_JobStat *jobs, *j;
-       int     result, qresults_param;
-       char    *errstr = NULL;
-
-       try {
-               cond = convertQueryVectorExt(query);
-    
-               result = edg_wll_QueryJobsExt(context, (const edg_wll_QueryRec**)cond, 
-                                              flags, NULL, &jobs);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_QueryJobsExt");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_QueryJobsExt");
-               }
-
-               for(j = jobs; j->state != EDG_WLL_JOB_UNDEF; j++) {
-                       edg_wll_JobStat *jsep = new edg_wll_JobStat;
-                       if (jsep != NULL) {
-                               memcpy(jsep, j, sizeof(*j));
-                               states.push_back(JobStatus(*jsep));
-                       }
-               }
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryJobsExt");
-               }
-
-               delete jobs;
-
-               {
-                       unsigned i;
-
-                       for(i = 0; cond[i]; i++) { 
-                               freeQueryRecVector(cond[i]);
-                               delete[] cond[i];
-                       }
-                       delete[] cond;
-               }
-
-
-       } catch (Exception &e) {
-               unsigned i;
-               if(cond) { 
-                       for(i = 0; cond[i]; i++) {
-                               freeQueryRecVector(cond[i]);
-                               delete[] cond[i];
-                       }
-                       delete[] cond;
-               }
-               if (errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-const std::vector<JobStatus>
-ServerConnection::queryJobStates(const std::vector<std::vector<QueryRecord> >& query,
-                                int flags) const
-{
-       std::vector<JobStatus> states;
-
-       queryJobStates(query, flags, states);
-       return(states);
-}
-
-
-void ServerConnection::userJobs(std::vector<glite::wmsutils::jobid::JobId> & ids) const
-{
-       edg_wlc_JobId *jobs, *j;
-       int     result, qresults_param;
-       char    *errstr = NULL;
-
-       try {
-               result = edg_wll_UserJobs(context, &jobs, NULL);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_UserJobs");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_UserJobs");
-               }
-
-               for(j = jobs; *j; j++) 
-                       ids.push_back(glite::wmsutils::jobid::JobId(*j));
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryJobsExt");
-               }
-
-               free(jobs);
-
-       } catch (Exception &e) {
-               if (errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-const std::vector<glite::wmsutils::jobid::JobId>
-ServerConnection::userJobs() const
-{
-       std::vector<glite::wmsutils::jobid::JobId> jobList;
-  
-       userJobs(jobList);
-       return jobList;
-}
-
-
-void
-ServerConnection::userJobStates(std::vector<JobStatus> & states) const
-{
-       edg_wll_JobStat *jobs, *j;
-       int     result, qresults_param;
-       char    *errstr = NULL;
-
-       try {
-               result = edg_wll_UserJobs(context, NULL, &jobs);
-               if (result == E2BIG) {
-                       edg_wll_Error(context, NULL, &errstr);
-                       check_result(edg_wll_GetParam(context,
-                                               EDG_WLL_PARAM_QUERY_RESULTS, &qresults_param),
-                                       context,
-                                       "edg_wll_GetParam(EDG_WLL_PARAM_QUERY_RESULTS)");
-                       if (qresults_param != EDG_WLL_QUERYRES_LIMITED) {
-                               edg_wll_SetError(context, result, errstr);
-                               check_result(result, context,"edg_wll_UserJobs");
-                       }
-               } else {
-                       check_result(result, context,"edg_wll_UserJobs");
-               }
-
-               for(j = jobs; j->state != EDG_WLL_JOB_UNDEF; j++) {
-                       edg_wll_JobStat *jsep = new edg_wll_JobStat;
-                       if (jsep != NULL) {
-                               memcpy(jsep, j, sizeof(*j));
-                               states.push_back(JobStatus(*jsep));
-                       }
-               }
-
-               if (result) {
-                       edg_wll_SetError(context, result, errstr);
-                       check_result(result, context,"edg_wll_QueryJobsExt");
-               }
-
-               delete jobs;
-
-       } catch (Exception &e) {
-               if (errstr) free(errstr);
-
-               STACK_ADD;
-               throw;
-       }
-}
-
-
-const std::vector<JobStatus>
-ServerConnection::userJobStates() const
-{
-       std::vector<JobStatus> states;
-
-       userJobStates(states);
-       return(states);
-}
-
-
-edg_wll_Context
-ServerConnection::getContext(void) const
-{
-       return(context);
-}
-
-
-void ServerConnection::setParam(edg_wll_ContextParam par, int val)
-{
-       check_result(edg_wll_SetParamInt(context,par,val),
-               context,
-               "edg_wll_SetParamInt()");
-}
-
-void ServerConnection::setParam(edg_wll_ContextParam par, const std::string val)
-{
-       check_result(edg_wll_SetParamString(context,par,val.c_str()),
-               context,
-               "edg_wll_SetParamString()");
-}
-
-void ServerConnection::setParam(edg_wll_ContextParam par, const struct timeval & val)
-{
-       check_result(edg_wll_SetParamTime(context,par,&val),
-               context,
-               "edg_wll_SetParamTime()");
-}
-
-int ServerConnection::getParamInt(edg_wll_ContextParam par) const
-{
-       int     ret;
-       check_result(edg_wll_GetParam(context,par,&ret),
-               context,
-               "edg_wll_GetParam()");
-       return  ret;
-}
-
-std::string ServerConnection::getParamString(edg_wll_ContextParam par) const
-{
-       char    *ret;
-       std::string     out;
-
-       check_result(edg_wll_GetParam(context,par,&ret),
-               context,
-                "edg_wll_GetParam()");
-
-       out = ret;
-       free(ret);
-       return out;
-}
-
-struct timeval ServerConnection::getParamTime(edg_wll_ContextParam par) const
-{
-       struct timeval  ret;
-       check_result(edg_wll_GetParam(context,par,&ret),
-               context,
-               "edg_wll_GetParam()");
-       return ret;
-}
-
-EWL_END_NAMESPACE;
diff --git a/org.glite.lb.client/src/args.c.T b/org.glite.lb.client/src/args.c.T

deleted file mode 100644 (file)

index 20defdf..0000000
--- a/org.glite.lb.client/src/args.c.T
+++ /dev/null
@@ -1,533 +0,0 @@
-/*
-@@@AUTO
-*/
-
-@@@LANG: C
-
-#include "args.h"
-#include "glite/lb/events.h"
-
-#include <stdio.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-
-typedef struct {
-    int argc;
-    char** argv;
-    const char* help;
-    int idx;
-    edg_wll_Args list[1000];
-    int last;
-} opt_ctx_t;
-
-/* lists of accepted tags */
-@@@{
-                gen "static const char * const eventJobCommon\[] = {";
-                selectType $event '_common_';
-                for (getFieldsOrdered $event) {
-                        my $f = selectField $event $_;
-                        my $fn = $f->{name};
-                        gen "\"$fn\",  ";
-                }
-                gen "NULL };\n";
-@@@}
-@@@{
-        for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-                        $event->getTypes) {
-                gen "static const char * const event$t\[] = {";
-                selectType $event $t;
-                for (getFieldsOrdered $event) {
-                        my $f = selectField $event $_;
-                        my $fn = $f->{name};
-                        gen "\"$fn\",  "
-                }
-                gen "NULL };\n";
-        }
-@@@}
-
-static const char * const * const eventTags[] = {
-        eventJobCommon,
-@@@{
-        for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-                        $event->getTypes) {
-                gen "\tevent$t,\n";
-        }
-        gen "\tNULL\n};\n";
-@@@}
-
-static int read_bool(const edg_wll_Args* o, char* arg, char* par)
-{
-    int b = 1;
-    int rs = 0;
-
-    if (par)
-    {
-       if (!strcasecmp(par, "off") || !strcmp(par, "0")
-           || !strcasecmp(par, "false"))
-       {
-           b = 0;
-           rs = 1;
-       }
-       else if (!strcasecmp(par, "on") || !strcmp(par, "1")
-                || !strcasecmp(par, "true"))
-       {
-           rs = 1;
-       }
-    }
-
-    if (o->value)
-       *(int*)o->value = b;
-    return rs;
-}
-
-static void read_double(const edg_wll_Args* o, char* arg, char* par)
-{
-    double d;
-    if (!par)
-    {
-       printf("Option: %s  - missing double/float value\n", arg);
-       exit(1);
-    }
-    d = atof(par);
-    if (o->min != o->max)
-    {
-       if (d < o->min && d > o->max)
-       {
-           printf("Option: %s  - value: %f  out of range <%d, %d>",
-                  arg, d, o->min, o->max);
-           exit(1);
-       }
-    }
-    if (o->value)
-       *(double*)o->value = d;
-}
-
-static void read_string(const edg_wll_Args* o, char* arg, char* par)
-{
-    if (!par)
-    {
-       printf("Option: %s  - missing string value\n", arg);
-       exit(1);
-    }
-    if (o->value)
-    {
-       if (strstr(arg, "-file"))
-       {
-            struct stat buf;
-           int fd = open(par, O_RDONLY);
-           if (fd >= 0)
-           {
-                char* b;
-               fstat(fd, &buf);
-               b = (char*) malloc(buf.st_size);
-               if (b)
-               {
-                    int p = 0;
-                   printf("Opened & reading %s  %lld\n",
-                               par, (long long)buf.st_size);
-                   while (p < buf.st_size)
-                   {
-                       int r = read(fd, b + p, buf.st_size);
-                       if (r < 0)
-                           break;
-                       p += r;
-                   }
-
-                   *(char**)o->value = b;
-               }
-                close(fd);
-           }
-            else
-               fprintf(stderr, "can't open file: \"%s\"  (%s)\n", par, strerror(errno));
-
-       }
-       else
-           *(char**)o->value = strdup(par);
-    }
-}
-
-static void read_int(const edg_wll_Args* o, char* arg, char* par)
-{
-    int v = 0;
-    if (!par)
-    {
-       printf("Option: %s  - missing integer value\n", arg);
-       exit(1);
-    }
-    sscanf(par, "%i", &v);
-    if (o->min != o->max)
-    {
-       if (v < o->min && v > o->max)
-       {
-           printf("Option: %s  - value: %d  out of range <%d, %d>",
-                  arg, v, o->min, o->max);
-           exit(1);
-       }
-    }
-    if (o->value)
-       *(int*)o->value = v;
-}
-
-static void read_uint16(const edg_wll_Args* o, char* arg, char* par)
-{
-    int v = 0;
-    if (!par)
-    {
-       printf("Option: %s  - missing integer value\n", arg);
-       exit(1);
-    }
-    sscanf(par, "%i", &v);
-    if (o->min != o->max)
-    {
-       if (v < o->min && v > o->max)
-       {
-           printf("Option: %s  - value: %d  out of range <%d, %d>",
-                  arg, v, o->min, o->max);
-           exit(1);
-       }
-    }
-    if (o->value)
-       *(u_int16_t*)o->value = v;
-}
-
-static void read_event(const edg_wll_Args* o, char* arg, char* par)
-{
-    edg_wll_EventCode ec = edg_wll_StringToEvent(par);
-    if (ec == EDG_WLL_EVENT_UNDEF)
-    {
-       if (strcmp(par, "help") == 0)
-       {
-           // list type
-           int i;
-           printf("Available events:   extra options\n");
-           for (i = EDG_WLL_EVENT_UNDEF + 1; i < EDG_WLL_EVENT__LAST; i++)
-           {
-               char* e = edg_wll_EventToString(i);
-               if (e)
-               {
-                    int j = 0;
-                   printf("  %s:  ", e);
-                   while (eventTags[i][j])
-                       printf("%s ", eventTags[i][j++]);
-                    fputc('\n', stdout);
-
-                   free(e);
-               }
-           }
-       }
-        else
-           fprintf(stderr,"ERROR %s  unknown event: %s\n", arg, par);
-       exit(1);
-    }
-    if (o->value)
-       *(edg_wll_EventCode*)o->value = ec;
-
-}
-
-static void read_source(const edg_wll_Args* o, char* arg, char* par)
-{
-    edg_wll_Source s = edg_wll_StringToSource(par);
-    if (s == EDG_WLL_SOURCE_NONE)
-    {
-       if (strcmp(par, "help") == 0)
-       {
-           // list type
-           int i;
-           printf("Valid sources:\n");
-           for (i = EDG_WLL_SOURCE_NONE + 1; i < EDG_WLL_SOURCE__LAST; i++)
-           {
-               char* e = edg_wll_SourceToString(i);
-               if (e)
-               {
-                   printf("  %s\n", e);
-                           free(e);
-               }
-           }
-       }
-       else
-           fprintf(stderr,"ERROR %s  unknown source: %s\n", arg, par);
-       exit(1);
-    }
-    if (o->value)
-       *(edg_wll_Source*)o->value = s;
-}
-
-static void show_help(const edg_wll_Args* o, int prefix)
-{
-    unsigned max = 0;
-    char** l = malloc(sizeof(char*) * 1000);
-    int li = 0;
-    unsigned i = 0;
-
-    for (i = 0; o[i].type != EDG_WLL_ARGS_NONE; i++)
-    {
-       char b[80];
-        unsigned len;
-       if (o[i].type == EDG_WLL_ARGS_HELP)
-           sprintf(b, "  -h  --help");
-       else
-           sprintf(b, "  %c%s  %s%s",
-                   (o[i].oshort && prefix) ? '-' : ' ',
-                   o[i].oshort ? o[i].oshort : " ",
-                   (o[i].olong && prefix) ? "--" : "",
-                   o[i].olong ? o[i].olong : ""
-                   //opt[i].options ? opt[i].options : "",
-                   //o[i].help ? o[i].help : ""
-                  );
-       l[li] = strdup(b);
-        li++;
-       len = strlen(b);
-       if (max < len)
-           max = len;
-    }
-    for (i = 0; o[i].type != EDG_WLL_ARGS_NONE; i++)
-    {
-       if (!o[i].oshort && !o[i].olong
-           && o[i].type != EDG_WLL_ARGS_HELP
-           && o[i].type != EDG_WLL_ARGS_OPTIONS)
-            continue;
-
-       if (o[i].type != EDG_WLL_ARGS_OPTIONS)
-       {
-            unsigned s;
-           fputs(l[i], stdout);
-           for (s = strlen(l[i]); s <= max; s++)
-               fputc(' ', stdout);
-           if (o[i].type == EDG_WLL_ARGS_HELP)
-               fputs("this help message", stdout);
-       }
-
-       if (o[i].value)
-       {
-           switch (o[i].type)
-           {
-           case EDG_WLL_ARGS_INT:
-               if (o[i].help)
-                   printf(o[i].help, *(int*)o[i].value,
-                          o[i].min, o[i].max);
-               break;
-           case EDG_WLL_ARGS_STRING:
-           case EDG_WLL_ARGS_SELECTSTRING:
-                if (o[i].help)
-                   printf(o[i].help, *(const char**)o[i].value);
-               break;
-           case EDG_WLL_ARGS_OPTIONS:
-               show_help((const edg_wll_Args*)o[i].value, prefix);
-               continue;
-           default:
-                if (o[i].help)
-                   fputs(o[i].help, stdout);
-               break;
-           }
-       }
-       else if (o[i].help)
-           fputs(o[i].help, stdout);
-
-       fputs("\n", stdout);
-    }
-    while (--li>=0) free(l[li]);
-    free(l);
-}
-#if 0
-static void parse_suboptions(const Option* o, const char* oname, char* pars, const char* r)
-{
-    avm::vector<char*> arr;
-    split(arr, pars);
-
-    if (!arr.size() || strcmp(arr[0], "help") == 0)
-    {
-       printf("Available options for '%s' (optA=x:optB=...)\n", oname);
-       show_help(o, false);
-       exit(0);
-    }
-    for (unsigned i = 0; i < arr.size(); i++)
-    {
-       char* par = strchr(arr[i], '=');
-       if (par)
-       {
-           *par = 0;
-           par++;
-       }
-
-       for (unsigned j = 0; o[j].type != Args::Option::NONE; j++)
-       {
-           if ((o[j].oshort && strcmp(o[j].oshort, arr[i]) == 0)
-               || (o[j].olong && strcmp(o[j].olong, arr[i]) == 0))
-           {
-               switch(o[j].type)
-               {
-               case Args::Option::BOOL:
-                   read_bool(&o[j], arr[i], par, r);
-                   break;
-               case Args::Option::DOUBLE:
-                   read_double(&o[j], arr[i], par, r);
-                   break;
-               case Args::Option::INT:
-                   read_int(&o[j], arr[i], par, r);
-                   break;
-               default:
-                   ;
-               }
-           }
-       }
-    }
-}
-#endif
-
-static int findOpt(opt_ctx_t* ctx, int olong)
-{
-    char* arg = ctx->argv[ctx->idx] + olong + 1;
-    char* par = strchr(arg, '=');
-    const edg_wll_Args* o = NULL;
-    const edg_wll_Args* ol[200];
-    int olb = 0;
-    int ole = 0;
-
-    char* argnofile = strdup(arg);
-    char* nofile = strstr(argnofile, "-file"); // should be the ending
-    if (nofile && (nofile - argnofile) > 2)
-       nofile[0] = 0;
-
-    olong++;
-    if (par)
-    {
-        *par = 0;
-       par++;
-    }
-    else if ((ctx->idx + 1) < ctx->argc)
-    {
-       par = ctx->argv[++ctx->idx];
-    }
-
-    ol[ole++] = ctx->list;
-    while (ole > olb)
-    {
-       o = ol[olb++];
-       for (; o->type != EDG_WLL_ARGS_NONE; o++)
-       {
-           //printf("OPTION %d   '%s'  %d   '%s' '%s'\n", o->type, arg, olong, o->oshort, o->olong);
-           if (o->type == EDG_WLL_ARGS_HELP
-               && (strcasecmp(arg, "h") == 0
-                   || strcmp(arg, "?") == 0
-                   || strcasecmp(arg, "help") == 0))
-               break;
-           if (o->type == EDG_WLL_ARGS_OPTIONS)
-           {
-                ol[ole++] = o->value;
-                continue;
-           }
-
-           if (olong < 2)
-           {
-               if (o->oshort &&
-                   (strcmp(arg, o->oshort) == 0
-                    || strcmp(argnofile, o->oshort) == 0))
-                   break;
-           }
-           else if (o->olong && (strcmp(arg, o->olong) == 0
-                                 || strcmp(argnofile, o->olong) == 0))
-               break;
-       }
-       if (o->type != EDG_WLL_ARGS_NONE)
-           break;
-    }
-
-    switch (o->type)
-    {
-    case EDG_WLL_ARGS_NONE:
-       return -1;
-    case EDG_WLL_ARGS_BOOL:
-       if (!read_bool(o, arg, par))
-           ctx->idx--; // no argument given
-       break;
-    case EDG_WLL_ARGS_DOUBLE:
-       read_double(o, arg, par);
-       break;
-    case EDG_WLL_ARGS_STRING:
-        read_string(o, arg, par);
-        break;
-    case EDG_WLL_ARGS_INT:
-       read_int(o, arg, par);
-       break;
-    case EDG_WLL_ARGS_UINT16:
-       read_uint16(o, arg, par);
-       break;
-    case EDG_WLL_ARGS_EVENT:
-       read_event(o, arg, par);
-       break;
-    case EDG_WLL_ARGS_SOURCE:
-       read_source(o, arg, par);
-       break;
-    case EDG_WLL_ARGS_HELP:
-       printf("\nUsage: %s %s\n\n", ctx->argv[0], ctx->help);
-       show_help(ctx->list, 1);
-       exit(0);
-    //case EDG_WLL_ARGS_SUBOPTIONS:
-       //parse_suboptions((const edg_wll_Args*)o->value, arg, par, regname);
-    default:
-       printf("FIXME: unhandle option type %d\n", o->type);
-        break;
-    }
-
-    if (argnofile)
-        free(argnofile);
-
-    return 0;
-}
-
-static void addOptions(opt_ctx_t* ctx, const edg_wll_Args* options)
-{
-    const edg_wll_Args* o = options;
-
-    while (o->type != EDG_WLL_ARGS_NONE)
-    {
-       ctx->list[ctx->last++] = *o;
-        o++;
-    }
-}
-
-void edg_wll_ParseArgs(int* argc, char** argv, const edg_wll_Args* options,
-                      const char* help)
-{
-    int sidx = 1;
-    opt_ctx_t ctx;
-
-    ctx.argc = *argc;
-    ctx.argv = argv;
-    ctx.help = help;
-    ctx.last = 0;
-
-    addOptions(&ctx, options);
-
-    for (ctx.idx = 1; ctx.idx < ctx.argc; ctx.idx++)
-    {
-       if (argv[ctx.idx][0] == '-')
-       {
-           int olong = (argv[ctx.idx][1] == '-');
-           if (olong && argv[ctx.idx][2] == 0)
-               break; // end of options
-           //printf("ARG %d  %s\n", ctx.idx, argv[ctx.idx]);
-           if (findOpt(&ctx, olong) == 0)
-               continue;
-       }
-       else if (sidx != ctx.idx)
-       {
-           fprintf(stderr,"SIDX  %d  %d\n", sidx, ctx.idx);
-           argv[sidx] = argv[ctx.idx];
-       }
-       sidx++;
-    }
-
-    while (ctx.idx < *argc && sidx != ctx.idx)
-    {
-       argv[sidx++] = argv[ctx.idx++];
-    }
-
-    *argc = sidx;
-}
diff --git a/org.glite.lb.client/src/args.h b/org.glite.lb.client/src/args.h

deleted file mode 100644 (file)

index 6daaf4e..0000000
--- a/org.glite.lb.client/src/args.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_ARGS_H__
-
-typedef enum {
-    EDG_WLL_ARGS_NONE = 0,
-    EDG_WLL_ARGS_BOOL,
-    EDG_WLL_ARGS_INT,
-    EDG_WLL_ARGS_UINT16,
-    EDG_WLL_ARGS_DOUBLE,
-    EDG_WLL_ARGS_STRING,
-    EDG_WLL_ARGS_HELP,
-    EDG_WLL_ARGS_JOBID,
-    EDG_WLL_ARGS_NOTIFID,
-    EDG_WLL_ARGS_SOURCE,
-    EDG_WLL_ARGS_EVENT,
-    EDG_WLL_ARGS_OPTIONS,
-    EDG_WLL_ARGS_SUBOPTIONS,
-    EDG_WLL_ARGS_SELECTSTRING,
-} edg_wll_ArgsCode;
-
-typedef struct {
-    edg_wll_ArgsCode type;
-    const char* oshort;
-    const char* olong;
-    const char* help;
-    void* value;
-    int min;
-    int max;
-} edg_wll_Args;
-
-void edg_wll_ParseArgs(int* argc, char** argv, const edg_wll_Args* parray,
-                       const char* help);
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_ARGS_H__ */
diff --git a/org.glite.lb.client/src/connection.c b/org.glite.lb.client/src/connection.c

deleted file mode 100644 (file)

index 54d2f9e..0000000
--- a/org.glite.lb.client/src/connection.c
+++ /dev/null
@@ -1,261 +0,0 @@
-#ident "$Header$"
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netdb.h>
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/lb_gss.h"
-#include "glite/lb/mini_http.h"
-
-
-
-static void CloseConnection(edg_wll_Context ctx, int conn_index)
-{
-       /* close connection ad free its structures */
-       OM_uint32 min_stat;
-
-       edg_wll_gss_close(&ctx->connPool[conn_index].gss, &ctx->p_tmp_timeout);
-       if (ctx->connPool[conn_index].gsiCred) 
-               gss_release_cred(&min_stat, &ctx->connPool[conn_index].gsiCred);
-       free(ctx->connPool[conn_index].peerName);
-       free(ctx->connPool[conn_index].buf);
-       
-       memset(ctx->connPool + conn_index, 0, sizeof(edg_wll_ConnPool));
-       
-       /* if deleted conn was not the last one -> there is a 'hole' and then   */
-       /* 'shake' together connections in pool, no holes are allowed           */
-       if (conn_index < ctx->connOpened - 1) { 
-               ctx->connPool[conn_index] = ctx->connPool[ctx->connOpened - 1];
-               memset(ctx->connPool + ctx->connOpened  - 1 , 0, sizeof(edg_wll_ConnPool));
-       }
-       ctx->connOpened--;
-}
-
-
-
-static int ConnectionIndex(edg_wll_Context ctx, const char *name, int port)
-{
-       int i;
-
-        for (i=0; i<ctx->connOpened;i++) 
-               if (!strcmp(name, ctx->connPool[i].peerName) &&
-                   (port == ctx->connPool[i].peerPort)) return i;
-                                               
-       return -1;
-}
-
-
-
-static int AddConnection(edg_wll_Context ctx, char *name, int port)
-{
-       int index = ctx->connOpened;
-       
-       free(ctx->connPool[index].peerName);    // should be empty; just to be sure
-       ctx->connPool[index].peerName = strdup(ctx->srvName);
-       ctx->connPool[index].peerPort = ctx->srvPort;
-       ctx->connOpened++;
-
-       return index;
-}
-
-
-
-static void ReleaseConnection(edg_wll_Context ctx, char *name, int port)
-{
-       int i, index = 0;
-       long min;
-
-
-       if (ctx->connOpened == 0) return;       /* nothing to release */
-       
-       if (name) {
-               if ((index = ConnectionIndex(ctx, name, port)) >= 0)
-                       CloseConnection(ctx, index);
-       }
-       else {                                  /* free the oldest connection*/
-               min = ctx->connPool[0].lastUsed.tv_sec;
-               for (i=0; i<ctx->connOpened; i++) {
-                       if (ctx->connPool[i].lastUsed.tv_sec < min) {
-                               min = ctx->connPool[i].lastUsed.tv_sec;
-                               index = i;
-                       }
-               }
-               CloseConnection(ctx, index);
-       }
-}
-                       
-
-
-
-int edg_wll_close(edg_wll_Context ctx)
-{
-       edg_wll_ResetError(ctx);
-
-       CloseConnection(ctx, ctx->connToUse);
-               
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_open(edg_wll_Context ctx)
-{
-       int index;
-       edg_wll_GssStatus gss_stat;
-       
-
-       edg_wll_ResetError(ctx);
-
-       if ( (index = ConnectionIndex(ctx, ctx->srvName, ctx->srvPort)) == -1 ) {
-               /* no such open connection in pool */
-               if (ctx->connOpened == ctx->poolSize)
-                       ReleaseConnection(ctx, NULL, 0);
-               
-               index = AddConnection(ctx, ctx->srvName, ctx->srvPort);
-               
-       }
-       /* else - there is cached open connection, reuse it */
-       
-       ctx->connToUse = index;
-       
-       /* XXX support anonymous connections, perhaps add a flag to the connPool
-        * struct specifying whether or not this connection shall be authenticated
-        * to prevent from repeated calls to edg_wll_gss_acquire_cred_gsi() */
-       if (!ctx->connPool[index].gsiCred && 
-           edg_wll_gss_acquire_cred_gsi(
-              ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_cert_filename,
-              ctx->p_proxy_filename ? ctx->p_proxy_filename : ctx->p_key_filename,
-              &ctx->connPool[index].gsiCred, NULL, &gss_stat)) {
-           edg_wll_SetErrorGss(ctx, "failed to load GSI credentials", &gss_stat);
-           goto err;
-       }
-
-       if (ctx->connPool[index].gss.context == GSS_C_NO_CONTEXT) {     
-               switch (edg_wll_gss_connect(ctx->connPool[index].gsiCred,
-                               ctx->connPool[index].peerName, ctx->connPool[index].peerPort,
-                               &ctx->p_tmp_timeout,&ctx->connPool[index].gss,
-                               &gss_stat)) {
-               
-                       case EDG_WLL_GSS_OK: 
-                               goto ok;
-                       case EDG_WLL_GSS_ERROR_ERRNO:
-                               edg_wll_SetError(ctx,errno,"edg_wll_gss_connect()");
-                               break;
-                       case EDG_WLL_GSS_ERROR_GSS:
-                               edg_wll_SetErrorGss(ctx, "failed to authenticate to server", &gss_stat);
-                               break;
-                       case EDG_WLL_GSS_ERROR_HERRNO:
-                               { const char *msg1;
-                                 char *msg2;
-                                 msg1 = hstrerror(errno);
-                                 asprintf(&msg2, "edg_wll_gss_connect(): %s", msg1);
-                                 edg_wll_SetError(ctx,EDG_WLL_ERROR_DNS, msg2);
-                                 free(msg2);
-                               }
-                               break;
-                       case EDG_WLL_GSS_ERROR_EOF:
-                               edg_wll_SetError(ctx,ECONNREFUSED,"edg_wll_gss_connect():"
-                                              " server closed the connection, probably due to overload");
-                               break;
-                       case EDG_WLL_GSS_ERROR_TIMEOUT:
-                               edg_wll_SetError(ctx,ETIMEDOUT,"edg_wll_gss_connect()");
-                               break;
-               }
-       }
-       else goto ok;
-
-err:
-       /* some error occured; close created connection
-        * and free all fields in connPool[index] */
-       CloseConnection(ctx, index);
-ok:    
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-/* transform HTTP error code to ours */
-int http_check_status(
-       edg_wll_Context ctx,
-       char *response)
-
-{
-       int     code,len;
-
-       edg_wll_ResetError(ctx);
-       sscanf(response,"HTTP/%*f %n%d",&len,&code);
-       switch (code) {
-               case HTTP_OK: 
-                       break;
-               /* soft errors - some useful data may be returned too */
-               case HTTP_UNAUTH: /* EPERM */
-               case HTTP_NOTFOUND: /* ENOENT */
-               case HTTP_NOTIMPL: /* ENOSYS */
-               case HTTP_UNAVAIL: /* EAGAIN */
-               case HTTP_INVALID: /* EINVAL */
-                       break;
-               case EDG_WLL_GSS_ERROR_HERRNO:
-                        { const char *msg1;
-                          char *msg2;
-                          msg1 = hstrerror(errno);
-                          asprintf(&msg2, "edg_wll_gss_connect(): %s", msg1);
-                          edg_wll_SetError(ctx,EDG_WLL_ERROR_DNS, msg2);
-                          free(msg2);
-                        }
-                       break;
-               case HTTP_NOTALLOWED:
-                       edg_wll_SetError(ctx, ENXIO, "Method Not Allowed");
-                       break;
-               case HTTP_UNSUPPORTED:
-                       edg_wll_SetError(ctx, ENOTSUP, "Protocol versions incompatible");
-                       break;                                                          
-               case HTTP_INTERNAL:
-                       /* fall through */
-               default: 
-                       edg_wll_SetError(ctx,EDG_WLL_ERROR_SERVER_RESPONSE,response+len);
-       }
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_http_send_recv(
-       edg_wll_Context ctx,
-       char *request,
-       const char * const *req_head,
-       char *req_body,
-       char **response,
-       char ***resp_head,
-       char **resp_body)
-{
-       if (edg_wll_open(ctx)) return edg_wll_Error(ctx,NULL,NULL);
-       
-       switch (edg_wll_http_send(ctx,request,req_head,req_body)) {
-               case ENOTCONN:
-                       edg_wll_close(ctx);
-                       if (edg_wll_open(ctx)
-                               || edg_wll_http_send(ctx,request,req_head,req_body))
-                                       return edg_wll_Error(ctx,NULL,NULL);
-                       /* fallthrough */
-               case 0: break;
-               default: return edg_wll_Error(ctx,NULL,NULL);
-       }
-
-       if (edg_wll_http_recv(ctx,response,resp_head,resp_body) == ENOTCONN) {
-               edg_wll_close(ctx);
-               (void) (edg_wll_open(ctx)
-                       || edg_wll_http_send(ctx,request,req_head,req_body)
-                       || edg_wll_http_recv(ctx,response,resp_head,resp_body));
-       }
-       
-       gettimeofday(&ctx->connPool[ctx->connToUse].lastUsed, NULL);
-       
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.client/src/connection.h b/org.glite.lb.client/src/connection.h

deleted file mode 100644 (file)

index 99dd933..0000000
--- a/org.glite.lb.client/src/connection.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_CONNECTION_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_CONNECTION_H__
-
-#ident "$Header"
-
-int edg_wll_close(edg_wll_Context ctx);
-int edg_wll_open(edg_wll_Context ctx);
-int edg_wll_http_send_recv(edg_wll_Context, char *, const char * const *, char *, char **, char ***, char **);
-int http_check_status(edg_wll_Context, char *);
-
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_CONNECTION_H__ */
diff --git a/org.glite.lb.client/src/consumer.c b/org.glite.lb.client/src/consumer.c

deleted file mode 100644 (file)

index 054d9fe..0000000
--- a/org.glite.lb.client/src/consumer.c
+++ /dev/null
@@ -1,428 +0,0 @@
-#ident "$Header$"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <assert.h>
-
-#include <expat.h>
-
-#include "globus_config.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/mini_http.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/xml_conversions.h"
-
-#include "connection.h"
-
-static const char* const request_headers[] = {
-       "Cache-Control: no-cache",
-       "Accept: application/x-dglb",
-       "User-Agent: edg_wll_Api/" PROTO_VERSION "/" COMP_PROTO,
-       "Content-Type: application/x-dglb",
-       NULL
-};
-
-int set_server_name_and_port(edg_wll_Context, const edg_wll_QueryRec **);
-
-int edg_wll_QueryEventsExt(
-               edg_wll_Context ctx,
-               const edg_wll_QueryRec **job_conditions,
-               const edg_wll_QueryRec **event_conditions,
-               edg_wll_Event **eventsOut)
-{
-       int     error           = 0;
-       char    *response       = NULL,
-               *message        = NULL,
-               *send_mess      = NULL;
-
-       edg_wll_ResetError(ctx);
-
-       if ( edg_wll_QueryEventsRequestToXML(ctx, job_conditions, event_conditions, &send_mess) != 0 )
-       {
-               edg_wll_SetError(ctx , (edg_wll_ErrorCode) EINVAL, "Invalid query record.");
-               goto err;
-       }
-
-       if ((error = set_server_name_and_port(ctx,job_conditions)))
-               goto err; // XXX is it fatal??
-
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-       error = edg_wll_http_send_recv(ctx, "POST /queryEvents HTTP/1.1",request_headers,send_mess,
-                                                                 &response,NULL,&message);
-       if ( error != 0 )
-               goto err;
-
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseQueryEvents(ctx,message,eventsOut);
-
-err:
-       free(response);
-       free(message);
-       free(send_mess);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_QueryEvents(
-               edg_wll_Context ctx,
-               const edg_wll_QueryRec *job_conditions,
-               const edg_wll_QueryRec *event_conditions,
-               edg_wll_Event **eventsOut)
-{
-       edg_wll_QueryRec        **jconds = NULL,
-                               **econds = NULL;
-       int                     i,
-                               njconds, neconds,
-                               ret;
-
-       if ( job_conditions )
-       {
-               for ( njconds = 0; job_conditions[njconds].attr != EDG_WLL_QUERY_ATTR_UNDEF ; njconds++ )
-                       ;
-               jconds = (edg_wll_QueryRec **) calloc(njconds+1, sizeof(edg_wll_QueryRec *));
-               for ( i = 0; i < njconds; i++ )
-               {
-                       jconds[i] = (edg_wll_QueryRec *) calloc(2, sizeof(edg_wll_QueryRec));
-                       jconds[i][0] = job_conditions[i];
-               }
-       }
-
-       if ( event_conditions )
-       {
-               for ( neconds = 0; event_conditions[neconds].attr != EDG_WLL_QUERY_ATTR_UNDEF ; neconds++ )
-                       ;
-               econds = (edg_wll_QueryRec **) calloc(neconds+1, sizeof(edg_wll_QueryRec *));
-               for ( i = 0; i < neconds; i++ )
-               {
-                       econds[i] = (edg_wll_QueryRec *) calloc(2, sizeof(edg_wll_QueryRec));
-                       econds[i][0] = event_conditions[i];
-               }
-       }
-
-       if ( econds && jconds )
-               ret = edg_wll_QueryEventsExt(ctx, (const edg_wll_QueryRec **) jconds, 
-                                   (const edg_wll_QueryRec **) econds, eventsOut);
-       if ( econds && !jconds )
-               ret = edg_wll_QueryEventsExt(ctx, NULL, (const edg_wll_QueryRec **) econds, eventsOut);
-       if ( !econds && jconds )
-               ret = edg_wll_QueryEventsExt(ctx, (const edg_wll_QueryRec **) jconds, NULL, eventsOut);
-       if ( !econds && !jconds )
-               ret = edg_wll_QueryEventsExt(ctx, NULL, NULL, eventsOut);
-
-       if ( jconds )
-       {
-               for ( i = 0; i < njconds ; i++ )
-                       free(jconds[i]);
-               free(jconds);
-       }
-       if ( econds )
-       {
-               for ( i = 0; i < neconds ; i++ )
-                       free(econds[i]);
-               free(econds);
-       }
-
-       return ret;
-}
-
-
-int edg_wll_QueryJobsExt(
-               edg_wll_Context         ctx,
-               const edg_wll_QueryRec **        conditions,
-               int                     flags,
-               edg_wlc_JobId **        jobsOut,
-               edg_wll_JobStat **      statesOut)
-{
-       char                    *response = NULL, *message = NULL, *send_mess = NULL;
-       
-       edg_wll_ResetError(ctx);
-
-       if (!jobsOut)   flags |= EDG_WLL_STAT_NO_JOBS;
-       if (!statesOut) {flags = 0; flags |= EDG_WLL_STAT_NO_STATES;}
-       if (edg_wll_QueryJobsRequestToXML(ctx, conditions, flags, &send_mess) != 0) {
-               edg_wll_SetError(ctx , (edg_wll_ErrorCode) EINVAL, "Invalid query record.");
-               goto err;
-       }
-
-       if (set_server_name_and_port(ctx, conditions))
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-
-       if (edg_wll_http_send_recv(ctx, "POST /queryJobs HTTP/1.1",request_headers,send_mess,
-                       &response,NULL,&message)) 
-               goto err;
-         
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseQueryJobs(ctx,message,jobsOut,statesOut);
-
-err:
-       free(response);
-       free(message);
-       free(send_mess);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_QueryJobs(
-               edg_wll_Context         ctx,
-               const edg_wll_QueryRec *        conditions,
-               int                     flags,
-               edg_wlc_JobId **        jobsOut,
-               edg_wll_JobStat **      statesOut)
-{
-       edg_wll_QueryRec        **conds;
-       int                     i, nconds, ret;
-
-       if ( !conditions )
-               return edg_wll_QueryJobsExt(ctx, NULL, flags, jobsOut, statesOut);
-
-       for ( nconds = 0; conditions[nconds].attr != EDG_WLL_QUERY_ATTR_UNDEF ; nconds++ )
-               ;
-       conds = (edg_wll_QueryRec **) malloc((nconds+1) * sizeof(edg_wll_QueryRec *));
-       conds[nconds] = NULL;
-       for ( i = 0; i < nconds ; i++ )
-       {
-               conds[i] = (edg_wll_QueryRec *) malloc(2 * sizeof(edg_wll_QueryRec));
-               conds[i][0] = conditions[i];
-               conds[i][1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-       }
-
-       ret = edg_wll_QueryJobsExt(ctx, (const edg_wll_QueryRec **) conds, flags, jobsOut, statesOut);
-
-       for ( i = 0; i < nconds ; i++ )
-               free(conds[i]);
-       free(conds);
-               
-
-       return ret;
-}
-
-
-
-int edg_wll_GetIndexedAttrs(
-        edg_wll_Context         ctx,
-        edg_wll_QueryRec       ***attrs)
-{      
-       char                    *response = NULL, *send_mess = NULL, *message = NULL;
-       
-       edg_wll_ResetError(ctx);
-
-       edg_wll_IndexedAttrsRequestToXML(ctx, &send_mess);
-       
-       if (set_server_name_and_port(ctx, NULL))
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-
-       if (edg_wll_http_send_recv(ctx, "POST /indexedAttrs HTTP/1.1",request_headers, send_mess,
-                       &response,NULL,&message)) 
-               goto err;
-         
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseIndexedAttrs(ctx,message,attrs);
-
-err:
-       free(response);
-       free(message);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-/* 
- * wrappers around edg_wll_Query()
- */
-
-int edg_wll_UserJobs(
-               edg_wll_Context ctx,
-               edg_wlc_JobId **jobsOut,
-               edg_wll_JobStat **statesOut)
-{
-       edg_wll_QueryRec        j[2];
-       
-       memset(j,0,sizeof j);
-       
-       j[0].attr = EDG_WLL_QUERY_ATTR_OWNER;
-       j[0].op = EDG_WLL_QUERY_OP_EQUAL;
-       j[0].value.c = ctx->peerName;
-       
-       return edg_wll_QueryJobs(ctx,j,0,jobsOut,statesOut);
-}
-
-int edg_wll_JobLog(
-       edg_wll_Context ctx,
-       edg_wlc_JobId   job,
-       edg_wll_Event **eventsOut)
-{
-       edg_wll_QueryRec        j[2], e[2];
-
-       memset(j,0,sizeof j);
-       memset(e,0,sizeof e);
-
-       j[0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-       j[0].op = EDG_WLL_QUERY_OP_EQUAL;
-       j[0].value.j = job;
-
-       e[0].attr = EDG_WLL_QUERY_ATTR_LEVEL;
-       e[0].op = EDG_WLL_QUERY_OP_LESS;
-       e[0].value.i = ctx->p_level + 1;
-
-       return edg_wll_QueryEvents(ctx,j,e,eventsOut);
-}
-
-int edg_wll_JobStatus(
-                edg_wll_Context ctx,
-                edg_wlc_JobId job,
-                int flags,
-                edg_wll_JobStat *stat)
-{
-       edg_wll_QueryRec        j[2];
-       edg_wll_JobStat         *statesOut = NULL;
-       int                     ret;
-
-       memset(j,0,sizeof j);
-
-       j[0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-       j[0].op = EDG_WLL_QUERY_OP_EQUAL;
-       j[0].value.j = job;
-       j[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-       ret = edg_wll_QueryJobs(ctx,j,flags,NULL,&statesOut);
-
-       if (ret) return ret;
-
-       if (statesOut) {
-               if (statesOut[0].state == EDG_WLL_JOB_UNDEF) {
-                       memcpy(stat, statesOut, sizeof(edg_wll_JobStat));
-                       free(statesOut);        
-                       ret = edg_wll_SetError(ctx , (edg_wll_ErrorCode) ENOENT, "Query returned no result.");
-               }
-               else {
-                       /* check wheter there is only one field in status reply */
-                       assert(statesOut[1].state == EDG_WLL_JOB_UNDEF);
-                       /* copy only 1st status */
-                       memcpy(stat, statesOut, sizeof(edg_wll_JobStat));
-                       /* release only array of states, keep all links unfreed for the previous copy */
-                       free(statesOut);
-               }
-       }
-
-       return ret;
-}
-
-
-       
-int edg_wll_QueryListener(edg_wll_Context ctx, edg_wlc_JobId job, const char *name, char** host, uint16_t *port) {
-
-       int             i;
-       edg_wll_Event           *events = NULL;
-       int             errCode = 0;
-        edg_wll_QueryRec    jr[2],er[2];
-       int             found = 0;
-
-       memset(jr,0,sizeof jr);
-       memset(er,0,sizeof er);
-        jr[0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-        jr[0].op = EDG_WLL_QUERY_OP_EQUAL;
-        jr[0].value.j = job;
-
-        er[0].attr = EDG_WLL_QUERY_ATTR_EVENT_TYPE;
-        er[0].op = EDG_WLL_QUERY_OP_EQUAL;
-        er[0].value.i = EDG_WLL_EVENT_LISTENER;
-
-        if (edg_wll_QueryEvents(ctx, jr, er, &events)) {
-               return edg_wll_Error(ctx, NULL, NULL);
-       }               
-       
-       for (i=0; events[i].type != EDG_WLL_EVENT_UNDEF; i++) {
-               if (!strcmp(name, events[i].listener.svc_name)) {
-                       found = 1;
-                       if (host != NULL)
-                               *host = strdup(events[i].listener.svc_host);
-                       if (port != NULL)
-                               *port = events[i].listener.svc_port;
-               }
-               edg_wll_FreeEvent(&events[i]);
-       }
-       free(events);
-       
-       if (!found)
-               errCode = ENOENT;
-
-       return edg_wll_SetError(ctx, errCode, NULL);
-}
-
-
-
-int set_server_name_and_port(edg_wll_Context ctx, const edg_wll_QueryRec **job_conditions)
-{
-       int                             i = 0, j,
-                                       found = 0,
-                                       error = 0;
-       int                             srvPort = 0,
-                                       srvPortTmp;
-       char               *srvName = NULL,
-                                  *srvNameTmp;
-
-
-       if ( job_conditions ) for ( j = 0; job_conditions[j]; j++ )
-               for ( i = 0; (job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                       if ( job_conditions[j][i].attr == EDG_WLL_QUERY_ATTR_JOBID)
-                       {
-                               edg_wlc_JobIdGetServerParts(job_conditions[j][i].value.j,&srvNameTmp,&srvPortTmp);
-                               if ( found )
-                               {
-                                       if ( strcmp(srvName, srvNameTmp) || (srvPort != srvPortTmp) )
-                                       {
-                                               free(srvNameTmp); free(srvName);
-                                               return edg_wll_SetError(ctx, EINVAL, "Two different servers specifieed in one query");
-                                       }
-                                       free(srvNameTmp);
-                               }
-                               else
-                               {
-                                       srvName = srvNameTmp;
-                                       srvPort = srvPortTmp;
-                                       found = 1;
-                               }
-                       }       
-
-       if ( found && !ctx->p_query_server_override)
-       { 
-               if (!ctx->srvName)
-               {
-                       ctx->srvName = strdup(srvName);
-                       ctx->srvPort = srvPort;
-                       free(srvName);
-               }
-               else if (strcmp(srvName, ctx->srvName) || (srvPort != ctx->srvPort))
-               {
-                       free(ctx->srvName);
-                       ctx->srvName = strdup(srvName);
-                       ctx->srvPort = srvPort;
-                       free(srvName);
-               }
-       }
-       else if ( !ctx->srvName || !ctx->srvPort )
-       {
-               if (!ctx->p_query_server) 
-                       return(edg_wll_SetError(ctx, (edg_wll_ErrorCode) EINVAL, "Hostname of server to query is not set"));
-               else ctx->srvName = strdup(ctx->p_query_server);
-               if (!ctx->p_query_server_port)
-                       return(edg_wll_SetError(ctx, (edg_wll_ErrorCode) EINVAL, "Port of server to query is not set"));
-               else ctx->srvPort = ctx->p_query_server_port;
-       }
-               
-       return(error);
-}
diff --git a/org.glite.lb.client/src/dump.c b/org.glite.lb.client/src/dump.c

deleted file mode 100644 (file)

index f172192..0000000
--- a/org.glite.lb.client/src/dump.c
+++ /dev/null
@@ -1,230 +0,0 @@
-#ident "$Header$"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include <globus_common.h>
-
-#define CLIENT_SBIN_PROG
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/ulm_parse.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/mini_http.h"
-
-
-#define dprintf(x) { if (debug) printf x; }
-
-static const char rcsid[] = "@(#)$Id$";
-
-static int debug=0;
-
-static void printerr(edg_wll_Context ctx);
-
-static struct option opts[] = {
-       { "from",               required_argument, NULL, 'f'},
-       { "to",                 required_argument, NULL, 't'},
-       { "help",               no_argument, NULL, 'h' },
-       { "version",            no_argument, NULL, 'v' },
-       { "debug",              no_argument, NULL, 'd' },
-       { "server",             required_argument, NULL, 'm' },
-       { NULL,                 no_argument, NULL,  0 }
-};
-
-static void usage(char *me)
-{
-       fprintf(stderr,"usage: %s [option]\n"
-               "       -f, --from YYYYMMDDHHmmss   beginning of the time interval for events to be dumped\n"
-               "       -t, --to YYYYMMDDHHmmss     end of the time interval for events to be dumped\n"
-               "       -h, --help                  display this help\n"
-               "       -v, --version               display version\n"
-               "       -d, --debug                 diagnostic output\n"
-               "       -m, --server                L&B server machine name\n",
-               me);
-}
-
-int main(int argc,char *argv[])
-{
-       edg_wll_DumpRequest *request;
-       edg_wll_DumpResult *result;
-       char *server = NULL;
-       char date[ULM_DATE_STRING_LENGTH+1];
-
-       char *me;
-       int opt;
-       edg_wll_Context ctx;
-
-       /* initialize request to server defaults */
-       request = (edg_wll_DumpRequest *) calloc(1,sizeof(edg_wll_DumpRequest));
-       request->from = EDG_WLL_DUMP_LAST_END;
-       request->to = EDG_WLL_DUMP_NOW;
-
-       /* initialize result */
-       result = (edg_wll_DumpResult *) calloc(1,sizeof(edg_wll_DumpResult));
-
-       me = strrchr(argv[0],'/');
-       if (me) me++; else me=argv[0];
-
-       /* get arguments */
-       while ((opt = getopt_long(argc,argv,"f:t:m:dvh",opts,NULL)) != EOF) {
-
-               switch (opt) {
-
-               case 'f': request->from = (time_t) edg_wll_ULMDateToDouble(optarg); break;
-               case 't': request->to = (time_t) edg_wll_ULMDateToDouble(optarg); break;
-               case 'm': server = optarg; break;
-               case 'd': debug = 1; break;
-               case 'v': fprintf(stdout,"%s:\t%s\n",me,rcsid); exit(0);
-               case 'h':
-               case '?': usage(me); return 1;
-               }
-       }
-
-       /* Initialize Globus common module */
-       dprintf(("Initializing Globus common module..."));
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               dprintf(("no.\n"));
-               fprintf(stderr,"Unable to initialize Globus common module\n");
-       } else {
-               dprintf(("yes.\n"));
-       }
-
-       /* check request */
-       if (debug) {
-               printf("Dump request:\n");
-               if (request->from < 0) {
-                       printf("- from: %ld.\n",request->from);
-               } else {
-                       if (edg_wll_ULMTimevalToDate(request->from,0,date) != 0) {
-                               fprintf(stderr,"Error parsing 'from' argument.\n");
-                               goto main_end;
-                       }
-                       printf("- from: %ld (i.e. %s).\n",request->from,date);
-               }
-               if (request->to < 0) {
-                       printf("- to: %ld.\n",request->to);
-               } else {
-                       if (edg_wll_ULMTimevalToDate(request->to,0,date) != 0) {
-                               fprintf(stderr,"Error parsing 'to' argument.\n");
-                               goto main_end;
-                       }
-                       printf("- to: %ld (i.e. %s).\n",request->to,date);
-               }
-       }
-
-       /* initialize context */
-       edg_wll_InitContext(&ctx);
-       if ( server )
-       {
-               char *p = strchr(server, ':');
-               if ( p )
-               {
-                       edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER_PORT, atoi(p+1));
-                       *p = 0;
-               }
-               edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER, server);
-       }
-
-       /* that is the DumpEvents */
-       dprintf(("Running the edg_wll_DumpEvents...\n"));
-       if (edg_wll_DumpEvents(ctx, request, result) != 0) {
-               fprintf(stderr,"Error running the edg_wll_DumpEvents().\n");
-               printerr(ctx);
-               switch ( edg_wll_Error(ctx, NULL, NULL) )
-               {
-               case ENOENT:
-               case EPERM:
-               case EINVAL:
-                       break;
-               default:
-                       goto main_end;
-               }
-       }
-
-       /* examine the result */
-       dprintf(("Examining the result of edg_wll_DumpEvents...\n"));
-       printf("Dump result:\n");
-       if (result->server_file) {
-               printf("- The jobs were dumped to the file '%s' at the server.\n",result->server_file);
-       } else {
-               printf("- The jobs were not dumped.\n");
-       }
-       if (edg_wll_ULMTimevalToDate(result->from,0,date) != 0) {
-               fprintf(stderr,"Error parsing 'from' argument.\n");
-               goto main_end;
-       }
-       printf("- from: %ld (i.e. %s).\n",result->from,date);
-       if (edg_wll_ULMTimevalToDate(result->to,0,date) != 0) {
-               fprintf(stderr,"Error parsing 'to' argument.\n");
-               goto main_end;
-       }
-       printf("- to: %ld (i.e. %s).\n",result->to,date);
-
-main_end:
-       dprintf(("End.\n"));
-       if (request) free(request);
-       if (result) free(result);
-       edg_wll_FreeContext(ctx);
-       return 0;
-}
-
-
-static void printerr(edg_wll_Context ctx) 
-{
-       char    *errt,*errd;
-
-       edg_wll_Error(ctx,&errt,&errd);
-       fprintf(stderr,"%s (%s)\n",errt,errd);
-}
-
-
-static const char* const request_headers[] = {
-       "Cache-Control: no-cache",
-       "Accept: application/x-dglb",
-       "User-Agent: edg_wll_Api/" PROTO_VERSION "/" COMP_PROTO,
-       "Content-Type: application/x-dglb",
-       NULL
-};
-
-int edg_wll_DumpEvents(
-               edg_wll_Context ctx,
-               const edg_wll_DumpRequest *request,
-               edg_wll_DumpResult *result)
-{
-       int     error;
-       char    *send_mess,
-               *response = NULL,
-               *recv_mess = NULL;
-
-       edg_wll_DumpRequestToXML(ctx, request, &send_mess);
-
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-       if (ctx->p_tmp_timeout.tv_sec < 600) ctx->p_tmp_timeout.tv_sec = 600;
-
-       if (set_server_name_and_port(ctx, NULL))
-               goto edg_wll_dumpevents_end;
-
-       error = edg_wll_http_send_recv(ctx,
-                       "POST /dumpRequest HTTP/1.1", request_headers, send_mess,
-                       &response, NULL, &recv_mess);
-       if ( error != 0 )
-               goto edg_wll_dumpevents_end;
-
-       if (http_check_status(ctx, response, &recv_mess))
-               goto edg_wll_dumpevents_end;
-
-       edg_wll_ParseDumpResult(ctx, recv_mess, result);
-
-edg_wll_dumpevents_end:
-       if (response) free(response);
-       if (recv_mess) free(recv_mess);
-       if (send_mess) free(send_mess);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.client/src/load.c b/org.glite.lb.client/src/load.c

deleted file mode 100644 (file)

index ce18d03..0000000
--- a/org.glite.lb.client/src/load.c
+++ /dev/null
@@ -1,207 +0,0 @@
-#ident "$Header$"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include <globus_common.h>
-
-#define CLIENT_SBIN_PROG
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/load.h"
-#include "glite/lb/ulm_parse.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/mini_http.h"
-
-#define dprintf(x) { if (debug) printf x; }
-
-static const char rcsid[] = "@(#)$Id$";
-
-static int debug=0;
-
-static void printerr(edg_wll_Context ctx);
-
-static struct option opts[] = {
-       { "file",               required_argument, NULL, 'f'},
-       { "help",               no_argument, NULL, 'h' },
-       { "version",            no_argument, NULL, 'v' },
-       { "debug",              no_argument, NULL, 'd' },
-       { "server",             required_argument, NULL, 'm' },
-       { NULL,                 no_argument, NULL,  0 }
-};
-
-static void usage(char *me)
-{
-       fprintf(stderr,"usage: %s [option]\n"
-               "       -m, --server                L&B server machine name\n"
-               "       -f, --file filename         file with dumped data to be loaded\n"
-               "       -h, --help                  display this help\n"
-               "       -v, --version               display version\n"
-               "       -d, --debug                 diagnostic output\n",
-               me);
-}
-
-int main(int argc,char *argv[])
-{
-       edg_wll_LoadRequest *request;
-       edg_wll_LoadResult *result;
-       char *server = NULL;
-       char date[ULM_DATE_STRING_LENGTH+1];
-
-       char *me;
-       int opt;
-       edg_wll_Context ctx;
-
-       /* initialize request to server defaults */
-       request = (edg_wll_LoadRequest *) calloc(1,sizeof(edg_wll_LoadRequest));
-       request->server_file = NULL;
-
-       /* initialize result */
-       result = (edg_wll_LoadResult *) calloc(1,sizeof(edg_wll_LoadResult));
-
-       me = strrchr(argv[0],'/');
-       if (me) me++; else me=argv[0];
-
-       /* get arguments */
-       while ((opt = getopt_long(argc,argv,"f:t:m:dvh",opts,NULL)) != EOF) {
-
-               switch (opt) {
-
-               case 'f': request->server_file = optarg; break;
-               case 'm': server = optarg; break;
-               case 'd': debug = 1; break;
-               case 'v': fprintf(stdout,"%s:\t%s\n",me,rcsid); exit(0);
-               case 'h':
-               case '?': usage(me); return 1;
-               }
-       }
-
-       /* Initialize Globus common module */
-       dprintf(("Initializing Globus common module..."));
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               dprintf(("no.\n"));
-               fprintf(stderr,"Unable to initialize Globus common module\n");
-       } else {
-               dprintf(("yes.\n"));
-       }
-
-       /* initialize context */
-       edg_wll_InitContext(&ctx);
-       if ( server )
-       {
-               char *p = strchr(server, ':');
-               if ( p )
-               {
-                       edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER_PORT, atoi(p+1));
-                       *p = 0;
-               }
-               edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER, server);
-       }
-
-       /* check request */
-       if (debug) {
-               printf("Load request:\n");
-               if (request->server_file) {
-                       printf("- server_file: %s.\n",request->server_file);
-               } else {
-                       printf("- server_file: not specified.\n");
-               }
-       }
-
-       /* that is the LoadEvents */
-       dprintf(("Running the edg_wll_LoadEvents...\n"));
-       if (edg_wll_LoadEvents(ctx, request, result) != 0) {
-               fprintf(stderr,"Error running the edg_wll_LoadEvents().\n");
-               printerr(ctx);
-               if ( !result->server_file )
-                       goto main_end;
-       }
-
-       /* examine the result */
-       dprintf(("Examining the result of edg_wll_LoadEvents...\n"));
-       printf("Load result:\n");
-       if (result->server_file)
-               printf("- Unloaded events were stored into the server file '%s'.\n", result->server_file);
-       if (edg_wll_ULMTimevalToDate(result->from,0,date) != 0) {
-               fprintf(stderr,"Error parsing 'from' argument.\n");
-               goto main_end;
-       }
-       printf("- from: %ld (i.e. %s).\n",result->from,date);
-       if (edg_wll_ULMTimevalToDate(result->to,0,date) != 0) {
-               fprintf(stderr,"Error parsing 'to' argument.\n");
-               goto main_end;
-       }
-       printf("- to: %ld (i.e. %s).\n",result->to,date);
-
-main_end:
-       dprintf(("End.\n"));
-       if (request) free(request);
-       if (result)
-       {
-               if (result->server_file)
-                       free(result->server_file);
-               free(result);
-       }
-       edg_wll_FreeContext(ctx);
-       return 0;
-}
-
-
-static void printerr(edg_wll_Context ctx) 
-{
-       char    *errt,*errd;
-
-       edg_wll_Error(ctx,&errt,&errd);
-       fprintf(stderr,"%s (%s)\n",errt,errd);
-}
-
-
-static const char* const request_headers[] = {
-       "Cache-Control: no-cache",
-       "Accept: application/x-dglb",
-       "User-Agent: edg_wll_Api/" PROTO_VERSION "/" COMP_PROTO,
-       "Content-Type: application/x-dglb",
-       NULL
-};
-
-int edg_wll_LoadEvents(
-               edg_wll_Context ctx,
-               const edg_wll_LoadRequest *request,
-               edg_wll_LoadResult *result)
-{
-       int     error;
-       char    *send_mess,
-               *response = NULL,
-               *recv_mess = NULL;
-
-       edg_wll_LoadRequestToXML(ctx, request, &send_mess);
-
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-       if (ctx->p_tmp_timeout.tv_sec < 600) ctx->p_tmp_timeout.tv_sec = 600;
-
-       if (set_server_name_and_port(ctx, NULL))
-               goto edg_wll_loadevents_end;
-
-       error = edg_wll_http_send_recv(ctx,
-                       "POST /loadRequest HTTP/1.1", request_headers, send_mess,
-                       &response, NULL, &recv_mess);
-       if ( error != 0 )
-               goto edg_wll_loadevents_end;
-
-       if (http_check_status(ctx, response, &recv_mess))
-               goto edg_wll_loadevents_end;
-
-       edg_wll_ParseLoadResult(ctx, recv_mess, result);
-
-edg_wll_loadevents_end:
-       if (response) free(response);
-       if (recv_mess) free(recv_mess);
-       if (send_mess) free(send_mess);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.client/src/logevent.c.T b/org.glite.lb.client/src/logevent.c.T

deleted file mode 100644 (file)

index df0a2f3..0000000
--- a/org.glite.lb.client/src/logevent.c.T
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-@@@AUTO
-*/
-
-@@@LANG: C
-
-#ident "$Header$"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <math.h> // log
-#include <ctype.h> // isspace
-
-#include <globus_common.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/notifid.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/events.h"
-
-#include "args.h"
-
-    //"    %s -p -l 100000 -j https://localhost/First_JobIV?localhost:7771 -s UserInterface -e jobAbort DG.JOB.ABORT.REASON=\"oops\"\n\n",
-
-// undefine to disable support for -l option
-#define ENABLE_REASON_LENGTH
-
-int main(int argc, char *argv[])
-{
-       char    /* *fmt,*fname = NULL,*/ *fmt_arg=NULL;
-        char* server = NULL,*code = NULL;
-       char*   ff = NULL,*jobid_s = NULL;
-       char    *src_instance = NULL;
-       int     err = 0/*,i,done = 0,fmtlen*/;
-       int     pri = 0;
-        int deb = 0;
-#ifdef ENABLE_REASON_LENGTH
-       int     elength = 0;
-#endif
-       edg_wll_Context ctx;
-        edg_wll_Source src;
-       edg_wll_EventCode event = EDG_WLL_EVENT_UNDEF;
-       edg_wlc_JobId jobid = 0;
-        int (*logev)(edg_wll_Context context,
-                    edg_wll_EventCode event,
-                    char *fmt, ...);
-
-@@@{
-    my %vars = ();
-    for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-              $event->getTypes) {
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-           my $f = selectField $event $_;
-           my $fn = $f->getName;
-           my $type = {
-               "type" => $f->getType,
-               "defval" => $f->getDefaultNullValue
-           };
-
-           $type = { type=>'char *',defval=>'NULL' } if $f->{codes};
-
-           $vars{$fn} = $type;
-       }
-    }
-    foreach $name ( sort keys %vars ) {
-       gen qq{\t$vars{$name}->{"type"} $name = $vars{$name}->{"defval"};\n};
-    }
-@@@}
-
-       edg_wll_Args parray[] = {
-           { EDG_WLL_ARGS_EVENT, "e", "event", "select event type (see -e help)", &event },
-           { EDG_WLL_ARGS_BOOL, "p", "priority", "send as priority event", &pri },
-           { EDG_WLL_ARGS_STRING, "m", "machine", 0, &server },
-           { EDG_WLL_ARGS_SOURCE, "s", "source", "event source (see -s help)", &src },
-           { EDG_WLL_ARGS_STRING, "i", "source-instance", "event source instance", &src_instance },
-           { EDG_WLL_ARGS_STRING, "j", "jobid", "JobId", &jobid_s },
-           { EDG_WLL_ARGS_STRING, "c", "sequence", "event sequence code", &code },
-           { EDG_WLL_ARGS_BOOL, "d", "debug mode", "enable debug mode", &deb },
-#ifdef ENABLE_REASON_LENGTH
-           { EDG_WLL_ARGS_INT, "l", "reason-length", "extend 'reason' string to length (debug only)", &elength, 0, 1000000000 },
-#endif
-@@@{
-    my %typetab = (
-       "char *", "EDG_WLL_ARGS_STRING",
-       "int", "EDG_WLL_ARGS_INT",
-       "edg_wlc_JobId", "EDG_WLL_ARGS_JOBID",
-       "edg_wll_NotifId", "EDG_WLL_ARGS_NOTIFID",
-       "edg_wll_Source", "EDG_WLL_ARGS_SOURCE",
-       "uint16_t", "EDG_WLL_ARGS_UINT16"
-                 );
-    my %vars = ();
-    for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-              $event->getTypes) {
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-           my $f = selectField $event $_;
-            my $ft = $f->{codes} ? 'char *' : $f->getType;
-           my $fn = $f->getName;
-           my $fc = $f->getComment;
-           $namehelp = { "type" => $ft, "help" => $fc };
-#         gen qq{ $fn $ft $fc \n};
-          $vars{$fn} = $namehelp;
-       }
-    }
-    foreach $name ( sort keys %vars ) {
-#      gen qq{ $vars{$name} $name \n };
-       gen qq{\t    \{ $typetab{$vars{$name}->{"type"}}, 0, "$name", "$vars{$name}->{"help"}", &$name \},\n};
-    }
-
-@@@}
-           { EDG_WLL_ARGS_HELP },
-           { EDG_WLL_ARGS_NONE },
-       };
-       edg_wll_ParseArgs(&argc, argv, parray,
-                         "Usage: %s [-d] [-p] [-l eventlen] [-j dg_jobid]"
-                         "[-s source_id] -e event [key=value ...]");
-
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               fprintf(stderr, "Cannot initialize Globus common module\n");
-               exit(1);
-       }
-
-       edg_wll_InitContext(&ctx);
-
-       /* log the event - priority/normal */
-       logev = (pri) ? edg_wll_LogEventSync : edg_wll_LogEvent;
-
-        /* if no job gived - generate some */
-       if (jobid_s == 0) {
-               const char* s;
-               if (!server) {
-                   s = "localhost";
-                   err = 1; // result fail if used normaly
-               } else
-                   s = server;
-               edg_wlc_JobIdCreate(s, 0, &jobid);
-               jobid_s = edg_wlc_JobIdUnparse(jobid);
-               fprintf(stderr, "JobId not given: created %s (server: %s)\n",jobid_s, s);
-       }
-       else if ((errno = edg_wlc_JobIdParse(jobid_s,&jobid))) {
-               perror(jobid_s);
-               exit(1);
-       }
-
-       if (event == EDG_WLL_EVENT_UNDEF) {
-               fprintf(stderr,"%s: unknown or unspecified event\n",argv[0]);
-               exit(1);
-       }
-       edg_wll_SetParam(ctx, EDG_WLL_PARAM_SOURCE, src);
-       if (src_instance) edg_wll_SetParam(ctx, EDG_WLL_PARAM_INSTANCE, src_instance);
-       edg_wll_SetParam(ctx, EDG_WLL_PARAM_LEVEL,
-                        (deb) ? EDG_WLL_LEVEL_DEBUG : EDG_WLL_LEVEL_SYSTEM);
-
-       if (edg_wll_SetLoggingJob(ctx,jobid,code,EDG_WLL_SEQ_NORMAL)) {
-               char    *et,*ed;
-               edg_wll_Error(ctx,&et,&ed);
-               fprintf(stderr,"SetLoggingJob(%s,%s): %s (%s)\n",jobid_s,code,et,ed);
-               exit(1);
-       }
-
-#ifdef ENABLE_REASON_LENGTH
-       if (elength > 200000000) {
-               fprintf(stderr,"%s: usupported reason message length: %d\n", argv[0], elength);
-       } else if (elength > 0) {
-               int d;
-               int i = 0;
-               reason = realloc(reason, elength + 1);
-                reason[elength] = 0;
-               while (i < (elength)) {
-                        if ((i % 20) == 0 && (i + 14) < elength)
-                               i += sprintf(reason + i, "%d", i);
-                       reason[i++] = '.';
-               }
-               // amount of decimal digits + "end="
-                d = (int)ceil(log(i)/log(10)) + 5;
-               if (i > d)
-                       sprintf(reason + i - (int)(d), "end=%d",i);
-               reason[i] = 0;
-       }
-#endif
-#if 0
-       if (fname) {
-               FILE *f = fopen(fname,"r");
-               long s;
-                size_t r;
-
-               fmt = "%s FILE.CONTENT=\"%|Us\" ";
-
-               if (!f) { perror(fname); return 1; }
-               fseek(f,0L,SEEK_END);
-               s = ftell(f); rewind(f);
-               ff = (char *) malloc(s+1); if (!ff) { perror(NULL); return 0; }
-               r = fread(ff,1,s,f);
-               printf("%s: read %d\n",fname,r);
-               ff[s] = 0;
-               fclose(f);
-       }
-       else
-               fmt = "%s ";
-#endif
-
-       //err = edg_wll_LogEvent(ctx, event, fmt, fmt_arg, ff);
-
-       switch (event)
-       {
-@@@{
-$indent = "\t";
-    for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-              $event->getTypes) {
-
-        my $tu = uc $t;
-       gen $indent."case EDG_WLL_EVENT_$tu :\n";
-
-       selectType $event $t;
-       my $argl = "";
-       for ($event->getFieldsOrdered) {
-           my $f = selectField $event $_;
-           my $fn = $f->getName;
-           my $ft;
-
-#          gen {  $fn  $f->{codes} };
-           if ($f->{codes}) {
-#                        $ft = "enum edg_wll\_$t" . ucfirst $fn;
-               $ft = "char *";
-           } else {
-               $ft = $f->getType;
-           }
-
-           $fn = $f->getType()."ToString($fn)" if $ULMasString{$f->{type}};
-
-           $argl = $argl . ", ";
-           $argl = $argl . $fn;
-       }
-gen qq{\t    //edg_wll_Log$t();
-\t    err |= logev(ctx, EDG_WLL_EVENT_$tu, EDG_WLL_FORMAT_${tu}$argl);
-\t    break;
-};
-    }
-@@@}
-       default:
-           fprintf(stderr, "unknown event\n");
-       }
-
-       edg_wlc_JobIdFree(jobid);
-       if (jobid_s) free(jobid_s); // add all strings
-
-       if (err) {
-           char        *et,*ed;
-
-           edg_wll_Error(ctx,&et,&ed);
-           fprintf(stderr,"%s: edg_wll_LogEvent*(): %s (%s)\n",
-                   argv[0],et,ed);
-           free(et); free(ed);
-       }
-
-       code = edg_wll_GetSequenceCode(ctx);
-       puts(code);
-       free(code);
-
-       edg_wll_FreeContext(ctx);
-
-       if (ff) free(ff);
-       if (fmt_arg) free(fmt_arg);
-
-       return err;
-}
diff --git a/org.glite.lb.client/src/notification.c b/org.glite.lb.client/src/notification.c

deleted file mode 100644 (file)

index 12b6cbf..0000000
--- a/org.glite.lb.client/src/notification.c
+++ /dev/null
@@ -1,934 +0,0 @@
-#ident "$Header$"
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-
-
-#include "glite/lb/notification.h"
-#include "glite/lb/events.h"
-#include "glite/lb/log_proto.h"
-#include "glite/lb/mini_http.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/il_string.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/lb_gss.h"
-
-#include "connection.h"
-
-#define CON_QUEUE               10     /* listen() queue limit */
-
-/* XXX: moving all request_headers to one file would be nice
- */
-static const char* const request_headers[] = {
-       "Cache-Control: no-cache",
-       "Accept: application/x-dglb",
-       "User-Agent: edg_wll_Api/" PROTO_VERSION "/" COMP_PROTO,
-       "Content-Type: application/x-dglb",
-       NULL
-};
-
-
-
-
-/* Decrement timeout
- */
-static int decrement_timeout(struct timeval *timeout, struct timeval before, struct timeval after)
-{
-       if (!timeout) 
-               return(0);      // wait indefinitely
-       
-        (*timeout).tv_sec = (*timeout).tv_sec - (after.tv_sec - before.tv_sec);
-        (*timeout).tv_usec = (*timeout).tv_usec - (after.tv_usec - before.tv_usec);
-        while ( (*timeout).tv_usec < 0) {
-                (*timeout).tv_sec--;
-                (*timeout).tv_usec += 1000000;
-        }
-        if ( ((*timeout).tv_sec < 0) || (((*timeout).tv_sec == 0) && ((*timeout).tv_usec == 0)) ) return(1);
-        else return(0);
-}
-
-
-
-/* Split address to name & port
- */
-static void get_name_and_port(const char *address, char **name, int *port)
-{
-       char *n = NULL, *p;
-       
-       n = strdup(address);
-       p = strchr(n, ':');
-       if (p)
-       {
-               *port = atoi(p+1);
-               *p = 0;
-       }
-       *name = strdup(n);
-       free(n);
-}      
-
-
-static int my_bind(edg_wll_Context ctx, const char *name, int port, int *fd)
-{
-       struct  sockaddr_in     a;
-       socklen_t               alen = sizeof(a);
-       int                     sock;
-               
-       sock = socket(PF_INET,SOCK_STREAM,0);
-       if (sock<0) 
-               return  edg_wll_SetError(ctx, errno, "socket() failed");
-
-       a.sin_family = AF_INET;
-       a.sin_port = htons(port);
-       a.sin_addr.s_addr = name? inet_addr(name): htonl(INADDR_ANY);
-
-//     setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-       if (bind(sock,(struct sockaddr *)&a,alen))
-               return  edg_wll_SetError(ctx, errno, "bind() failed");
-
-       
-       if (listen(sock,CON_QUEUE)) 
-               return edg_wll_SetError(ctx, errno, "listen() failed");
-       
-       *fd = sock;
-       
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-       
-
-
-static int set_server_name_and_port(edg_wll_Context ctx) 
-{
-
-       if (!ctx->p_notif_server)
-               return(edg_wll_SetError(ctx, (edg_wll_ErrorCode) EINVAL, 
-                               "Hostname of server to notif is not set"));
-       else {
-               free(ctx->srvName);
-               ctx->srvName = strdup(ctx->p_notif_server);
-       }
-       if (!ctx->p_notif_server_port)
-               return(edg_wll_SetError(ctx, (edg_wll_ErrorCode) EINVAL, 
-                               "Port of server to notif is not set"));
-       else ctx->srvPort = ctx->p_notif_server_port;
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-static int get_client_address(
-               edg_wll_Context ctx, 
-               int fd,
-               const char *address_override,
-               char **address) 
-       
-{
-       struct  sockaddr_in     a;
-       socklen_t               alen = sizeof(a);
-       struct hostent          *he;
-       char                    *name = NULL;
-       int                     port = 0;
-       
-       
-       if (address_override) {
-               struct in_addr in;
-               
-               get_name_and_port(address_override, &name, &port);
-               
-               if ( (he = gethostbyname((const char *) name)) == NULL) {
-                       edg_wll_SetError(ctx, errno, "gethostbyname() failed");
-                       goto err;
-               }
-               
-               free(name);
-               
-               memmove(&in.s_addr, he->h_addr_list[0], sizeof(in.s_addr));
-               name = strdup(inet_ntoa(in));
-       
-               if ( (he = gethostbyname((const char *) name)) == NULL) {
-                       edg_wll_SetError(ctx, errno, "gethostbyname() failed");
-                       goto err;
-               }
-       
-               /* Test whether open sockket represents the same address as address_override
-                * if not, close ctx->notifSock and bind to new socket corresponding to 
-                * address_override
-                */
-               if (ctx->notifSock >= 0) {
-                       if (getsockname(ctx->notifSock, (struct sockaddr *) &a, &alen)) 
-                               return edg_wll_SetError(ctx, errno, "getsockname() failed");
-                       
-                       if ( (strcmp(inet_ntoa(a.sin_addr), name)) || (ntohs(a.sin_port) != port) ) {
-                               
-                               if (close(ctx->notifSock)) {
-                                       edg_wll_SetError(ctx, errno, "close() failed");
-                                       goto err;
-                               }
-                               ctx->notifSock = -1;
-                               
-                               if (my_bind(ctx, name, port, &(ctx->notifSock))) 
-                                       goto err;
-                       }
-               }
-               else {  // create new socket 
-                       if (my_bind(ctx, name, port, &(ctx->notifSock))) 
-                               goto err;
-               }
-               
-               *address = strdup(address_override);
-       }
-       else {  // address_override == NULL
-               
-               if (fd == -1) {
-                       if (ctx->notifSock == -1)       
-                               // create new socket
-                               if (my_bind(ctx, NULL, 0, &(ctx->notifSock)))
-                                               goto err;
-                       // else: resue socket
-               }
-               else    
-                       // used supplied socket
-                       ctx->notifSock = fd;
-       
-               if (getsockname(ctx->notifSock,(struct sockaddr *)  &a, &alen)) 
-                       return edg_wll_SetError(ctx, errno, "getsockname() failed");
-
-               if (a.sin_addr.s_addr == INADDR_ANY)
-                       asprintf(address,"0.0.0.0:%d", ntohs(a.sin_port));
-               else
-                       asprintf(address,"%s:%d", inet_ntoa(a.sin_addr), ntohs(a.sin_port));
-       }
-
-err:
-       free(name);
-       
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_NotifNew(
-        edg_wll_Context         ctx,
-        edg_wll_QueryRec        const * const *conditions,
-        int                     fd,
-        const char              *address_override,
-        edg_wll_NotifId         *id_out,
-        time_t                  *valid) 
-{
-       edg_wll_NotifId         notifId = NULL;
-       char                    *address = NULL, *send_mess = NULL,
-                               *recv_mess = NULL, *response = NULL;
-       int                     ret;    
-       
-
-       edg_wll_ResetError(ctx);
-
-       if ( (ret = set_server_name_and_port(ctx)) ) 
-               goto err;
-               
-       if ( (ret = edg_wll_NotifIdCreate(ctx->srvName,ctx->srvPort,&notifId)) )
-               goto err;
-
-       if ( (ret = get_client_address(ctx, fd, address_override, &address)) )
-               goto err;
-       
-       if ( (ret = edg_wll_NotifRequestToXML(ctx, "New", notifId, address, 
-                       EDG_WLL_NOTIF_NOOP, conditions, &send_mess)) )
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_notif_timeout;
-       
-       if ( (ret = edg_wll_http_send_recv(ctx, "POST /notifRequest HTTP/1.1",
-                       request_headers,send_mess,
-                       &response,NULL,&recv_mess)) )
-               goto err;
-       
-       if ( (ret = http_check_status(ctx,response)) )
-               goto err;
-
-       ret = edg_wll_ParseNotifResult(ctx, recv_mess, valid);
-
-
-err:
-       if (ret != 0) {
-               if (notifId) edg_wll_NotifIdFree(notifId);
-               *id_out = NULL;
-               *valid = -1;
-       }
-       else
-               *id_out = notifId;
-               
-       free(address);
-       free(recv_mess);
-       free(send_mess);
-       free(response);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_NotifBind(
-        edg_wll_Context         ctx,
-        const edg_wll_NotifId   id,
-        int                     fd,
-        const char              *address_override,
-        time_t                  *valid)
-{
-       char    *address = NULL, *send_mess = NULL,
-                       *recv_mess = NULL, *response = NULL;
-       
-       
-       edg_wll_ResetError(ctx);
-
-       
-       // if a local listening socket active, close it
-       if (ctx->notifSock >= 0) {
-               if (close(ctx->notifSock)) 
-                       return edg_wll_SetError(ctx, errno, "close() failed");
-               else
-                       ctx->notifSock = -1;
-       }
-
-       if (set_server_name_and_port(ctx)) 
-               goto err;
-               
-       if (get_client_address(ctx, fd, address_override, &address))
-               goto err;
-
-       if (edg_wll_NotifRequestToXML(ctx, "Bind", id, address, 
-                       EDG_WLL_NOTIF_NOOP, NULL, &send_mess)) 
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_notif_timeout;
-       
-       if (edg_wll_http_send_recv(ctx, "POST /notifRequest HTTP/1.1",
-                       request_headers,send_mess,
-                       &response,NULL,&recv_mess)) 
-               goto err;
-       
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseNotifResult(ctx, recv_mess, valid);
-
-err:
-       free(address);
-       free(recv_mess);
-       free(send_mess);
-       free(response);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_NotifChange(
-        edg_wll_Context         ctx,
-        const edg_wll_NotifId   id,
-        edg_wll_QueryRec        const * const * conditions,
-        edg_wll_NotifChangeOp   op)
-{
-       char    *send_mess = NULL, *recv_mess = NULL, *response = NULL;
-       time_t  not_used;
-       
-       
-       edg_wll_ResetError(ctx);
-
-       
-       if (set_server_name_and_port(ctx)) 
-               goto err;
-               
-       if (edg_wll_NotifRequestToXML(ctx, "Change", id, NULL, 
-                       op, conditions, &send_mess)) 
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_notif_timeout;
-       
-       if (edg_wll_http_send_recv(ctx, "POST /notifRequest HTTP/1.1",
-                       request_headers,send_mess,
-                       &response,NULL,&recv_mess)) 
-               goto err;
-       
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseNotifResult(ctx, recv_mess, &not_used);
-
-err:
-       free(recv_mess);
-       free(send_mess);
-       free(response);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_NotifRefresh(
-        edg_wll_Context         ctx,
-        const edg_wll_NotifId   id,
-        time_t                  *valid)
-{
-       char    *send_mess = NULL, *recv_mess = NULL, *response = NULL;
-       
-       
-       edg_wll_ResetError(ctx);
-
-       
-       if (set_server_name_and_port(ctx)) 
-               goto err;
-               
-       if (edg_wll_NotifRequestToXML(ctx, "Refresh", id, NULL, 
-                       EDG_WLL_NOTIF_NOOP, NULL, &send_mess)) 
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_notif_timeout;
-       
-       if (edg_wll_http_send_recv(ctx, "POST /notifRequest HTTP/1.1",
-                       request_headers,send_mess,
-                       &response,NULL,&recv_mess)) 
-               goto err;
-       
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseNotifResult(ctx, recv_mess, valid);
-
-err:
-       free(recv_mess);
-       free(send_mess);
-       free(response);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-int edg_wll_NotifDrop(
-        edg_wll_Context         ctx,
-        edg_wll_NotifId         *id)
-{
-       char    *send_mess = NULL, *recv_mess = NULL, *response = NULL;
-       time_t  not_used;
-       
-       
-       edg_wll_ResetError(ctx);
-
-       
-       if (set_server_name_and_port(ctx)) 
-               goto err;
-               
-       if (edg_wll_NotifRequestToXML(ctx, "Drop", id, NULL, 
-                       EDG_WLL_NOTIF_NOOP, NULL, &send_mess)) 
-               goto err;
-
-       ctx->p_tmp_timeout = ctx->p_notif_timeout;
-       
-       if (edg_wll_http_send_recv(ctx, "POST /notifRequest HTTP/1.1",
-                       request_headers,send_mess,
-                       &response,NULL,&recv_mess)) 
-               goto err;
-       
-       if (http_check_status(ctx,response))
-               goto err;
-
-       edg_wll_ParseNotifResult(ctx, recv_mess, &not_used);
-
-err:
-       free(recv_mess);
-       free(send_mess);
-       free(response);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-static int recv_notif(edg_wll_Context ctx)
-{
-       int     ret, len;
-       char    fbuf[17];
-       size_t  total;
-       edg_wll_GssStatus  gss_code;
-
-       
-       if (ctx->connPoolNotif[0].buf) {
-               free(ctx->connPoolNotif[0].buf);
-               ctx->connPoolNotif[0].buf = NULL;
-       }
-       ctx->connPoolNotif[0].bufUse = 0;
-       ctx->connPoolNotif[0].bufSize = 0;
-
-       ret = edg_wll_gss_read_full(&ctx->connPoolNotif[0].gss,
-                                   fbuf,17, &ctx->p_tmp_timeout,&total, &gss_code);
-       if (ret < 0) 
-               switch (ret) {
-                       case EDG_WLL_GSS_ERROR_TIMEOUT: 
-                               return edg_wll_SetError(ctx,ETIMEDOUT,"read message header");
-                       case EDG_WLL_GSS_ERROR_EOF: 
-                               return edg_wll_SetError(ctx,ENOTCONN,NULL);
-                       case EDG_WLL_GSS_ERROR_GSS:
-                               return edg_wll_SetErrorGss(ctx, "read message header", &gss_code);
-                       default: 
-                               return edg_wll_SetError(ctx,EDG_WLL_ERROR_GSS,"read message header"); /* XXX */
-       }
-
-       if ((len = atoi(fbuf)) <= 0) {
-               return edg_wll_SetError(ctx,EINVAL,"message length");
-       }
-
-       ctx->connPoolNotif[0].bufSize = len+1;
-
-       ctx->connPoolNotif[0].buf = (char *) malloc(
-               ctx->connPoolNotif[0].bufSize);
-       
-       if (!ctx->connPoolNotif[0].buf) {
-               return edg_wll_SetError(ctx, ENOMEM, "recv_notif()");
-       }
-       
-
-       ret = edg_wll_gss_read_full(&ctx->connPoolNotif[0].gss,
-                                   ctx->connPoolNotif[0].buf, len,
-                                   &ctx->p_tmp_timeout,&total, &gss_code);
-       if (ret < 0) {
-               free(ctx->connPoolNotif[0].buf);
-               ctx->connPoolNotif[0].bufUse = 0;
-               ctx->connPoolNotif[0].bufSize = 0;
-               return edg_wll_SetError(ctx,
-                       ret == EDG_WLL_GSS_ERROR_TIMEOUT ?
-                               ETIMEDOUT : EDG_WLL_ERROR_GSS,
-                       "read message");
-       }
-
-
-       ctx->connPoolNotif[0].buf[len] = 0;
-       ctx->connPoolNotif[0].bufUse = len+1;
-
-       
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-static int send_reply(const edg_wll_Context ctx)
-{
-       int     ret, len, err_code, err_code_min = 0, max_len = 256;
-       char    *p, *err_msg = NULL, buf[max_len];
-       size_t  total;
-       edg_wll_GssStatus  gss_code;
-
-       
-       err_code = edg_wll_Error(ctx,NULL,&err_msg);
-
-       if (!err_msg) err_msg=strdup("OK");
-       
-       len = 17 + len_int(err_code) + len_int(err_code_min) +len_string(err_msg);
-       if(len > max_len) {
-               edg_wll_SetError(ctx,E2BIG,"create_reply()");
-               goto err;
-       }
-
-       snprintf(buf, max_len, "%16d\n", len - 17);
-       p = buf + 17;
-       p = put_int(p, err_code);
-       p = put_int(p, err_code_min);
-       p = put_string(p, err_msg);
-
-       ret = edg_wll_gss_write_full(&ctx->connPoolNotif[0].gss,
-                                    buf,len,&ctx->p_tmp_timeout,&total, &gss_code);
-       if (ret < 0) {
-               edg_wll_SetError(ctx,
-                               ret == EDG_WLL_GSS_ERROR_TIMEOUT ? 
-                                       ETIMEDOUT : EDG_WLL_ERROR_GSS,
-                                       "write reply");
-               goto err;
-       }
-       
-err:
-       free(err_msg);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-
-int edg_wll_NotifReceive(
-        edg_wll_Context         ctx,
-        int                     fd,
-        const struct timeval    *timeout,
-        edg_wll_JobStat         *state_out,
-        edg_wll_NotifId         *id_out)
-
-/* pullup from INFN, support multiple messages from interlogger */
-#if 0
-{
-       fd_set                  fds;    
-       struct sockaddr_in      a;
-       int                     recv_sock, alen;
-       edg_wll_Event           *event = NULL;
-       struct timeval          start_time,check_time,tv;
-       char                    *p = NULL, *ucs = NULL,
-                                       *event_char = NULL, *jobstat_char = NULL;
-       int                     ret;
-       edg_wll_GssStatus       gss_code;
-       
-       
-       edg_wll_ResetError(ctx);
-
-       /* start timer */
-       gettimeofday(&start_time,0);
-       
-       if (fd == -1) {
-               if (ctx->notifSock == -1) {
-                       edg_wll_SetError(ctx, EINVAL, "No client socket opened.");
-                       goto err;
-               }
-               else {
-                       fd = ctx->notifSock;
-               }
-       }
-
-       FD_ZERO(&fds);
-       FD_SET(fd,&fds);
-       
-       tv.tv_sec = timeout->tv_sec;
-       tv.tv_usec = timeout->tv_usec;
-       
-       switch(select(fd+1, &fds, NULL, NULL, &tv)) {
-               case -1:
-                       edg_wll_SetError(ctx, errno, "select() failed");
-                       goto err;
-               case 0:
-                       edg_wll_SetError(ctx, ETIMEDOUT, "select() timeouted");
-                       goto err;
-               default:
-                       break;
-       }
-
-/* check time */
-       gettimeofday(&check_time,0);
-       if (decrement_timeout(&tv, start_time, check_time)) {
-               edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_NotifReceive()");
-               goto err;
-       }
-       
-       start_time = check_time;
-       
-       alen=sizeof(a);
-       recv_sock = accept(fd,&a,&alen);
-       if (recv_sock <0) {
-               edg_wll_SetError(ctx, errno, "accept() failed");
-               goto err;
-       }
-
-       ret = edg_wll_gss_accept(ctx->connPool[ctx->connToUse].gsiCred, recv_sock,
-                                &tv, &ctx->connPool[ctx->connToUse].gss, &gss_code);
-
-       if (ret) {
-               edg_wll_SetError(ctx, errno, "GSS authentication failed.");
-               goto err;       
-       }
-       
-/* check time */
-       gettimeofday(&check_time,0);
-       if (decrement_timeout(&tv, start_time, check_time)) {
-               edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_NotifReceive()");
-               goto err;
-       }
-       
-       start_time = check_time;
-       
-
-       ctx->p_tmp_timeout = tv;
-               
-       if (recv_notif(ctx)) {
-               /* error set in recv_notif() */
-               goto err;
-       }       
-
-       if (send_reply(ctx)) {
-               /* error set in send_reply() */
-               goto err;
-       }       
-       
-       p = ctx->connPool[ctx->connToUse].buf;
-       p = get_string(p, &ucs);
-       if (p == NULL) return edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading UCS");
-       free(ucs);
-
-       p = get_string(p, &event_char);
-       if (p == NULL) {
-               free(ucs);
-               return edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading event string");;
-       }
-       
-       /****************************************************************/
-       /* end of  notif-interlogger message exchange                   */
-       /****************************************************************/
-       
-       /* check time */
-       gettimeofday(&check_time,0);
-       if (decrement_timeout(&tv, start_time, check_time)) {
-               edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_NotifReceive()");
-               goto err;
-       }
-       start_time = check_time;
-               
-       event = edg_wll_InitEvent(EDG_WLL_EVENT_NOTIFICATION);
-       if (edg_wll_ParseNotifEvent(ctx, event_char, &event)) {
-               goto err;
-       }
-
-       jobstat_char = edg_wll_UnescapeXML((const char *) event->notification.jobstat);
-       if (jobstat_char == NULL) {
-               edg_wll_SetError(ctx, EINVAL, "edg_wll_UnescapeXML()");
-               goto err;
-       }
-               
-       /* fill in return values
-        */
-       if ( edg_wll_ParseJobStat(ctx, jobstat_char, 
-                               strlen(jobstat_char), state_out)) {
-               goto err;
-       }
-       
-       *id_out = event->notification.notifId;
-       event->notification.notifId = NULL;
-       
-       
-err:
-       if (event) { 
-               edg_wll_FreeEvent(event);
-               // XXX - konzultovat s honikem; podle meho by to free 
-               // mel delat uz edg_wll_FreeEvent
-               //free(event);
-       }
-
-       free(ctx->connPool[ctx->connToUse].buf);
-       ctx->connPool[ctx->connToUse].buf = NULL;
-       ctx->connPool[ctx->connToUse].bufUse = 0;
-       ctx->connPool[ctx->connToUse].bufSize = 0;
-       
-       free(event_char);
-       free(jobstat_char);
-
-       // XXX
-       // konzultovat s Danem
-       /* Dan: ??? */
-       edg_wll_gss_close(&ctx->connPool[ctx->connToUse].gss, NULL);
-       
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-#endif
-/* NotifReceive */
-{
-       fd_set                  fds;    
-       struct sockaddr_in      a;
-       int                     recv_sock, alen;
-       edg_wll_Event           *event = NULL;
-       struct timeval          start_time,check_time,tv;
-       char                    *p = NULL, *ucs = NULL,
-                                       *event_char = NULL, *jobstat_char = NULL;
-       edg_wll_GssStatus       gss_code;
-       
-       
-       edg_wll_ResetError(ctx);
-
-       /* start timer */
-       gettimeofday(&start_time,0);
-       
-       if (fd == -1) {
-               if (ctx->notifSock == -1) {
-                       edg_wll_SetError(ctx, EINVAL, "No client socket opened.");
-                       goto err;
-               }
-               else {
-                       fd = ctx->notifSock;
-               }
-       }
-       
-       FD_ZERO(&fds);
-       FD_SET(fd,&fds);
-       tv.tv_sec = timeout->tv_sec;
-       tv.tv_usec = timeout->tv_usec;
-       
-       
-select:
-       /* XXX - index 0 is used because of absence of connection management    */
-               /*       to use it, support in client/connection.c needed               */
-       /*       it is better to separate it from ctx->connPool, which is used  */
-       /*       for outgouing messages to server                               */
-       /*       In future it should be in context, so one could use:           */
-       /*       ctx->connPoolNotif[ctx->connPoolNotifToUse]                    */
-       /*       notif_send() & notif_receive() should then migrate to          */
-       /*       client/connection.c and use connPool management f-cions        */
-       
-       if (ctx->connPoolNotif[0].gss.context == GSS_C_NO_CONTEXT) 
-       {       
-               int     ret;
-               switch(select(fd+1, &fds, NULL, NULL, &tv)) {
-                       case -1:
-                               edg_wll_SetError(ctx, errno, "select() failed");
-                               goto err;
-                       case 0:
-                               edg_wll_SetError(ctx, ETIMEDOUT, "select() timeouted");
-                               goto err;
-                       default:
-                               break;
-               }
-
-               /* check time */
-               gettimeofday(&check_time,0);
-               if (decrement_timeout(&tv, start_time, check_time)) {
-                       edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_NotifReceive()");
-                       goto err;
-               }
-               start_time = check_time;
-               
-               alen=sizeof(a);
-               recv_sock = accept(fd,(struct sockaddr *)&a,&alen);
-               if (recv_sock <0) {
-                       edg_wll_SetError(ctx, errno, "accept() failed");
-                       goto err;
-               }
-
-               ret = edg_wll_gss_accept(ctx->connPoolNotif[0].gsiCred, recv_sock,
-                               &tv, &ctx->connPoolNotif[0].gss,&gss_code);
-               if (ret) {
-                       edg_wll_SetError(ctx, errno, "GSS authentication failed.");
-                       goto err;       
-               }
-               
-               /* check time */
-               gettimeofday(&check_time,0);
-               if (decrement_timeout(&tv, start_time, check_time)) {
-                       edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_NotifReceive()");
-                       goto err;
-               }
-               start_time = check_time;
-       }       
-
-       
-       ctx->p_tmp_timeout = tv;
-               
-       /****************************************************************/
-       /* Communication with notif-interlogger                         */
-       /****************************************************************/
-       
-       if (recv_notif(ctx)) {
-               if (ctx->errCode == ENOTCONN) {
-                       /* other side (interlogger-notif) probably closed connection */
-                       edg_wll_ResetError(ctx);
-                       
-                       edg_wll_gss_close(&ctx->connPoolNotif[0].gss,NULL);
-                       // buffer is freed in recv_notif()
-               
-                       goto select;
-               }                               
-               else {
-                       goto err;       /* error set in recv_notif() */
-               }
-       }       
-
-       if (send_reply(ctx)) {
-               goto err;               /* error set in send_reply() */
-       }
-       
-       p = ctx->connPoolNotif[0].buf;
-       p = get_string(p, &ucs);
-       if (p == NULL) return edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading UCS");
-       free(ucs);
-
-       p = get_string(p, &event_char);
-       if (p == NULL) {
-               free(ucs);
-               return edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading event string");;
-       }
-       
-       /****************************************************************/
-       /* end of  notif-interlogger message exchange                   */
-       /****************************************************************/
-       
-       /* check time */
-       gettimeofday(&check_time,0);
-       if (decrement_timeout(&tv, start_time, check_time)) {
-               edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_NotifReceive()");
-               goto err;
-       }
-       start_time = check_time;
-               
-       event = edg_wll_InitEvent(EDG_WLL_EVENT_NOTIFICATION);
-       if (edg_wll_ParseNotifEvent(ctx, event_char, &event)) {
-               goto err;
-       }
-
-       jobstat_char = edg_wll_UnescapeXML((const char *) event->notification.jobstat);
-       if (jobstat_char == NULL) {
-               edg_wll_SetError(ctx, EINVAL, "edg_wll_UnescapeXML()");
-               goto err;
-       }
-               
-       /* fill in return values
-        */
-       if ( edg_wll_ParseJobStat(ctx, jobstat_char, 
-                               strlen(jobstat_char), state_out)) {
-               goto err;
-       }
-       
-       *id_out = event->notification.notifId;
-       event->notification.notifId = NULL;
-       
-       
-err:
-       if (event) { 
-               edg_wll_FreeEvent(event);
-               // XXX - konzultovat s honikem; podle meho by to free 
-               // mel delat uz edg_wll_FreeEvent
-               //free(event);
-       }
-
-       free(ctx->connPoolNotif[0].buf);
-       ctx->connPoolNotif[0].buf = NULL;
-       ctx->connPoolNotif[0].bufUse = 0;
-       ctx->connPoolNotif[0].bufSize = 0;
-       
-       free(event_char);
-       free(jobstat_char);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-int edg_wll_NotifGetFd(
-        edg_wll_Context         ctx)
-{
-       if (ctx->notifSock == -1) {
-               edg_wll_SetError(ctx, EBADF, "Client socket is not opened.");
-               return -1;
-       }
-       
-       return ctx->notifSock;
-}
-
-
-int edg_wll_NotifCloseFd(
-        edg_wll_Context         ctx)
-{
-       int err;
-       
-       if (ctx->notifSock >= 0) {
-               if (ctx->connPoolNotif[0].gss.context != GSS_C_NO_CONTEXT) {
-                       edg_wll_gss_close(&ctx->connPoolNotif[0].gss, NULL);
-               }
-               err = close(ctx->notifSock);
-               ctx->notifSock = -1;
-               
-               if (err) 
-                       return edg_wll_SetError(ctx, errno, "close() failed");
-       }
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.client/src/prod_proto.c b/org.glite.lb.client/src/prod_proto.c

deleted file mode 100644 (file)

index 5ed120d..0000000
--- a/org.glite.lb.client/src/prod_proto.c
+++ /dev/null
@@ -1,156 +0,0 @@
-#ident "$Header$"
-
-#include "prod_proto.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/lb_gss.h"
-
-#include <signal.h>
-#include <string.h>
-#include <sys/types.h>
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_log_proto_client - handle outgoing data
- *
- * Returns: 0 if done properly or errno
- *
- * Calls:
- *
- * Algorithm:
- *
- *----------------------------------------------------------------------
- */
-int edg_wll_log_proto_client(edg_wll_Context context, edg_wll_GssConnection *con, edg_wll_LogLine logline/*, int priority,*/)
-{
-       char    header[EDG_WLL_LOG_SOCKET_HEADER_LENGTH+1];
-       int     err;
-       int     answer;
-       u_int8_t answer_end[4];
-       int     count;
-       int     size;
-       u_int8_t size_end[4];
-       edg_wll_GssStatus gss_code;
-
-       errno = err = answer = count = 0;
-       size = strlen(logline)+1;
-       size_end[0] = size & 0xff; size >>= 8;
-       size_end[1] = size & 0xff; size >>= 8;
-       size_end[2] = size & 0xff; size >>= 8;
-       size_end[3] = size;
-       size = strlen(logline)+1;
-       edg_wll_ResetError(context);
-
-       /* send header */
-#ifdef EDG_WLL_LOG_STUB
-       fprintf(stderr,"Sending socket header...\n");
-#endif
-       sprintf(header,"%s",EDG_WLL_LOG_SOCKET_HEADER);
-       header[EDG_WLL_LOG_SOCKET_HEADER_LENGTH]='\0';
-       if ((err = edg_wll_gss_write_full(con, header, EDG_WLL_LOG_SOCKET_HEADER_LENGTH, &context->p_tmp_timeout, &count, &gss_code)) < 0) {
-               answer = edg_wll_log_proto_client_failure(context,err,&gss_code,"send header");
-               goto edg_wll_log_proto_client_end;
-       }
-
-/* XXX: obsolete
-#ifdef EDG_WLL_LOG_STUB
-       fprintf(stderr,"Sending message priority...\n");
-#endif
-       count = 0;
-        if ((err = edg_wll_gss_write_full(con, &priority, sizeof(priority), &context->p_tmp_timeout, &count, &gss_code)) < 0) {
-                answer = edg_wll_log_proto_client_failure(context,err,&gss_code,"send message priority");
-                goto edg_wll_log_proto_client_end;
-        }
-*/
-
-#ifdef EDG_WLL_LOG_STUB
-       fprintf(stderr,"Sending message size...\n");
-#endif
-       count = 0;
-       if ((err = edg_wll_gss_write_full(con, size_end, 4, &context->p_tmp_timeout, &count, &gss_code)) < 0) {
-                answer = edg_wll_log_proto_client_failure(context,err,&gss_code,"send message size");
-                goto edg_wll_log_proto_client_end;
-        }
-
-       /* send message */
-#ifdef EDG_WLL_LOG_STUB
-       fprintf(stderr,"Sending message to socket...\n");
-#endif
-       count = 0;
-       if (( err = edg_wll_gss_write_full(con, logline, size, &context->p_tmp_timeout, &count, &gss_code)) < 0) {
-               answer = edg_wll_log_proto_client_failure(context,err,&gss_code,"send message");
-               goto edg_wll_log_proto_client_end;
-       }
-
-       /* get answer */
-#ifdef EDG_WLL_LOG_STUB
-       fprintf(stderr,"Reading answer from server...\n");
-#endif
-       count = 0;
-       if ((err = edg_wll_gss_read_full(con, answer_end, 4, &context->p_tmp_timeout, &count, &gss_code)) < 0 ) {
-               answer = edg_wll_log_proto_client_failure(context,err,&gss_code,"get answer");
-/* FIXME: update the answer (in context?) to EAGAIN or not?
-               answer = EAGAIN;
-*/
-       } else {
-               answer = answer_end[3]; answer <<=8;
-               answer |= answer_end[2]; answer <<=8;
-               answer |= answer_end[1]; answer <<=8;
-               answer |= answer_end[0];
-#ifdef EDG_WLL_LOG_STUB
-               fprintf(stderr,"Read answer \"%d\"\n",answer);
-#endif
-               edg_wll_SetError(context,answer,"answer read from locallogger");
-       }
-
-edg_wll_log_proto_client_end:
-
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_log_proto_client_failure - handle protocol failures on the client side
- *
- * Returns: errno
- *
- *----------------------------------------------------------------------
- */
-int edg_wll_log_proto_client_failure(edg_wll_Context context, int code, edg_wll_GssStatus *gss_code, const char *text)
-{
-       const char      *func="edg_wll_log_proto_client()";
-        static char     err[256];
-        int             ret = 0;
-       char            *gss_err;
-
-       edg_wll_ResetError(context);
-
-       if(code>0)
-                return(0);
-
-       switch(code) {
-                case EDG_WLL_GSS_ERROR_EOF: 
-                       snprintf(err, sizeof(err), "%s: Error %s, EOF occured;", func, text);   
-                       ret = edg_wll_SetError(context,ENOTCONN,err);
-                       break;
-                case EDG_WLL_GSS_ERROR_TIMEOUT: 
-                       snprintf(err, sizeof(err), "%s: Error %s, timeout expired;", func, text);       
-                       ret = edg_wll_SetError(context,ENOTCONN,err);
-                       break;
-               case EDG_WLL_GSS_ERROR_ERRNO: // XXX: perror("edg_wll_ssl_read()"); break;
-                       snprintf(err, sizeof(err), "%s: Error %s, system error occured;", func, text);  
-                       ret = edg_wll_SetError(context,ENOTCONN,err);
-                       break;
-                case EDG_WLL_GSS_ERROR_GSS:
-                       snprintf(err, sizeof(err), "%s: Error %s, GSS error occured", func, text);
-                       edg_wll_gss_get_error(gss_code, err, &gss_err);
-                       ret = edg_wll_SetError(context,ENOTCONN,gss_err);
-                       free(gss_err);
-                        break;
-               default:
-                       break;
-       }
-       return ret;
-}
diff --git a/org.glite.lb.client/src/prod_proto.h b/org.glite.lb.client/src/prod_proto.h

deleted file mode 100644 (file)

index ef90710..0000000
--- a/org.glite.lb.client/src/prod_proto.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_CLIENT_PROD_PROTO_H__
-#define __EDG_WORKLOAD_LOGGING_CLIENT_PROD_PROTO_H__
-
-#ident "$Header$"
-
-/**
- * \file edg/workload/logging/client/prod_proto.h
- * \brief client (producer) part of the logging protocol
- * \note private
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include "glite/lb/log_proto.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/lb_gss.h"
-
-int edg_wll_log_proto_client(edg_wll_Context context, edg_wll_GssConnection *con, edg_wll_LogLine logline/*, int priority,*/);
-int edg_wll_log_proto_client_failure(edg_wll_Context context, int code, edg_wll_GssStatus *gss_code, const char *text);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_CLIENT_PROD_PROTO_H__ */
diff --git a/org.glite.lb.client/src/producer.c b/org.glite.lb.client/src/producer.c

deleted file mode 100644 (file)

index 6d264ba..0000000
--- a/org.glite.lb.client/src/producer.c
+++ /dev/null
@@ -1,585 +0,0 @@
-/**
- * \file producer.c
- * \author Jan Pospisil
- */
-
-#ident "$Header$"
-
-#include <syslog.h>
-#include <string.h>
-#include <unistd.h>
-#include <netdb.h>
-
-#include "glite/wmsutils/jobid/strmd5.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/ulm_parse.h"
-#include "glite/lb/trio.h"
-#include "glite/lb/lb_gss.h"
-
-#include "prod_proto.h"
-
-/**
- *----------------------------------------------------------------------
- * Connects to local-logger and sends already formatted ULM string
- * \brief helper logging function
- * \param context      INOUT context to work with,
- * \param priority     IN priority flag (0 for async, 1 for sync)
- * \param logline      IN formated ULM string
- *----------------------------------------------------------------------
- */
-static int edg_wll_DoLogEvent(
-       edg_wll_Context context,
-/*     int priority,  */
-       edg_wll_LogLine logline)
-{
-       int     ret,answer;
-       char    *my_subject_name = NULL;
-       edg_wll_GssStatus       gss_stat;
-       edg_wll_GssConnection   con;
-       gss_cred_id_t   cred = GSS_C_NO_CREDENTIAL;
-       OM_uint32       min_stat;
-
-       edg_wll_ResetError(context);
-       ret = answer = 0;
-       memset(&con, 0, sizeof(con));
-
-   /* open an authenticated connection to the local-logger: */
-
-#ifdef EDG_WLL_LOG_STUB
-       fprintf(stderr,"Logging to host %s, port %d\n",
-                       context->p_destination, context->p_dest_port);
-#endif
-       ret = edg_wll_gss_acquire_cred_gsi(
-             context->p_proxy_filename ? context->p_proxy_filename : context->p_cert_filename,
-             context->p_proxy_filename ? context->p_proxy_filename : context->p_key_filename,
-             &cred, &my_subject_name, &gss_stat);
-       /* Give up if unable to prescribed credentials, otherwise go on anonymously */
-       if (ret && context->p_proxy_filename) {
-               edg_wll_SetErrorGss(context, "failed to load GSI credentials", &gss_stat);
-               goto edg_wll_DoLogEvent_end;
-       }
-                                          
-       if (my_subject_name != NULL) {
-#ifdef EDG_WLL_LOG_STUB
-               fprintf(stderr,"Using certificate: %s\n",my_subject_name);
-#endif
-               free(my_subject_name);
-       }
-       if ((answer = edg_wll_gss_connect(cred,
-                       context->p_destination, context->p_dest_port, 
-                       &context->p_tmp_timeout, &con, &gss_stat)) < 0) {
-               switch(answer) {
-                case EDG_WLL_GSS_ERROR_EOF:
-                       edg_wll_SetError(context,ENOTCONN,"edg_wll_gss_connect()");
-                       break;
-                case EDG_WLL_GSS_ERROR_TIMEOUT:
-                       edg_wll_SetError(context,ETIMEDOUT,"edg_wll_gss_connect()");
-                       break;
-                case EDG_WLL_GSS_ERROR_ERRNO:
-                       edg_wll_SetError(context,errno,"edg_wll_gss_connect()");
-                       break;
-                case EDG_WLL_GSS_ERROR_GSS: 
-                       edg_wll_SetErrorGss(context, "failed to authenticate to server",&gss_stat);
-                       break;
-               case EDG_WLL_GSS_ERROR_HERRNO:
-                       { 
-                               const char *msg1;
-                               char *msg2;
-                               msg1 = hstrerror(errno);
-                               asprintf(&msg2, "edg_wll_gss_connect(): %s", msg1);
-                               edg_wll_SetError(context,EDG_WLL_ERROR_DNS, msg2);
-                               free(msg2);
-                       }
-                        break;
-               default:
-                       edg_wll_SetError(context,ECONNREFUSED,"edg_wll_gss_connect(): unknown");
-                       break;
-               }
-               goto edg_wll_DoLogEvent_end;
-       }
-
-   /* and send the message to the local-logger: */
-
-       answer = edg_wll_log_proto_client(context,&con,logline/*,priority*/);
-
-       switch(answer) {
-               case 0:
-               case EINVAL:
-               case ENOSPC:
-               case ENOMEM:
-               case EDG_WLL_ERROR_GSS:
-               case EDG_WLL_ERROR_DNS:
-               case ENOTCONN:
-               case ECONNREFUSED:
-               case ETIMEDOUT:
-               case EAGAIN:
-                       break;
-               case EDG_WLL_ERROR_PARSE_EVENT_UNDEF:
-               case EDG_WLL_ERROR_PARSE_MSG_INCOMPLETE:
-               case EDG_WLL_ERROR_PARSE_KEY_DUPLICITY:
-               case EDG_WLL_ERROR_PARSE_KEY_MISUSE:
-//             case EDG_WLL_ERROR_PARSE_OK_WITH_EXTRA_FIELDS:
-                       edg_wll_UpdateError(context,EINVAL,"edg_wll_DoLogEvent(): Error code mapped to EINVAL");
-                       break;
-               case EDG_WLL_IL_PROTO:
-               case EDG_WLL_IL_SYS:
-               case EDG_WLL_IL_EVENTS_WAITING:
-                       edg_wll_UpdateError(context,EAGAIN,"edg_wll_DoLogEvent(): Error code mapped to EAGAIN");
-                       break;
-
-               default:
-                       edg_wll_UpdateError(context,EAGAIN,"edg_wll_DoLogEvent(): Error code mapped to EAGAIN");
-               break;
-       }
-
-edg_wll_DoLogEvent_end:
-       if (con.context != GSS_C_NO_CONTEXT)
-               edg_wll_gss_close(&con,&context->p_tmp_timeout);
-       if (cred != GSS_C_NO_CREDENTIAL)
-               gss_release_cred(&min_stat, &cred);
-
-       return edg_wll_Error(context, NULL, NULL);
-}
-
-
-/**
- *----------------------------------------------------------------------
- * Formats a logging message and sends it to local-logger
- * \brief master logging event function
- * \param context      INOUT context to work with,
- * \param priority     IN priority flag (0 for async, 1 for sync)
- * \param event                IN type of the event,
- * \param fmt          IN printf()-like format string,
- * \param ...          IN event specific values/data according to fmt.
- *----------------------------------------------------------------------
- */
-static int edg_wll_LogEventMaster(
-       edg_wll_Context context,
-       int priority,
-       edg_wll_EventCode event,
-       char *fmt, ...)
-{
-       va_list fmt_args;
-       int     ret,answer;
-       char    *fix,*var;
-       char    *source,*eventName,*lvl, *fullid,*seq;
-        struct timeval start_time;
-       char    date[ULM_DATE_STRING_LENGTH+1];
-       edg_wll_LogLine out;
-       size_t  size;
-       int     i;
-
-       i = errno  =  size = 0;
-       seq = fix = var = out = source = eventName = lvl = fullid = NULL;
-
-       edg_wll_ResetError(context);
-
-   /* default return value is "Try Again" */
-       answer = ret = EAGAIN; 
-
-   /* format the message: */
-       va_start(fmt_args,fmt);
-
-       gettimeofday(&start_time,0);
-       if (edg_wll_ULMTimevalToDate(start_time.tv_sec,start_time.tv_usec,date) != 0) {
-               edg_wll_SetError(context,ret = EINVAL,"edg_wll_LogEventMaster(): edg_wll_ULMTimevalToDate() error"); 
-               goto edg_wll_logeventmaster_end; 
-       }
-       source = edg_wll_SourceToString(context->p_source);
-       lvl = edg_wll_LevelToString(context->p_level);
-       eventName = edg_wll_EventToString(event);
-       if (!eventName) { 
-               edg_wll_SetError(context,ret = EINVAL,"edg_wll_LogEventMaster(): event name not specified"); 
-               goto edg_wll_logeventmaster_end; 
-       }
-       if (!(fullid = edg_wlc_JobIdUnparse(context->p_jobid))) { 
-               edg_wll_SetError(context,ret = EINVAL,"edg_wll_LogEventMaster(): edg_wlc_JobIdUnparse() error"); 
-               goto edg_wll_logeventmaster_end;
-       }
-       seq = edg_wll_GetSequenceCode(context);
-       if (edg_wll_IncSequenceCode(context)) {
-               ret = EINVAL;
-               goto edg_wll_logeventmaster_end;
-       }
-       if (trio_asprintf(&fix,EDG_WLL_FORMAT_COMMON,
-                       date,context->p_host,lvl,priority,
-                       source,context->p_instance ? context->p_instance : "",
-                       eventName,fullid,seq) == -1) {
-               edg_wll_SetError(context,ret = ENOMEM,"edg_wll_LogEventMaster(): trio_asprintf() error"); 
-               goto edg_wll_logeventmaster_end; 
-       }
-       if (trio_vasprintf(&var,fmt,fmt_args) == -1) { 
-               edg_wll_SetError(context,ret = ENOMEM,"edg_wll_LogEventMaster(): trio_vasprintf() error"); 
-               goto edg_wll_logeventmaster_end; 
-       }
-       if (asprintf(&out,"%s%s\n",fix,var) == -1) { 
-               edg_wll_SetError(context,ret = ENOMEM,"edg_wll_LogEventMaster(): asprintf() error"); 
-               goto edg_wll_logeventmaster_end; 
-       }
-       size = strlen(out);
-
-       if (priority && (size > EDG_WLL_LOG_SYNC_MAXMSGSIZE)) {
-               edg_wll_SetError(context,ret = ENOSPC,"edg_wll_LogEventMaster(): Message size too large for synchronous transfer");
-               goto edg_wll_logeventmaster_end;
-       }
-
-#ifdef EDG_WLL_LOG_STUB
-//     fprintf(stderr,"edg_wll_LogEvent (%d chars): %s",size,out);
-#endif
-       
-       context->p_tmp_timeout.tv_sec = 0;
-       context->p_tmp_timeout.tv_usec = 0;
-       if (priority) {
-               context->p_tmp_timeout = context->p_sync_timeout;
-       }
-       else {
-               context->p_tmp_timeout = context->p_log_timeout;
-       }
-
-   /* and send the message to the local-logger: */
-       ret = edg_wll_DoLogEvent(context, /* priority,*/ out);
-
-edg_wll_logeventmaster_end:
-       va_end(fmt_args);
-       if (seq) free(seq); 
-       if (fix) free(fix); 
-       if (var) free(var); 
-       if (out) free(out);
-       if (source) free(source);
-       if (lvl) free(lvl);
-       if (eventName) free(eventName);
-       if (fullid) free(fullid);
-
-       if (ret) edg_wll_UpdateError(context,0,"Logging library ERROR: ");
-
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-/**
- *----------------------------------------------------------------------
- * Formats a logging message and sends it asynchronously to local-logger
- * \brief generic asynchronous logging function
- *----------------------------------------------------------------------
- */
-int edg_wll_LogEvent(
-        edg_wll_Context context,
-        edg_wll_EventCode event,
-        char *fmt, ...)
-{
-       int     ret=0;
-       char    *list=NULL;
-       va_list fmt_args;
-
-       edg_wll_ResetError(context);
-
-       va_start(fmt_args,fmt);
-       if (trio_vasprintf(&list,fmt,fmt_args) == -1) { 
-               edg_wll_SetError(context,ret = ENOMEM,"edg_wll_LogEvent(): trio_vasprintf() error"); 
-               goto edg_wll_logevent_end; 
-       }
-
-       ret=edg_wll_LogEventMaster(context,0,event,"%s",list);
-
-edg_wll_logevent_end:
-       va_end(fmt_args);
-        if (list) free(list);
-
-       if (ret) edg_wll_UpdateError(context,0,"edg_wll_LogEvent(): ");
-
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-/**
- *----------------------------------------------------------------------
- * Formats a logging message and sends it synchronously to local-logger
- * \brief generic synchronous logging function
- * \note simple wrapper around edg_wll_LogEventMaster()
- *----------------------------------------------------------------------
- */
-int edg_wll_LogEventSync(
-        edg_wll_Context context,
-        edg_wll_EventCode event,
-        char *fmt, ...)
-{
-       int     ret=0;
-       char    *list=NULL;
-       va_list fmt_args;
-
-       edg_wll_ResetError(context);
-
-       va_start(fmt_args,fmt);
-       if (trio_vasprintf(&list,fmt,fmt_args) == -1) { 
-               edg_wll_SetError(context,ret = ENOMEM,"edg_wll_LogEventSync(): trio_vasprintf() error"); 
-               goto edg_wll_logeventsync_end; 
-       }
-
-       ret=edg_wll_LogEventMaster(context,1,event,"%s",list);
-
-edg_wll_logeventsync_end:
-       va_end(fmt_args);
-        if (list) free(list);
-
-       if (ret) edg_wll_UpdateError(context,0,"edg_wll_LogEventSync(): ");
-
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-
-/**
- *-----------------------------------------------------------------------
- * Instructs interlogger to to deliver all pending events related to current job
- * \brief flush events from interlogger
- * \note simple wrapper around edg_wll_LogEventMaster()
- *-----------------------------------------------------------------------
- */
-int edg_wll_LogFlush(
-        edg_wll_Context context,
-        struct timeval *timeout)
-{
-       int     ret = 0;
-       edg_wll_LogLine out = NULL;
-       char    *fullid;
-       char    date[ULM_DATE_STRING_LENGTH+1];
-        struct timeval start_time;
-
-       fullid = NULL;
-
-       edg_wll_ResetError(context);
-
-       gettimeofday(&start_time, 0);
-       if (edg_wll_ULMTimevalToDate(start_time.tv_sec, start_time.tv_usec, date) != 0) {
-               edg_wll_SetError(context,ret = EINVAL,"edg_wll_ULMTimevalToDate()"); 
-               goto edg_wll_logflush_end; 
-       }
-       if (!(fullid = edg_wlc_JobIdUnparse(context->p_jobid))) { 
-               ret = edg_wll_SetError(context,EINVAL,"edg_wlc_JobIdUnparse()");
-               goto edg_wll_logflush_end;
-       }
-
-       if (trio_asprintf(&out, "DATE=%s HOST=\"%|Us\" PROG=internal LVL=system DG.PRIORITY=1 DG.TYPE=\"command\" DG.COMMAND=\"flush\" DG.TIMEOUT=\"%d\" DG.JOBID=\"%s\"\n", 
-                   date, context->p_host, (timeout ? timeout->tv_sec : context->p_sync_timeout.tv_sec), fullid) == -1) {
-               edg_wll_SetError(context,ret = EINVAL,"trio_asprintf");
-               goto edg_wll_logflush_end;
-       }
-
-       if (timeout)
-               context->p_tmp_timeout = *timeout;
-       else
-               context->p_tmp_timeout = context->p_sync_timeout;
-
-       ret = edg_wll_DoLogEvent(context, /* 1,*/ out);
-
-edg_wll_logflush_end:
-       if(out) free(out);
-       if(fullid) free(fullid);
-       
-       if (ret) edg_wll_UpdateError(context,0,"edg_wll_LogFlush(): ");
-       
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-/**
- *-----------------------------------------------------------------------
- * Instructs interlogger to to deliver all pending events
- * \brief flush all events from interlogger
- *-----------------------------------------------------------------------
- */
-int edg_wll_LogFlushAll(
-        edg_wll_Context context,
-        struct timeval *timeout)
-{
-       int     ret = 0;
-       edg_wll_LogLine out = NULL;
-       char    date[ULM_DATE_STRING_LENGTH+1];
-        struct timeval start_time;
-
-       edg_wll_ResetError(context);
-
-       gettimeofday(&start_time, 0);
-       if (edg_wll_ULMTimevalToDate(start_time.tv_sec, start_time.tv_usec, date) != 0) {
-               edg_wll_SetError(context,ret = EINVAL,"edg_wll_ULMTimevalToDate()"); 
-               goto edg_wll_logflushall_end; 
-       }
-
-       if (trio_asprintf(&out, "DATE=%s HOST=\"%|Us\" PROG=internal LVL=system DG.PRIORITY=1 DG.TYPE=\"command\" DG.COMMAND=\"flush\" DG.TIMEOUT=\"%d\"\n", 
-                   date, context->p_host, (timeout ? timeout->tv_sec : context->p_sync_timeout.tv_sec)) == -1) {
-               edg_wll_SetError(context,ret = ENOMEM,"trio_asprintf");
-               goto edg_wll_logflushall_end;
-       }
-
-       if (timeout)
-               context->p_tmp_timeout = *timeout;
-       else
-               context->p_tmp_timeout = context->p_sync_timeout;
-
-       ret = edg_wll_DoLogEvent(context, /* 1,*/ out);
-
-edg_wll_logflushall_end:
-       if(out) free(out);
-       
-       if (ret) edg_wll_UpdateError(context,0,"edg_wll_LogFlushAll(): ");
-       
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-/**
- *-----------------------------------------------------------------------
- * Set a current job for given context.
- * \note Should be called before any logging call.
- *-----------------------------------------------------------------------
- */
-int edg_wll_SetLoggingJob(
-       edg_wll_Context context,
-       const edg_wlc_JobId job,
-       const char *code,
-       int flags)
-{
-       int     err;
-
-       edg_wll_ResetError(context);
-
-       if (!job) return edg_wll_SetError(context,EINVAL,"jobid is null");
-
-       edg_wlc_JobIdFree(context->p_jobid);
-       if ((err = edg_wlc_JobIdDup(job,&context->p_jobid)))
-               edg_wll_SetError(context,err,"edg_wll_SetLoggingJob(): edg_wlc_JobIdDup() error");
-
-       else {
-               if (!edg_wll_SetSequenceCode(context,code,flags))
-                       edg_wll_IncSequenceCode(context);
-       }
-
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-/**
- *-----------------------------------------------------------------------
- * Register job with L&B service.
- *-----------------------------------------------------------------------
- */
-static int edg_wll_RegisterJobMaster(
-        edg_wll_Context         context,
-       int                     pri,
-        const edg_wlc_JobId     job,
-        enum edg_wll_RegJobJobtype     type,
-        const char *            jdl,
-        const char *            ns,
-       edg_wlc_JobId           parent,
-        int                     num_subjobs,
-        const char *            seed,
-        edg_wlc_JobId **        subjobs)
-{
-       char    *type_s = NULL,*intseed = NULL, *seq = NULL;
-       char    *parent_s = NULL;
-       int     err = 0;
-
-       edg_wll_ResetError(context);
-
-       intseed = seed ? strdup(seed) : 
-               str2md5base64(seq = edg_wll_GetSequenceCode(context));
-
-       free(seq);
-
-       type_s = edg_wll_RegJobJobtypeToString(type);
-       if (!type_s) return edg_wll_SetError(context,EINVAL,"edg_wll_RegisterJobMaster(): no jobtype specified");
-
-       if ((type == EDG_WLL_REGJOB_DAG || type == EDG_WLL_REGJOB_PARTITIONED)
-               && num_subjobs > 0) 
-                       err = edg_wll_GenerateSubjobIds(context,job,
-                                       num_subjobs,intseed,subjobs);
-
-       parent_s = parent ? edg_wlc_JobIdUnparse(parent) : strdup("");
-
-       if (err == 0 &&
-               edg_wll_SetLoggingJob(context,job,NULL,EDG_WLL_SEQ_NORMAL) == 0)
-                       edg_wll_LogEventMaster(context,pri,
-                               EDG_WLL_EVENT_REGJOB,EDG_WLL_FORMAT_REGJOB,
-                               (char *)jdl,ns,parent_s,type_s,num_subjobs,intseed);
-
-       free(type_s); free(intseed); free(parent_s);
-       return edg_wll_Error(context,NULL,NULL);
-}
-
-int edg_wll_RegisterJobSync(
-        edg_wll_Context         context,
-        const edg_wlc_JobId     job,
-        enum edg_wll_RegJobJobtype     type,
-        const char *            jdl,
-        const char *            ns,
-        int                     num_subjobs,
-        const char *            seed,
-        edg_wlc_JobId **        subjobs)
-{
-       return edg_wll_RegisterJobMaster(context,1,job,type,jdl,ns, NULL, num_subjobs,seed,subjobs);
-}
-
-int edg_wll_RegisterJob(
-        edg_wll_Context         context,
-        const edg_wlc_JobId     job,
-        enum edg_wll_RegJobJobtype     type,
-        const char *            jdl,
-        const char *            ns,
-        int                     num_subjobs,
-        const char *            seed,
-        edg_wlc_JobId **        subjobs)
-{
-       return edg_wll_RegisterJobMaster(context,0,job,type,jdl,ns, NULL, num_subjobs,seed,subjobs);
-}
-
-int edg_wll_RegisterSubjob(
-        edg_wll_Context         context,
-        const edg_wlc_JobId     job,
-        enum edg_wll_RegJobJobtype     type,
-        const char *            jdl,
-        const char *            ns,
-       edg_wlc_JobId           parent,
-        int                     num_subjobs,
-        const char *            seed,
-        edg_wlc_JobId **        subjobs)
-{
-       return edg_wll_RegisterJobMaster(context,0,job,type,jdl,ns, parent, num_subjobs,seed,subjobs);
-}
-
-int edg_wll_RegisterSubjobs(edg_wll_Context ctx,const edg_wlc_JobId parent,
-               char const * const * jdls, const char * ns, edg_wlc_JobId const * subjobs)
-{
-       char const * const      *pjdl;
-       edg_wlc_JobId const     *psubjob;
-       edg_wlc_JobId           oldctxjob;
-       char *                  oldctxseq;
-
-       if (edg_wll_GetLoggingJob(ctx, &oldctxjob)) return edg_wll_Error(ctx, NULL, NULL);
-       oldctxseq = edg_wll_GetSequenceCode(ctx);
-
-       pjdl = jdls;
-       psubjob = subjobs;
-       
-       while (*pjdl != NULL) {
-               if (edg_wll_RegisterSubjob(ctx, *psubjob, EDG_WLL_REGJOB_SIMPLE, *pjdl,
-                                               ns, parent, 0, NULL, NULL) != 0) break;
-               pjdl++; psubjob++;
-       }
-
-       edg_wll_SetLoggingJob(ctx, oldctxjob, oldctxseq, EDG_WLL_SEQ_NORMAL);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-int edg_wll_ChangeACL(
-               edg_wll_Context                         ctx,
-               const edg_wlc_JobId                     jobid,
-               const char                                 *user_id,
-               enum edg_wll_UserIdType         user_id_type,
-               enum edg_wll_Permission         permission,
-               enum edg_wll_PermissionType     permission_type,
-               enum edg_wll_ACLOperation       operation)
-{
-       if ( edg_wll_SetLoggingJob(ctx, jobid, NULL, EDG_WLL_SEQ_NORMAL) == 0 )
-               edg_wll_LogEventMaster(ctx, 1, EDG_WLL_EVENT_CHANGEACL, EDG_WLL_FORMAT_CHANGEACL,
-                               user_id, user_id_type, permission, permission_type, operation);
-
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.client/src/purge.c b/org.glite.lb.client/src/purge.c

deleted file mode 100644 (file)

index 3c0f934..0000000
--- a/org.glite.lb.client/src/purge.c
+++ /dev/null
@@ -1,389 +0,0 @@
-#ident "$Header$"
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include <globus_common.h>
-
-#define CLIENT_SBIN_PROG
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/mini_http.h"
-
-
-#define dprintf(x) { if (debug) printf x; }
-
-#define free_jobs(jobs) {                                      \
-       if (jobs) {                                             \
-               int i;                                          \
-               for ( i = 0; jobs[i]; i++ )                     \
-                       free(jobs[i]);                          \
-               free(jobs);                                     \
-       }                                                       \
-}
-
-static const char rcsid[] = "@(#)$Id$";
-
-static int debug=0;
-static char *file;
-
-static int read_jobIds(const char *file, char ***jobs_out);
-static int get_timeout(const char *arg, int *timeout);
-static void printerr(edg_wll_Context ctx);
-
-static struct option opts[] = {
-       { "aborted",            required_argument, NULL, 'a'},
-       { "cleared",            required_argument, NULL, 'c'},
-       { "cancelled",          required_argument, NULL, 'n'},
-       { "other",              required_argument, NULL, 'o'},
-       { "dry-run",            no_argument, NULL, 'r'},
-       { "jobs",               required_argument, NULL, 'j'},
-       { "return-list",        no_argument, NULL, 'l'},
-       { "server-dump",        no_argument, NULL, 's'},
-       { "client-dump",        no_argument, NULL, 'i'},
-       { "help",               no_argument, NULL, 'h' },
-       { "version",            no_argument, NULL, 'v' },
-       { "debug",              no_argument, NULL, 'd' },
-       { "server",             required_argument, NULL, 'm' },
-       { NULL,                 no_argument, NULL,  0 }
-};
-
-static void usage(char *me)
-{
-       fprintf(stderr,"usage: %s [option]\n"
-               "       -a, --aborted NNN[smhd]     purge ABORTED jobs older than NNN secs/mins/hours/days\n"
-               "       -c, --cleared NNN[smhd]     purge CLEARED jobs older than given time\n"
-               "       -n, --cancelled NNN[smhd]   purge CANCELLED jobs older than given time\n"
-               "       -o, --other NNN[smhd]       purge OTHER jobs older than given time\n"
-               "       -r, --dry-run               do not really purge\n"
-               "       -j, --jobs <filename>       input file with jobIds of jobs to purge\n"
-               "       -l, --return-list           return list of jobid matching the purge/dump criteria\n"
-               "       -s, --server-dump           dump jobs into any server file\n"
-               "       -i, --client-dump           receive stream of dumped jobs\n"
-               "       -h, --help                  display this help\n"
-               "       -v, --version               display version\n"
-               "       -d, --debug                 diagnostic output\n"
-               "       -m, --server                L&B server machine name\n",
-               me);
-}
-
-int main(int argc,char *argv[])
-{
-       edg_wll_PurgeRequest *request;
-       edg_wll_PurgeResult *result;
-       int     i, timeout;
-       char *server = NULL;
-
-       char *me;
-       int opt;
-       edg_wll_Context ctx;
-
-       /* initialize request to server defaults */
-       request = (edg_wll_PurgeRequest *) calloc(1,sizeof(edg_wll_PurgeRequest));
-       request->jobs = NULL;
-       for (i=0; i < EDG_WLL_NUMBER_OF_STATCODES; i++) {
-               request->timeout[i]=-1;
-       }
-       request->flags = EDG_WLL_PURGE_REALLY_PURGE;
-
-       /* initialize result */
-       result = (edg_wll_PurgeResult *) calloc(1,sizeof(edg_wll_PurgeResult));
-
-       me = strrchr(argv[0],'/');
-       if (me) me++; else me=argv[0];
-
-       /* get arguments */
-       while ((opt = getopt_long(argc,argv,"a:c:n:o:j:m:rlsidhv",opts,NULL)) != EOF) {
-               timeout=-1;
-
-               switch (opt) {
-
-               case 'a': 
-                       if ((get_timeout(optarg,&timeout) != 0 )) {
-                               printf("Wrong usage of timeout argument.\n");
-                               usage(me);
-                               return 1;
-                       }
-                       if (timeout >= 0) {
-                               request->timeout[EDG_WLL_JOB_ABORTED]=timeout; 
-                       }
-                       break;
-
-               case 'c':
-                       if (get_timeout(optarg,&timeout) != 0 ) {
-                               printf("Wrong usage of timeout argument.\n");
-                               usage(me);
-                               return 1;
-                       }
-                       if (timeout >= 0) {
-                               request->timeout[EDG_WLL_JOB_CLEARED]=timeout; 
-                       }
-                       break;
-
-               case 'n': 
-                       if (get_timeout(optarg,&timeout) != 0 ) {
-                               printf("Wrong usage of timeout argument.\n");
-                               usage(me);
-                               return 1;
-                       }
-                       if (timeout >= 0) {
-                               request->timeout[EDG_WLL_JOB_CANCELLED]=timeout; 
-                       }
-                       break;
-               case 'o': 
-                       if (get_timeout(optarg,&timeout) != 0 ) {
-                               printf("Wrong usage of timeout argument.\n");
-                               usage(me);
-                               return 1;
-                       }
-                       if (timeout >= 0) request->timeout[EDG_WLL_PURGE_JOBSTAT_OTHER]= timeout;
-                       break;
-
-               case 'm': server = optarg; break;
-               case 'j': file = optarg; break;
-               case 'r': request->flags &= (~EDG_WLL_PURGE_REALLY_PURGE); break;
-               case 'l': request->flags |= EDG_WLL_PURGE_LIST_JOBS; break;
-               case 's': request->flags |= EDG_WLL_PURGE_SERVER_DUMP; break;
-               case 'i': request->flags |= EDG_WLL_PURGE_CLIENT_DUMP; break;
-               case 'd': debug = 1; break;
-               case 'v': fprintf(stdout,"%s:\t%s\n",me,rcsid); exit(0);
-               case 'h':
-               case '?': usage(me); return 1;
-               }
-       }
-
-       /* Initialize Globus common module */
-       dprintf(("Initializing Globus common module..."));
-       if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-               dprintf(("no.\n"));
-               fprintf(stderr,"Unable to initialize Globus common module\n");
-       } else {
-               dprintf(("yes.\n"));
-       }
-
-       /* initialize context */
-       edg_wll_InitContext(&ctx);
-
-       /* read the jobIds from file, if wanted */
-       if (file) {
-               char **jobs=NULL;
-               dprintf(("Reading jobIds form file \'%s\'...",file));
-               if (read_jobIds(file,&jobs) != 0) {
-                       dprintf(("no.\n"));
-                       fprintf(stderr,"Unable to read jobIds from file \'%s\'\n",file);
-                       goto main_end;
-               } else {
-                       dprintf(("yes.\n"));
-               }
-               request->jobs = jobs;
-       }
-
-       /* check request */
-       if (debug) {
-               printf("Purge request:\n");
-               printf("- flags: %d\n",request->flags);
-               printf("- %d timeouts:\n",EDG_WLL_NUMBER_OF_STATCODES);
-               for (i=0; i < EDG_WLL_NUMBER_OF_STATCODES; i++) {
-                       char *stat=edg_wll_StatToString(i);
-                       printf("\t%s: %ld\n",stat,request->timeout[i]);
-                       if (stat) free(stat);
-               }
-               printf("- list of jobs:\n");
-               if (!request->jobs) {
-                       printf("Not specified.\n");
-               } else {
-                       for ( i = 0; request->jobs[i]; i++ )
-                               printf("%s\n", request->jobs[i]);
-               }
-       }
-
-       if ( server )
-       {
-               char *p = strchr(server, ':');
-               if ( p )
-               {
-                       edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER_PORT, atoi(p+1));
-                       *p = 0;
-               }
-               edg_wll_SetParam(ctx, EDG_WLL_PARAM_QUERY_SERVER, server);
-       }
-
-       /* that is the Purge */
-       dprintf(("Running the edg_wll_Purge...\n"));
-       if (edg_wll_Purge(ctx, request, result) != 0) {
-               fprintf(stderr,"Error running the edg_wll_Purge().\n");
-               printerr(ctx);
-               switch ( edg_wll_Error(ctx, NULL, NULL) )
-               {
-               case ENOENT:
-               case EPERM:
-               case EINVAL:
-                       break;
-               default:
-                       goto main_end;
-               }
-       }
-
-       /* examine the result */
-       dprintf(("Examining the result of edg_wll_Purge...\n"));
-       if (result->server_file) {
-               printf("Server dump: %s\n",result->server_file);
-       } else {
-               printf("The jobs were not dumped.\n");
-       }
-       if (request->flags & EDG_WLL_PURGE_LIST_JOBS) {
-               printf("The following jobs %s purged:\n",
-                       request->flags & EDG_WLL_PURGE_REALLY_PURGE ? "were" : "would be");
-               if (!result->jobs) printf("None.\n");
-               else {
-                       int i;
-                       for ( i = 0; result->jobs[i]; i++ )
-                               printf("%s\n",result->jobs[i]);
-               }
-       }
-
-main_end:
-       dprintf(("End.\n"));
-       if (request)
-       {
-               free_jobs(request->jobs);
-               free(request);
-       }
-       if (result) free(result);
-       edg_wll_FreeContext(ctx);
-       return 0;
-}
-
-
-static void printerr(edg_wll_Context ctx) 
-{
-       char    *errt,*errd;
-
-       edg_wll_Error(ctx,&errt,&errd);
-       fprintf(stderr,"%s (%s)\n",errt,errd);
-}
-
-
-static int read_jobIds(const char *file, char ***jobs_out)
-{
-        FILE    *jobIds = fopen(file,"r");
-        char    buf[256];
-               char    **jobs;
-        int     cnt = 0;
-
-       jobs = NULL;
-
-
-        if (!jobIds) {
-                perror(file);
-                return 1;
-        }
-
-        while ( 1 ) {
-                char    *nl;
-                if ( !fgets(buf,sizeof buf,jobIds) )
-               {
-                       if (feof(jobIds))
-                               break;
-
-                       free_jobs(jobs);
-                       fprintf(stderr, "Error reading file\n");
-                       return 1;
-               }
-                nl = strchr(buf,'\n');
-                if (nl) *nl = 0;
-               /* TODO: check if it is really jobId, e.g. by edg_wlc_JobIdParse() */
-
-               if ( !(jobs = realloc(jobs, (cnt+2)*sizeof(*jobs))) )
-               {
-                       perror("cond_parse()");
-                       return(1);
-               }
-                jobs[cnt++] = strdup(buf);
-        }
-       jobs[cnt] = NULL;
-
-        fclose(jobIds);
-       *jobs_out = jobs;
-
-        return 0;
-}
-
-static int get_timeout(const char *arg, int *timeout) 
-{
-       int t = -1;
-       char tunit = '\0';
-
-       if (sscanf(arg,"%d%c",&t,&tunit) > 0) {
-               if (tunit) {
-                       switch (tunit) {
-                               case 'd': t *= 86400; break; // 24*60*60
-                               case 'h': t *= 3600; break; // 60*60
-                               case 'm': t *= 60; break;
-                               case 's': break;
-                               default: fprintf(stderr,"Allowed time units are s,m,h,d\n");
-                                       return -1;
-                       }
-               }
-       }
-       if (t < 0) return -1;
-       *timeout = t;
-       return 0;
-}
-
-static const char* const request_headers[] = {
-       "Cache-Control: no-cache",
-       "Accept: application/x-dglb",
-       "User-Agent: edg_wll_Api/" PROTO_VERSION "/" COMP_PROTO,
-       "Content-Type: application/x-dglb",
-       NULL
-};
-
-int edg_wll_Purge(
-               edg_wll_Context ctx,
-               edg_wll_PurgeRequest *request,
-               edg_wll_PurgeResult *result)
-{
-       char    *send_mess,
-               *response = NULL,
-               *recv_mess = NULL;
-
-       edg_wll_ResetError(ctx);
-
-       if (request->flags & EDG_WLL_PURGE_CLIENT_DUMP)
-               return edg_wll_SetError(ctx,ENOSYS,"client dump");
-
-       if (edg_wll_PurgeRequestToXML(ctx, request, &send_mess))
-               goto edg_wll_purge_end;
-
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-       if (ctx->p_tmp_timeout.tv_sec < 600) ctx->p_tmp_timeout.tv_sec = 600;
-
-       if (set_server_name_and_port(ctx, NULL)) 
-               goto edg_wll_purge_end;
-
-       if (edg_wll_http_send_recv(ctx,
-               "POST /purgeRequest HTTP/1.1", request_headers, send_mess,
-               &response, NULL, &recv_mess)) 
-               goto edg_wll_purge_end;
-
-       if (http_check_status(ctx, response, &recv_mess))
-               goto edg_wll_purge_end;
-
-       if (edg_wll_ParsePurgeResult(ctx, recv_mess, result))
-               goto edg_wll_purge_end;
-
-edg_wll_purge_end:
-       if (response) free(response);
-       if (recv_mess) free(recv_mess);
-       if (send_mess) free(send_mess);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.client/src/uiwrap.c.T b/org.glite.lb.client/src/uiwrap.c.T

deleted file mode 100644 (file)

index 983a43b..0000000
--- a/org.glite.lb.client/src/uiwrap.c.T
+++ /dev/null
@@ -1,102 +0,0 @@
-#ident "$Header$"
-/*
-@@@AUTO
-*/
-@@@LANG: C
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
-
-@@@{
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $a = "(edg_wll_Context context";
-       my $b = "(context,EDG_WLL_EVENT_$tu,EDG_WLL_FORMAT_$tu";
-       my $decl = "";
-       my $free = "";
-       my $doc = qq{
- * \\param context\tcontext to work with,
-};
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $ft;
-               my $bfn = $fn;
-                if ($f->{codes}) {
-#                        $ft = "enum edg_wll\_$t" . ucfirst $fn;
-                        $ft = "char *";
-                } else {
-                        $ft = $f->getType;
-                }
-               if ($ULMasString{$f->{type}}) {
-                       $decl .= "\tchar *s_$fn = ".$f->getType()."ToString($fn);\n";
-                       $free .= "\tfree(s_$fn);\n";
-                       $bfn = "s_$fn";
-               }
-               $ft = "const ".$ft;
-               my $fc = $f->getComment;
-               $a = $a . ", $ft $fn";
-               $b = $b . ", $bfn";
-               $doc = $doc . " * \\param $fn\t$fc\n";
-       }
-       $a = $a . ")";
-       $b = $b . ")";
-
-       gen qq{
-/*!
- * \\fn int edg_wll_Log$t$a; 
- * \\brief simple wrapper around edg_wll_LogEvent for event $t} . $doc . qq{ * \\see edg_wll_LogEvent\(\)
- */
-};
-#      gen "\nextern int edg_wll_Log$t$a;\n\n";
-       gen qq{
-int edg_wll_Log$t$a
-\{
-$decl
-       return edg_wll_LogEvent$b;
-\}\n
-};
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $ft;
-                if ($f->{codes}) {
-#                        $ft = "enum edg_wll\_$t" . ucfirst $fn;
-                        $ft = "char *";
-                } else {
-                        $ft = $f->getType;
-                }
-               my $ftreg = $ft;
-               $ftreg =~ s/\*/\\\*/g;
-               $ftreg = "const ".$ftreg;
-               my $fc = $f->getComment;
-               if ($f->{codes}) {
-                       for (@{$f->{codes}}) {
-                               my $code = uc $_->{name};
-                               my $c = $a;
-                               my $d = $b;
-                               my $e = $doc;
-                               $c =~ s/, $ftreg $fn//g;
-                               $d =~ s/$fn/"$code"/g;
-                               $e =~ s/ \* \\param $fn\t$fc\n//g;
-                               gen qq{
-/*!
- * \\fn int edg_wll_Log$t$code$c; 
- * \\brief simple wrapper around edg_wll_LogEvent for event $t, $fn $code} . $e . qq{ * \\see edg_wll_LogEvent\(\)
- */
-};
-#                              gen "\nextern int edg_wll_Log$t$code$c;\n\n";
-                               gen qq{
-int edg_wll_Log$t$code$c
-\{
-$decl;
-       return edg_wll_LogEvent$d;
-\}\n
-};
-                       }
-               }
-       }
-}
-@@@}
diff --git a/org.glite.lb.client/test/prod_proto_test.c b/org.glite.lb.client/test/prod_proto_test.c

deleted file mode 100644 (file)

index e0214fe..0000000
--- a/org.glite.lb.client/test/prod_proto_test.c
+++ /dev/null
@@ -1,33 +0,0 @@
-#define edg_wll_gss_read_full(a,b,c,d,e,f)  test_edg_wll_gss_read_full(a,b,c,d,e,f)
-#define edg_wll_gss_write_full(a,b,c,d,e,f) test_edg_wll_gss_write_full(a,b,c,d,e,f)
-#define edg_wll_GssConnection               int
-
-#include "prod_proto.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/lb_gss.h"
-
-int
-test_edg_wll_gss_read_full(int *fd,
-                          void *buf,
-                          size_t bufsize,
-                          struct timeval *timeout,
-                          size_t *total,
-                          edg_wll_GssStatus *code) 
-{
-  return(0);
-}
-
-int
-test_edg_wll_gss_write_full(int *fd,
-                           const void *buf,
-                           size_t bufsize,
-                           struct timeval *timeout,
-                           size_t *total,
-                           edg_wll_GssStatus *code) 
-{
-  *total = write(*fd, buf, bufsize);
-  return(*total < 0 ? *total : 0);
-}
-
-#include "prod_proto.c"
diff --git a/org.glite.lb.client/test/producer_test.cpp b/org.glite.lb.client/test/producer_test.cpp

deleted file mode 100644 (file)

index b717b85..0000000
--- a/org.glite.lb.client/test/producer_test.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-#include <iostream>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-
-extern "C" {
-int edg_wll_log_proto_client(int *,char *,char *,int,int);
-}
-
-class ProducerTest: public  CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(ProducerTest);
-       CPPUNIT_TEST(testProtoClient);
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-
-  void setUp() {
-    pipe(pd);
-  }
-
-  void tearDown() {
-    close(pd[0]);
-    close(pd[1]);
-  }
-
-  void testProtoClient() {
-    int ret=0;
-    CPPUNIT_ASSERT( ret == 0 );
-  }
-
-private:
-  int  pd[2];
-
-  int log_proto_server(int con, char *logline) {
-  }
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( ProducerTest );
-
-int 
-main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-       
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.common/.cvsignore b/org.glite.lb.common/.cvsignore

deleted file mode 100644 (file)

index 1df717b..0000000
--- a/org.glite.lb.common/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.lb.common/LICENSE b/org.glite.lb.common/LICENSE

deleted file mode 100644 (file)

index 259a91f..0000000
--- a/org.glite.lb.common/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware\r
-================================\r
-\r
-Copyright (c) 2004 on behalf of the EU EGEE Project: \r
-The European Organization for Nuclear Research (CERN), \r
-Istituto Nazionale di Fisica Nucleare (INFN), Italy\r
-Datamat Spa, Italy\r
-Centre National de la Recherche Scientifique (CNRS), France\r
-CS Systeme d'Information (CSSI), France\r
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden\r
-Universiteit van Amsterdam (UvA), Netherlands\r
-University of Helsinki (UH.HIP), Finlan\r
-University of Bergen (UiB), Norway\r
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom\r
-\r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are\r
-met: \r
-\r
-1. Redistributions of source code must retain the above copyright\r
-notice, this list of conditions and the following disclaimer.\r
-\r
-2. Redistributions in binary form must reproduce the above copyright\r
-notice, this list of conditions and the following disclaimer in the\r
-documentation and/or other materials provided with the distribution.\r
-\r
-3. The end-user documentation included with the redistribution, if\r
-any, must include the following acknowledgment: "This product includes\r
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."\r
-Alternatively, this acknowledgment may appear in the software itself, if\r
-and wherever such third-party acknowledgments normally appear.\r
-\r
-4. The names EGEE and the EU EGEE Project must not be\r
-used to endorse or promote products derived from this software without\r
-prior written permission. For written permission, please contact\r
-<email address>.\r
-\r
-5. You are under no obligation whatsoever to provide anyone with any\r
-bug fixes, patches, or upgrades to the features, functionality or\r
-performance of the Software ("Enhancements") that you may develop over\r
-time; however, if you choose to provide your Enhancements to The EU\r
-EGEE Project, or if you choose to otherwise publish or distribute your\r
-Enhancements, in source code form without contemporaneously requiring\r
-end users of The EU EGEE Proejct to enter into a separate written license\r
-agreement for such Enhancements, then you hereby grant The EU EGEE Project\r
-a non-exclusive, royalty-free perpetual license to install, use, copy,\r
-modify, prepare derivative works, incorporate into the EGEE Middleware\r
-or any other computer software, distribute, and sublicense your\r
-Enhancements or derivative works thereof, in binary and source code\r
-form (if any), whether developed by The EU EGEE Project or third parties.\r
-\r
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\r
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE\r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\r
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\r
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\r
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\r
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
-This software consists of voluntary contributions made by many\r
-individuals on behalf of the EU EGEE Prject. For more information on The\r
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on\r
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/\r
-\r
-\r
diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile

deleted file mode 100644 (file)

index e52d6f0..0000000
--- a/org.glite.lb.common/Makefile
+++ /dev/null
@@ -1,191 +0,0 @@
-# Default values
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-common
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-
--include Makefile.inc
--include ../Makefile.inc
-
-VPATH=${top_srcdir}/src:${top_srcdir}/test
-AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
-
-
-SUFFIXES = .T
-
-CC=gcc
-
-DEBUG:=-g -O0 -Wall
-GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour}
-GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour}
-
-CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
-       -I${stagedir}/include \
-       -I${glite_location}/include \
-       -I${expat_prefix}/include \
-       -I${ares_prefix}/include \
-       ${COVERAGE_FLAGS} \
-       -DDATAGRID_EXTENSION
-
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-        -lglobus_common_${nothrflavour} \
-        -lglobus_gssapi_gsi_${nothrflavour} \
-
-GLITE_LIBS:=-L${glite_location}/lib
-EXPAT_LIBS:=-L${expat_prefix}/lib -lexpat
-ARES_LIBS:=-L${ares_prefix}/lib -lares
-LDFLAGS:=-L${stagedir}/lib \
-    ${COVERAGE_FLAGS}
-
-EXT_LIBS:= ${EXPAT_LIBS} ${ARES_LIBS} ${GLOBUS_LIBS}
-
-# breaks linking when not installed in /opt, /home/dimeglio etc.
-#    ${GLITE_LIBS} \
-#    ${GLOBUS_LIBS} \
-#    ${EXPAT_LIBS} \
-#    ${ARES_LIBS} \
-
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
-
-COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} 
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
-INSTALL:=libtool --mode=install install
-
-OBJS:=lb_gss.o escape.o events.o mini_http.o query_rec.o status.o \
-       xml_conversions.o xml_parse.o ulm_parse.o param.o \
-       events_parse.o il_string.o il_int.o notifid.o \
-       il_log.o il_msg.o context.o trio.o strio.o
-LOBJS:=${OBJS:.o=.lo}
-
-THROBJS:=${OBJS:.o=.thr.o}
-THRLOBJS:=${OBJS:.o=.thr.lo}
-
-HDRS:=context-int.h  lb_gss.h  mini_http.h authz.h xml_parse.h \
-       xml_conversions.h log_proto.h events_parse.h il_string.h escape.h \
-       ulm_parse.h trio.h
-
-STATICLIB:=libglite_lb_common_${nothrflavour}.a
-THRSTATICLIB:=libglite_lb_common_${thrflavour}.a
-LTLIB:=libglite_lb_common_${nothrflavour}.la
-THRLTLIB:=libglite_lb_common_${thrflavour}.la
-
-default: all
-
-all compile: ${STATICLIB} ${LTLIB} ${THRSTATICLIB} ${THRLTLIB}
-
-${STATICLIB}: ${OBJS}
-       ar crv $@ ${OBJS}
-       ranlib $@
-
-${THRSTATICLIB}: ${THROBJS}
-       ar crv $@ ${THROBJS}
-       ranlib $@
-
-${LTLIB}: ${OBJS}
-       ${LINK} -o $@ ${LOBJS} \
-               -lglite_wmsutils_cjobid \
-               -lm
-
-${THRLTLIB}: ${THROBJS}
-       ${LINK} -o $@ ${THRLOBJS} \
-               -lglite_wmsutils_cjobid \
-               -lm
-
-stage: compile
-       $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
-
-check: compile check.parse check.gss check.il
-
-check.parse: test_parse
-       ./test_parse
-
-test_parse: parse.cpp
-       ${CXX} -c ${CFLAGS} ${TEST_INC} $<
-       ${LINKXX} -o test_parse parse.o ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
-
-check.gss: test_gss
-       # ./test_gss
-       echo test_gss not run automatically util we have got some credentials
-
-check.il: il_test
-       ./il_test
-
-test_gss: test_gss.o
-       ${LINKXX} -o $@ test_gss.o ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
-
-il_test: il_test.o il_int_test.o il_string_test.o
-       ${LINKXX} -o $@ $+ ${LTLIB} ${TEST_LIBS} ${EXT_LIBS}
-
-test_coverage:
-       -mkdir coverage
-       cd coverage && $(MAKE) -f ../Makefile top_srcdir=../../ COVERAGE_FLAGS="-fprofile-arcs -ftest-coverage" check
-       cd coverage && for i in ${OBJS}; do gcov -o .libs/ $$i ; done
-
-dist: distsrc distbin
-
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-
-install:
-       mkdir -p ${PREFIX}/lib
-       mkdir -p ${PREFIX}/share/doc/${package}-${version}
-       ${INSTALL} -m 644 ${LTLIB} ${THRLTLIB} ${PREFIX}/lib
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       if [ x${DOSTAGE} = xyes ]; then \
-               mkdir -p ${PREFIX}/include/${globalprefix}/${lbprefix} ; \
-               (cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbprefix}) ; \
-               install -m 644 ${STATICLIB} ${THRSTATICLIB} ${PREFIX}/lib; \
-       fi
-
-clean:
-
-
-%.o: %.c
-       ${COMPILE} ${GLOBUSINC} -c $<
-
-test_gss.o: %.o: %.cpp
-       ${CXX} -c ${CFLAGS} ${GLOBUSINC} ${TEST_INC} $<
-
-il_int_test.o il_string_test.o il_test.o: %.o: %.cpp
-       ${CXX} -c ${CFLAGS} ${TEST_INC} $<
-
-%.thr.o: %.c
-       ${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
-
-%.h: %.h.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-%.c: %.c.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-%.cpp: %.cpp.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
diff --git a/org.glite.lb.common/build.xml b/org.glite.lb.common/build.xml

deleted file mode 100755 (executable)

index d2997c8..0000000
--- a/org.glite.lb.common/build.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite LB Common module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.5  2004/07/28 12:27:00  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.4  2004/07/06 17:51:37  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.3  2004/06/22 22:49:46  dimeglio
-       Removed debug comments
-       
-       Revision 1.2  2004/06/22 22:06:52  dimeglio
-       Added standard comments
-       
--->
-
-<project name="common" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite LB Common Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                 Load configure options (order is important)
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-        <import file="${component.configure.options.file}"/>
-       
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-
-               <!-- Copy support files from the subsystem project to the component project-->
-               <copy toDir="${module.project.dir}">
-                       <fileset dir="${subsystem.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </copy> 
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-               <delete>
-                       <fileset dir="${module.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </delete>       
-       </target>
-       
-       <!-- =========================================
-            RPM settings
-            ========================================= -->
-
-       <property name="build.package.summary" value="L&amp;B common subroutines library" />
-       <property name="build.package.description" value="
-Library of common routines used by Logging &amp; Bookkeeping daemons,&#xA;client
-libraries, programs, and utilities." />
-
-</project>             
diff --git a/org.glite.lb.common/interface/authz.h b/org.glite.lb.common/interface/authz.h

deleted file mode 100644 (file)

index ccb02ad..0000000
--- a/org.glite.lb.common/interface/authz.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _LB_AUTHZ_H
-#define _LB_AUTHZ_H
-
-#ident "$Header$"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _edg_wll_VomsGroup {
-       char *vo;
-       char *name;
-} edg_wll_VomsGroup;
-
-typedef struct _edg_wll_VomsGroups {
-       size_t len;
-       edg_wll_VomsGroup *val;
-} edg_wll_VomsGroups;
-
-#ifdef __cplusplus 
-}
-#endif
-
-#endif
diff --git a/org.glite.lb.common/interface/context-int.h b/org.glite.lb.common/interface/context-int.h

deleted file mode 100644 (file)

index d9db7e2..0000000
--- a/org.glite.lb.common/interface/context-int.h
+++ /dev/null
@@ -1,163 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_CONTEXT_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_CONTEXT_H__
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-#include "lb_gss.h"
-#include "authz.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-       
-typedef struct _edg_wll_SeqCode {
-       unsigned int    c[EDG_WLL_SOURCE__LAST];
-} edg_wll_SeqCode;
-
-
-
-typedef struct _edg_wll_ConnPool {
-/* address and port where we are connected to */
-       char            *peerName;
-       unsigned int    peerPort;
-       
-/* http(s) stream */
-       gss_cred_id_t   gsiCred;
-       edg_wll_GssConnection   gss;
-       char            *buf;
-       int             bufUse,bufSize;
-
-/* timestamp of usage of this entry in ctx.connPool */
-       struct timeval  lastUsed;
-} edg_wll_ConnPool;
-
-
-
-struct _edg_wll_Context {
-/* Error handling */
-       int             errCode;        /* recent error code */
-       char            *errDesc;       /* additional error description */
-
-/* server part */
-
-       void            *mysql;
-       edg_wll_ConnPool        *connPool;
-       edg_wll_ConnPool        *connPoolNotif;         /* hold _one_ connection from notif-interlogger */
-
-       int             semaphores,semset;
-       edg_wll_QueryRec        **job_index;
-       void            *job_index_cols;
-       
-       time_t          peerProxyValidity;
-       char            *peerName;
-       edg_wll_VomsGroups      vomsGroups;
-       int             allowAnonymous;
-       int             noAuth;         /* if set, you can obtain info about events     */
-                                       /* and jobs not belonging to you                */
-       int             noIndex;        /* don't enforce indices */
-       int             rgma_export;
-       int             strict_locking; /* lock jobs for storing event too */
-
-       int             is_V21;         /* true if old (V21) request arrived */
-       
-/* server limits */
-       int             softLimit;
-       int             hardJobsLimit;
-       int             hardEventsLimit;
-
-       time_t          notifDuration;
-
-/* purge and dump files storage */
-       char            *dumpStorage;
-       char            *purgeStorage;
-
-/* flag for function store_event
- * if set then event are loaded from dump file
- */
-       int             event_load;
-
-/* address and port we are listening at */
-       char            *srvName;
-       unsigned int    srvPort;
-       
-/* pool of connections from client */
-       int             poolSize;
-       int             connOpened;     /* number of opened connections  */
-       int             connToUse;      /* index of connection that will *
-                                        *  be used by low-level f-cions */
-       // XXX similar variables will be needed for connPoolNotif
-
-       
-/* other client stuff */
-       int             notifSock;              /* default client socket        *
-                                                * for receiving notifications  */   
-       
-/* user settable parameters */
-       char            *p_host;
-       edg_wll_Source  p_source;
-       char            *p_instance;
-       enum edg_wll_Level      p_level;
-       char            *p_destination;
-       int             p_dest_port;
-       struct timeval  p_log_timeout,p_sync_timeout,p_query_timeout, p_notif_timeout, p_tmp_timeout;
-       char            *p_query_server;
-       int             p_query_server_port;
-       int             p_query_server_override;
-       int             p_query_events_limit;
-       int             p_query_jobs_limit;
-       edg_wll_QueryResults    p_query_results;
-       char            *p_notif_server;
-       int             p_notif_server_port;
-       char            *p_proxy_filename;
-       char            *p_cert_filename;
-       char            *p_key_filename;
-       time_t          purge_timeout[EDG_WLL_NUMBER_OF_STATCODES];
-/* producer part */
-       edg_wlc_JobId   p_jobid;
-       edg_wll_SeqCode p_seqcode;
-};
-
-/* to be used internally: set, update and and clear the error information in 
- * context, the desc string (if provided) is strdup()-ed
- *
- * all return the error code for convenience (usage in return statement) */
-
-
-extern int edg_wll_SetError(
-       edg_wll_Context,        /* context */
-       int,                    /* error code */
-       const char *            /* error description */
-);
-
-extern int edg_wll_SetErrorGss(
-       edg_wll_Context,
-       const char *,
-       edg_wll_GssStatus *
-);
-
-/** update errDesc and errCode */
-extern int edg_wll_UpdateError(
-       edg_wll_Context,        /* context */
-       int,                    /* error code */
-       const char *            /* error description */
-);
-
-/** set errCode to 0, free errDesc */
-extern int edg_wll_ResetError(edg_wll_Context);
-
-/** retrieve standard error text wrt. code
- * !! does not allocate memory */
-extern const char *edg_wll_GetErrorText(int);
-
-extern int edg_wll_ContextReopen(edg_wll_Context);
-
-extern int edg_wll_SetSequenceCode(edg_wll_Context, const char *, int);
-extern int edg_wll_IncSequenceCode(edg_wll_Context ctx);
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_CONTEXT_H__ */
diff --git a/org.glite.lb.common/interface/escape.h b/org.glite.lb.common/interface/escape.h

deleted file mode 100644 (file)

index 4cf54c0..0000000
--- a/org.glite.lb.common/interface/escape.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_ESCAPE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_ESCAPE_H__
-/*!
- * \file Client/escape.h
- * \brief Prototypes for Client/escape.c
- */
-
-#ident "$Header$"
-
-
-/*!
- * \fn char *edg_wll_LogEscape(const char *str)
- * \param str           a string to escape
- * \return              new (allocated) escaped string
- * \brief in given string (ULM) escape all ULM_QM, ULM_BS and ULM_LF by ULM_BS
- */
-
-char *edg_wll_LogEscape(const char *);
-
-
-/*!
- * \fn char *edg_wll_LogUnescape(const char *str)
- * \param str           a string to unescape
- * \return              new (allocated) unescaped string
- * \brief in given string (ULM) unescape all escaped ULM_QM, ULM_BS and ULM_LF
- */
-
-char *edg_wll_LogUnescape(const char *);
-
-
-/*!
- * \fn char *edg_wll_EscapeXML(const char *str);
- * \param str          a string to escape
- * \return             new (allocated) escaped string
- * \brief in given string (XML) escape all unwanted characters
- */
-
-char *edg_wll_EscapeXML(const char *);
-
-
-/*!
- * \fn char *edg_wll_UnescapeXML(const char *str)
- * \param str          a string to unescape
- * \return             new (allocated) unescaped string
- * \brief in given string (XML) unescape all escaped characters
- */
-
-char *edg_wll_UnescapeXML(const char *);
-
-
-/*!
- * \fn char *edg_wll_EscapeSQL(const char *str)
- * \param str          a string to escape
- * \return             new (allocated) escaped string
- * \briefin given string (SQL) escape all unwanted characters
- */
-
-char *edg_wll_EscapeSQL(const char *);
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_ESCAPE_H__ */
diff --git a/org.glite.lb.common/interface/events_parse.h b/org.glite.lb.common/interface/events_parse.h

deleted file mode 100644 (file)

index d4ed8d7..0000000
--- a/org.glite.lb.common/interface/events_parse.h
+++ /dev/null
@@ -1,83 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_EVENTS_PARSE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_EVENTS_PARSE_H__
-
-#ident "$Header$"
-
-#include "glite/lb/events.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * Parse a ULM line into a edg_wll_Event structure
- * \param context IN: context to work with
- * \param logline IN: ULM string to parse
- * \param event OUT: parsed event
- *     (may be NULL - syntax checking with no output)
- */
-extern edg_wll_ErrorCode edg_wll_ParseEvent(
-       edg_wll_Context context,
-       edg_wll_LogLine logline,
-       edg_wll_Event ** event
-);
-
-/** 
- * Generate ULM line from edg_wll_Event structure
- * \param context IN: context to work with
- * \param event IN: event to unparse
- */
-extern edg_wll_LogLine edg_wll_UnparseEvent(
-       edg_wll_Context context,
-       edg_wll_Event * event
-);
-
-/**
- * Check event for completness.
- * Auxiliary function, checks whether all required fields of
- * the event type are present.
- * \param context IN: context to work with
- * \param event IN: event to check
- */
-extern edg_wll_ErrorCode edg_wll_CheckEvent(
-       edg_wll_Context context,
-       edg_wll_Event * event
-);
-
-/**
- * Parse "only" jobId from ULM message
- * \param logline IN: ULM string to parse
- * \return jobId string
- */
-extern char *edg_wll_GetJobId(edg_wll_LogLine logline);
-
-/**
- * Parse a special Notification ULM line into a edg_wll_Event structure
- * \param context IN: context to work with
- * \param logline IN: ULM string to parse
- * \param event OUT: parsed event
- *     (may be NULL - syntax checking with no output)
- */
-extern edg_wll_ErrorCode edg_wll_ParseNotifEvent(
-       edg_wll_Context context,
-       edg_wll_LogLine logline,
-       edg_wll_Event ** event
-);
-
-/** 
- * Generate a special Notification ULM line from edg_wll_Event structure
- * \param context IN: context to work with
- * \param event IN: event to unparse
- */
-extern edg_wll_LogLine edg_wll_UnparseNotifEvent(
-       edg_wll_Context context,
-       edg_wll_Event * event
-);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_EVENTS_PARSE_H__ */
diff --git a/org.glite.lb.common/interface/il_string.h b/org.glite.lb.common/interface/il_string.h

deleted file mode 100644 (file)

index db480f7..0000000
--- a/org.glite.lb.common/interface/il_string.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef NET_STRING_H
-#define NET_STRING_H
-
-#ident "$Header$"
-
-#define MAXLEN 1024
-
-char *put_int(char *p, int d);
-char *_put_int(char *p, int d);
-char *put_string(char *p, char *s);
-
-char *get_int(char *p, int *d);
-char *_get_int(char *p, int *d);
-char *get_string(char *p, char **s);
-
-int len_string(char *s);
-int len_int(int d);
-
-enum {
-  LB_OK    = 0,
-  LB_NOMEM = 200,
-  LB_PROTO = 400,
-  LB_AUTH  = 500,
-  LB_PERM  = 600,
-  LB_DBERR = 700,
-  LB_SYS   = 800,
-  LB_TIME  = 900
-};
-
-#endif
diff --git a/org.glite.lb.common/interface/lb_gss.h b/org.glite.lb.common/interface/lb_gss.h

deleted file mode 100644 (file)

index 047b718..0000000
--- a/org.glite.lb.common/interface/lb_gss.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_LB_GSS_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_LB_GSS_H__
-
-#ident "$Header$"
-
-#include <gssapi.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  EDG_WLL_GSS_OK               =  0,  /* no GSS errors */
-  EDG_WLL_GSS_ERROR_GSS                = -1,  /* GSS specific error, call edg_wll_get_gss_error() for details */
-  EDG_WLL_GSS_ERROR_TIMEOUT    = -2,  /* Timeout */
-  EDG_WLL_GSS_ERROR_EOF                = -3,  /* EOF occured */
-  EDG_WLL_GSS_ERROR_ERRNO      = -4,  /* System error. See errno */
-  EDG_WLL_GSS_ERROR_HERRNO     = -5   /* Resolver error. See h_errno */
-};
-
-typedef struct _edg_wll_GssConnection {
-  gss_ctx_id_t context;
-  int sock;
-  char buffer[BUFSIZ];
-  size_t bufsize;
-} edg_wll_GssConnection;
-
-typedef struct _edg_wll_GssStatus {
-  OM_uint32 major_status;
-  OM_uint32 minor_status;
-} edg_wll_GssStatus;
-
-/* XXX Support anonymous connections. Are we able/required to support
- * anonymous servers as well. */
-
-int
-edg_wll_gss_acquire_cred_gsi(char *cert_file,
-                            char *key_file,
-                            gss_cred_id_t *cred,
-                            char **name,
-                            edg_wll_GssStatus* gss_code);
-
-int 
-edg_wll_gss_connect(gss_cred_id_t cred,
-                   char const *hostname,
-                   int port,
-                   struct timeval *timeout,
-                   edg_wll_GssConnection *connection,
-                   edg_wll_GssStatus* gss_code);
-
-int
-edg_wll_gss_accept(gss_cred_id_t cred,
-                  int sock,
-                  struct timeval *timeout,
-                  edg_wll_GssConnection *connection,
-                  edg_wll_GssStatus* gss_code);
-
-int
-edg_wll_gss_read(edg_wll_GssConnection *connection,
-                void *buf,
-                size_t bufsize,
-                struct timeval *timeout,
-                edg_wll_GssStatus* gss_code);
-
-int
-edg_wll_gss_write(edg_wll_GssConnection *connection,
-                 const void *buf,
-                 size_t bufsize,
-                 struct timeval *timeout,
-                 edg_wll_GssStatus* gss_code);
-
-int
-edg_wll_gss_read_full(edg_wll_GssConnection *connection,
-                     void *buf,
-                     size_t bufsize,
-                     struct timeval *timeout,
-                     size_t *total,
-                     edg_wll_GssStatus* gss_code);
-
-int
-edg_wll_gss_write_full(edg_wll_GssConnection *connection,
-                      const void *buf,
-                      size_t bufsize,
-                      struct timeval *timeout,
-                      size_t *total,
-                      edg_wll_GssStatus* gss_code);
-
-int
-edg_wll_gss_watch_creds(const char * proxy_file,
-                       time_t * proxy_mtime);
-
-int
-edg_wll_gss_get_error(edg_wll_GssStatus* gss_code,
-                     const char *prefix,
-                     char **errmsg);
-
-int
-edg_wll_gss_close(edg_wll_GssConnection *connection,
-                 struct timeval *timeout);
-
-int 
-edg_wll_gss_reject(int sock);
-
-int
-edg_wll_gss_oid_equal(const gss_OID a,
-                     const gss_OID b);
-
-/*
-int
-edg_wll_gss_get_name(gss_cred_id_t cred, char **name);
-*/
-
-#ifdef __cplusplus
-} 
-#endif
-       
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_LB_GSS_H__ */
diff --git a/org.glite.lb.common/interface/log_proto.h b/org.glite.lb.common/interface/log_proto.h

deleted file mode 100644 (file)

index a2a59a8..0000000
--- a/org.glite.lb.common/interface/log_proto.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_LOG_PROTO_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_LOG_PROTO_H__
-
-#ident "$Header$"
-
-/**
- * \file edg/workload/logging/common/log_proto.h
- * \brief common part of the logging protocol
- * \note private
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-/**
- * default (noauth) user name
- */
-/** default user */
-#define EDG_WLL_LOG_USER_DEFAULT                "anonymous"
-
-
-/**
- * default prefix for names of log files 
- */
-/** default prefix */
-#define EDG_WLL_LOG_PREFIX_DEFAULT              "/tmp/dglogd.log"
-
-
-/** 
- * default local-logger Socket header 
- */
-/** header text */
-#define EDG_WLL_LOG_SOCKET_HEADER               "DGLOG"
-/** header length */
-#define EDG_WLL_LOG_SOCKET_HEADER_LENGTH        5
-
-
-/**
- * default local-logger destination 
- */
-/** host */
-#define EDG_WLL_LOG_HOST_DEFAULT               "localhost"
-/** port */
-#define EDG_WLL_LOG_PORT_DEFAULT               9002
-
-
-/**
- * default and maximal logging timeout (in seconds)
- */
-#define EDG_WLL_LOG_TIMEOUT_DEFAULT            120
-#define EDG_WLL_LOG_TIMEOUT_MAX                        1800
-#define EDG_WLL_LOG_SYNC_TIMEOUT_DEFAULT       120
-#define EDG_WLL_LOG_SYNC_TIMEOUT_MAX           1800
-
-
-/**
- * maximal message size for sync logging
- */
-/** max message size in bytes */
-// unlimited for tests!
-#define EDG_WLL_LOG_SYNC_MAXMSGSIZE            102400000
-
-       
-/**
- * default maximal number of simultaneously open connections from one client
- */
-#define EDG_WLL_LOG_CONNECTIONS_DEFAULT                4
-
-       
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_LOG_PROTO_H__ */
diff --git a/org.glite.lb.common/interface/mini_http.h b/org.glite.lb.common/interface/mini_http.h

deleted file mode 100644 (file)

index c3d7bb0..0000000
--- a/org.glite.lb.common/interface/mini_http.h
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_MINI_HTTP_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_MINI_HTTP_H__
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-
-/* XXX: not a good place for the folowing #def's but we ain't got better currently */
-/** protocol version */
-#define PROTO_VERSION           "3.0"
-#define PROTO_VERSION_V21      "2.1"
-/** backward protocol compatibility     */
-/* version separated by comma           */
-/* e.g. "1.0,1.2,1.3"                   */
-#define COMP_PROTO              "3.0"
-#define COMP_PROTO_V21         "2.0,2.1"
-
-
-/* subset of HTTP codes we return */
-#define HTTP_OK                        200
-#define HTTP_BADREQ            400
-#define HTTP_UNAUTH            401
-#define HTTP_NOTFOUND          404
-#define HTTP_NOTALLOWED                405
-#define HTTP_UNSUPPORTED       415 
-#define HTTP_INTERNAL          500
-#define HTTP_NOTIMPL           501
-#define HTTP_UNAVAIL           503
-#define HTTP_INVALID           579
-
-extern edg_wll_ErrorCode edg_wll_http_recv(
-       edg_wll_Context,        /* INOUT: context */
-       char **,        /* OUT: first line */
-       char ***,       /* OUT: null terminated array of headers */
-       char **         /* OUT: message body */
-);
-
-extern edg_wll_ErrorCode edg_wll_http_send(
-       edg_wll_Context,        /* INOUT: context */
-       const char *,           /* IN: first line */
-       char const * const *,   /* IN: headers */
-       const char *            /* IN: message body */
-);
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_MINI_HTTP_H__ */
diff --git a/org.glite.lb.common/interface/trio.h b/org.glite.lb.common/interface/trio.h

deleted file mode 100644 (file)

index 04f133c..0000000
--- a/org.glite.lb.common/interface/trio.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************/
-
-#ifndef TRIO_TRIO_H
-#define TRIO_TRIO_H
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* make utility and C++ compiler in Windows NT fails to find this symbol */ 
-#if defined(WIN32) && !defined(isascii)
-# define isascii ((unsigned)(x) < 0x80)
-#endif
-
-/*
- * Error codes.
- *
- * Remember to add a textual description to trio_strerror.
- */
-enum {
-  TRIO_EOF      = 1,
-  TRIO_EINVAL   = 2,
-  TRIO_ETOOMANY = 3,
-  TRIO_EDBLREF  = 4,
-  TRIO_EGAP     = 5,
-  TRIO_ENOMEM   = 6,
-  TRIO_ERANGE   = 7
-};
-
-/* Error macros */
-#define TRIO_ERROR_CODE(x) ((-(x)) & 0x00FF)
-#define TRIO_ERROR_POSITION(x) ((-(x)) >> 8)
-#define TRIO_ERROR_NAME(x) trio_strerror(x)
-
-const char *trio_strerror(int);
-
-/*************************************************************************
- * Print Functions
- */
-
-int trio_printf(const char *format, ...);
-int trio_vprintf(const char *format, va_list args);
-int trio_printfv(const char *format, void **args);
-
-int trio_fprintf(FILE *file, const char *format, ...);
-int trio_vfprintf(FILE *file, const char *format, va_list args);
-int trio_fprintfv(FILE *file, const char *format, void **args);
-
-int trio_dprintf(int fd, const char *format, ...);
-int trio_vdprintf(int fd, const char *format, va_list args);
-int trio_dprintfv(int fd, const char *format, void **args);
-
-/* trio_sprintf(target, format, ...)
- * trio_snprintf(target, maxsize, format, ...)
- *
- *   Build 'target' according to 'format' and succesive
- *   arguments. This is equal to the sprintf() and
- *   snprintf() functions.
- */
-int trio_sprintf(char *buffer, const char *format, ...);
-int trio_vsprintf(char *buffer, const char *format, va_list args);
-int trio_sprintfv(char *buffer, const char *format, void **args);
-
-int trio_snprintf(char *buffer, size_t max, const char *format, ...);
-int trio_vsnprintf(char *buffer, size_t bufferSize, const char *format,
-                  va_list args);
-int trio_snprintfv(char *buffer, size_t bufferSize, const char *format,
-                  void **args);
-
-int trio_snprintfcat(char *buffer, size_t max, const char *format, ...);
-int trio_vsnprintfcat(char *buffer, size_t bufferSize, const char *format,
-                      va_list args);
-
-char *trio_aprintf(const char *format, ...);
-char *trio_vaprintf(const char *format, va_list args);
-
-int trio_asprintf(char **ret, const char *format, ...);
-int trio_vasprintf(char **ret, const char *format, va_list args);
-
-/*************************************************************************
- * Scan Functions
- */
-int trio_scanf(const char *format, ...);
-int trio_vscanf(const char *format, va_list args);
-int trio_scanfv(const char *format, void **args);
-
-int trio_fscanf(FILE *file, const char *format, ...);
-int trio_vfscanf(FILE *file, const char *format, va_list args);
-int trio_fscanfv(FILE *file, const char *format, void **args);
-
-int trio_dscanf(int fd, const char *format, ...);
-int trio_vdscanf(int fd, const char *format, va_list args);
-int trio_dscanfv(int fd, const char *format, void **args);
-
-int trio_sscanf(const char *buffer, const char *format, ...);
-int trio_vsscanf(const char *buffer, const char *format, va_list args);
-int trio_sscanfv(const char *buffer, const char *format, void **args);
-
-/*************************************************************************
- * Renaming
- */
-#ifdef TRIO_REPLACE_STDIO
-/* Replace the <stdio.h> functions */
-#ifndef HAVE_PRINTF
-# define printf trio_printf
-#endif
-#ifndef HAVE_VPRINTF
-# define vprintf trio_vprintf
-#endif
-#ifndef HAVE_FPRINTF
-# define fprintf trio_fprintf
-#endif
-#ifndef HAVE_VFPRINTF
-# define vfprintf trio_vfprintf
-#endif
-#ifndef HAVE_SPRINTF
-# define sprintf trio_sprintf
-#endif
-#ifndef HAVE_VSPRINTF
-# define vsprintf trio_vsprintf
-#endif
-#ifndef HAVE_SNPRINTF
-# define snprintf trio_snprintf
-#endif
-#ifndef HAVE_VSNPRINTF
-# define vsnprintf trio_vsnprintf
-#endif
-#ifndef HAVE_SCANF
-# define scanf trio_scanf
-#endif
-#ifndef HAVE_VSCANF
-# define vscanf trio_vscanf
-#endif
-#ifndef HAVE_FSCANF
-# define fscanf trio_fscanf
-#endif
-#ifndef HAVE_VFSCANF
-# define vfscanf trio_vfscanf
-#endif
-#ifndef HAVE_SSCANF
-# define sscanf trio_sscanf
-#endif
-#ifndef HAVE_VSSCANF
-# define vsscanf trio_vsscanf
-#endif
-/* These aren't stdio functions, but we make them look similar */
-#define dprintf trio_dprintf
-#define vdprintf trio_vdprintf
-#define aprintf trio_aprintf
-#define vaprintf trio_vaprintf
-#define asprintf trio_asprintf
-#define vasprintf trio_vasprintf
-#define dscanf trio_dscanf
-#define vdscanf trio_vdscanf
-#endif
-
-/* strio compatible names */
-#define StrScan trio_sscanf
-#define StrFormat trio_sprintf
-#define StrFormatMax trio_snprintf
-#define StrFormatAlloc trio_aprintf
-#define StrFormatAppendMax trio_snprintfcat
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* TRIO_TRIO_H */
diff --git a/org.glite.lb.common/interface/ulm_parse.h b/org.glite.lb.common/interface/ulm_parse.h

deleted file mode 100644 (file)

index ee7d85c..0000000
--- a/org.glite.lb.common/interface/ulm_parse.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_ULM_PARSE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_ULM_PARSE_H__
-
-#ident "$Header$"
-
-#include <sys/time.h>          /* for ULCconvertDate */
-#include <time.h>
-
-/*========= DATA =====================================================*/
-
-#define ULM_DATE_STRING_LENGTH 21
-#define ULM_FIELDS_MAX         100 /* max number of fields */
-#define ULM_PARSE_OK           0
-#define ULM_PARSE_ERROR                -1
-
-#define ULM_EQ '='
-#define ULM_QM '"'
-#define ULM_BS '\\'
-#define ULM_SP ' '
-#define ULM_TB '\t'
-#define ULM_LF '\n'
-
-typedef char *LogLine;
-
-typedef struct _edg_wll_ULMFields {
-  LogLine raw;
-  int    *names;
-  int    *vals;
-  int     num;
-} edg_wll_ULMFields , *p_edg_wll_ULMFields;
-
-/*========= FUNCTIONS ================================================*/
-
-#define EDG_WLL_ULM_CLEAR_FIELDS(x) { if (x) { if (x->vals) free(x->vals); if (x->names) free(x->names); x->num=0; } }
-
-extern p_edg_wll_ULMFields edg_wll_ULMNewParseTable( LogLine );
-extern void    edg_wll_ULMFreeParseTable(p_edg_wll_ULMFields );
-
-extern int     edg_wll_ULMProcessParseTable( p_edg_wll_ULMFields );
-extern char *  edg_wll_ULMGetNameAt( p_edg_wll_ULMFields, int );
-extern char *  edg_wll_ULMGetValueAt ( p_edg_wll_ULMFields, int );
-
-extern double  edg_wll_ULMDateToDouble( const char *s );
-void           edg_wll_ULMDateToTimeval( const char *s, struct timeval *tv );
-extern int     edg_wll_ULMTimevalToDate( long sec, long usec, char *dstr );
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_ULM_PARSE_H__ */
diff --git a/org.glite.lb.common/interface/xml_conversions.h b/org.glite.lb.common/interface/xml_conversions.h

deleted file mode 100644 (file)

index 246c488..0000000
--- a/org.glite.lb.common/interface/xml_conversions.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_XML_CONVERSIONS_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_XML_CONVERSIONS_H__
-
-#ident "$Header$"
-
-#include "glite/lb/events.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/load.h"
-#include "glite/lb/notification.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EDG_WLL_STAT_NO_JOBS    1024   /* private flags for edg_wll_QueryJobs */
-#define EDG_WLL_STAT_NO_STATES  2048
-
-enum edg_wll_QueryType {
-       EDG_WLL_QUERY_TYPE_UNDEF,
-       EDG_WLL_QUERY_TYPE_JOB_CONDITION,
-       EDG_WLL_QUERY_TYPE_EVENT_CONDITION,
-};     
-
-typedef struct _edg_wll_XML_ctx {
-       edg_wll_Context ctx;                    
-        XML_Parser      p;
-       char            *message_body;          /* copy of pointer to data to be parsed */              
-        edg_wll_EventCode   eventCode;          /* code of processed event */
-        int             position;               /* row index in the result list */
-                                                /* always should mean 'where to write' */
-       int             position2;              /* used only for event_conditions */
-       int             max_index;              /* used in IntList */
-       int             row;                    /* row index in QueryRec job_conditions */
-       int             row2;                   /* row index in QueryRec event_conditions */
-        int             level;                  /* level of XML tags nesting */
-        char            element[50];            /* name of actual XML tag */
-        char            *char_buf;              /* for storing 'between tags' data */
-        int             char_buf_len;
-       char            *XML_tag;               /* for handling *ListOut's tag comparisons */
-       char            *XML_tag2;
-       edg_wll_QueryRec        **job_conditions;       /* temporal results */
-       edg_wll_QueryRec        **event_conditions;
-       enum edg_wll_QueryType  type;   
-       edg_wll_QueryRec        **conditions;
-       int                     flags;
-        edg_wlc_JobId          *jobsOutGlobal;   
-        edg_wll_Event          *eventsOutGlobal;
-        edg_wll_JobStat        *jobStatGlobal;
-        edg_wll_JobStat        jobStatSingleGlobal;
-       char                    **strListGlobal;
-       int                     *intListGlobal;
-       int                     (*tagToIndex)();
-       char                    *(*indexToTag)();
-       edg_wll_TagValue        *tagListGlobal;
-       edg_wll_JobStat         *stsListGlobal;
-       edg_wll_PurgeRequest    purgeRequestGlobal;
-       edg_wll_PurgeResult     purgeResultGlobal;
-       edg_wll_DumpRequest     dumpRequestGlobal;
-       edg_wll_DumpResult      dumpResultGlobal;
-       edg_wll_LoadRequest     loadRequestGlobal;
-       edg_wll_LoadResult      loadResultGlobal;
-       edg_wll_QueryRec        **attrsGlobal;
-       char                    *notifFunction;
-       char                    *notifClientAddress;
-       edg_wll_NotifId         notifId;
-       edg_wll_NotifChangeOp   notifChangeOp;
-       time_t                  notifValidity;
-       int                     errCode;
-       int                     bound;          /* marks 2nd value of within operator */
-       char                    *errDesc;
-       long                    stat_begin;     /* begin of jobStat tag */
-       long                    jobQueryRec_begin;      /* begin of orJobConditions  tag */
-        char            *errtxt;                /* variable for cummulating error messages   */
-       char            *warntxt;               /* variable for cummulating warning messages */
-} edg_wll_XML_ctx;
-
-void edg_wll_initXMLCtx(edg_wll_XML_ctx *c);
-void edg_wll_freeXMLCtx(edg_wll_XML_ctx *c);
-void edg_wll_freeBuf(edg_wll_XML_ctx *c);
-
-
-#define edg_wll_add_bool_to_XMLBody edg_wll_add_int_to_XMLBody
-#define edg_wll_add_port_to_XMLBody edg_wll_add_uint16_t_to_XMLBody
-#define edg_wll_from_string_to_bool edg_wll_from_string_to_uint16_t
-#define edg_wll_from_string_to_port edg_wll_from_string_to_int
-
-void edg_wll_add_string_to_XMLBody(char **body, const char *toAdd, const char *tag, const char *null);
-void edg_wll_add_tagged_string_to_XMLBody(char **body, const char *toAdd, const char *tag, const char *name, const char *tag2, const char *null);
-void edg_wll_add_int_to_XMLBody(char **body, const int toAdd, const char *tag, const int null);
-void edg_wll_add_timeval_to_XMLBody(char **body, struct timeval toAdd, const char *tag, const struct timeval null);
-void edg_wll_add_jobid_to_XMLBody(char **body, edg_wlc_JobId toAdd, const char *tag, const void *null);
-void edg_wll_add_notifid_to_XMLBody(char **body, edg_wll_NotifId toAdd, const char *tag, const void *null);
-void edg_wll_add_edg_wll_JobStatCode_to_XMLBody(char **body, edg_wll_JobStatCode toAdd, const char *tag, const edg_wll_JobStatCode null);
-void edg_wll_add_edg_wll_EventCode_to_XMLBody(char **body, edg_wll_EventCode toAdd, const char *tag, const edg_wll_EventCode null);
-void edg_wll_add_time_t_to_XMLBody(char **body, const time_t toAdd, const char *tag, const time_t null);
-void edg_wll_add_tagged_time_t_to_XMLBody(char **body, const time_t toAdd, const char *tag, const char *name, const char *tag2, const time_t null);
-void edg_wll_add_uint16_t_to_XMLBody(char **body, const uint16_t toAdd, const char *tag, const uint16_t null);
-void edg_wll_add_logsrc_to_XMLBody(char **body, const edg_wll_Source toAdd, const char *tag, const edg_wll_Source null);
-void edg_wll_add_intlist_to_XMLBody(char **body, const int *toAdd, const char *tag, char *(*indexToTag)(), const char *indent, const int from, const int to);
-void edg_wll_add_strlist_to_XMLBody(char **body, char * const *toAdd, const char *tag, const char *subTag, const char *indent, const  char *null);
-void edg_wll_add_taglist_to_XMLBody(char **body,  const edg_wll_TagValue *toAdd, const char *tag,  const char *subTag, const char *indent, const char *subTag2, const  char *null);
-void edg_wll_add_time_t_list_to_XMLBody(char **body, const time_t *toAdd, const char *tag, char *(*indexToTag)(), const char *indent, const int from, const int to);
-char *edg_wll_from_string_to_string(edg_wll_XML_ctx *XMLCtx);
-edg_wlc_JobId edg_wll_from_string_to_jobid(edg_wll_XML_ctx *XMLCtx);
-edg_wll_NotifId edg_wll_from_string_to_notifid(edg_wll_XML_ctx *XMLCtx);
-edg_wll_JobStatCode edg_wll_from_string_to_edg_wll_JobStatCode(edg_wll_XML_ctx *XMLCtx);
-int edg_wll_from_string_to_int(edg_wll_XML_ctx *XMLCtx);
-long edg_wll_from_string_to_long(edg_wll_XML_ctx *XMLCtx);
-uint16_t edg_wll_from_string_to_uint16_t(edg_wll_XML_ctx *XMLCtx);
-struct timeval edg_wll_from_string_to_timeval(edg_wll_XML_ctx *XMLCtx);
-time_t edg_wll_from_string_to_time_t(edg_wll_XML_ctx *XMLCtx);
-edg_wll_Source edg_wll_from_string_to_logsrc(edg_wll_XML_ctx *XMLCtx);
-
-char *edg_wll_stat_flags_to_string(int flags);
-int edg_wll_string_to_stat_flags(char *cflags);
-char *edg_wll_purge_flags_to_string(int flags);
-int edg_wll_string_to_purge_flags(char *cflags);
-int edg_wll_StringToDumpConst(const char *name);
-char *edg_wll_DumpConstToString(int dumpConst);
-int edg_wll_StringTodone_code(const char *name);
-char *edg_wll_done_codeToString(int done_codeConst);
-edg_wll_QueryAttr edg_wll_StringToquery_attr(const char *name);
-char *edg_wll_query_attrToString(edg_wll_QueryAttr query_attrConst);
-edg_wll_NotifChangeOp edg_wll_StringToNotifChangeOp(const char *name);
-char *edg_wll_NotifChangeOpToString(edg_wll_NotifChangeOp notifChangeOpConst);
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_XML_CONVERSIONS_H__ */
diff --git a/org.glite.lb.common/interface/xml_parse.h b/org.glite.lb.common/interface/xml_parse.h

deleted file mode 100644 (file)

index e719598..0000000
--- a/org.glite.lb.common/interface/xml_parse.h
+++ /dev/null
@@ -1,65 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_XML_PARSE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_XML_PARSE_H__
-
-#ident "$Header$"
-
-#include "glite/lb/purge.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/load.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/notification.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-       
-
-/* function for parsing XML responses from server */
-
-extern edg_wll_ErrorCode edg_wll_ParseQueryEvents(edg_wll_Context, char *, edg_wll_Event **);
-
-extern edg_wll_ErrorCode edg_wll_ParseQueryJobs(edg_wll_Context, char *, edg_wlc_JobId **, edg_wll_JobStat **);
-
-extern edg_wll_ErrorCode edg_wll_ParseUserJobs(edg_wll_Context, char *, edg_wlc_JobId **); 
-
-extern edg_wll_ErrorCode edg_wll_ParseJobStat(edg_wll_Context ctx, char *messageBody, long len, edg_wll_JobStat *stat);
-
-extern edg_wll_ErrorCode edg_wll_ParseStrList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2,  char ***strListOut);
-
-extern edg_wll_ErrorCode edg_wll_ParseIntList(edg_wll_Context ctx, char *messageBody, long len, char *tag, int (*tagToIndex)(),  int **intListOut);
-
-extern edg_wll_ErrorCode edg_wll_ParseTagList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2,  edg_wll_TagValue **tagListOut);
-
-extern edg_wll_ErrorCode edg_wll_ParseStsList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2,  edg_wll_JobStat **stsListOut);
-
-extern edg_wll_ErrorCode edg_wll_ParsePurgeResult(edg_wll_Context ctx, char *messageBody, edg_wll_PurgeResult *result);
-
-extern edg_wll_ErrorCode edg_wll_ParseDumpResult(edg_wll_Context ctx, char *messageBody, edg_wll_DumpResult *result);
-
-extern edg_wll_ErrorCode edg_wll_ParseLoadResult(edg_wll_Context ctx, char *messageBody, edg_wll_LoadResult *result);
-
-extern edg_wll_ErrorCode edg_wll_ParseIndexedAttrs(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***attrs);
-
-extern edg_wll_ErrorCode edg_wll_ParseNotifResult(edg_wll_Context ctx, char *messageBody, time_t *validity);
-
-extern int edg_wll_QueryEventsRequestToXML(edg_wll_Context ctx, const edg_wll_QueryRec **job_conditions, const edg_wll_QueryRec **event_conditions, char **send_mess);
-
-extern int edg_wll_JobQueryRecToXML(edg_wll_Context ctx, edg_wll_QueryRec const * const *conditions, char **send_mess);
-
-extern int edg_wll_QueryJobsRequestToXML(edg_wll_Context ctx, const edg_wll_QueryRec **conditions, int flags, char **send_mess);
-
-extern int edg_wll_PurgeRequestToXML(edg_wll_Context ctx, const edg_wll_PurgeRequest *request, char **message);
-
-extern int edg_wll_DumpRequestToXML(edg_wll_Context ctx, const edg_wll_DumpRequest *request, char **message);
-
-extern int edg_wll_LoadRequestToXML(edg_wll_Context ctx, const edg_wll_LoadRequest *request, char **message);
-
-extern int edg_wll_IndexedAttrsRequestToXML(edg_wll_Context ctx, char **message);
-
-extern int edg_wll_NotifRequestToXML( edg_wll_Context ctx, const char *function, const edg_wll_NotifId notifId, const char *address, edg_wll_NotifChangeOp op, edg_wll_QueryRec const * const *conditions, char **message);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_COMMON_XML_PARSE_H__ */
diff --git a/org.glite.lb.common/project/build.properties b/org.glite.lb.common/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.lb.common/project/configure.properties.xml b/org.glite.lb.common/project/configure.properties.xml

deleted file mode 100644 (file)

index 911dfcf..0000000
--- a/org.glite.lb.common/project/configure.properties.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Common module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.2  2004/07/06 20:50:10  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Common configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-cppunit=${with.cppunit.prefix}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.lb.common/project/properties.xml b/org.glite.lb.common/project/properties.xml

deleted file mode 100755 (executable)

index 7b04062..0000000
--- a/org.glite.lb.common/project/properties.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Common component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.2  2004/06/22 22:05:23  dimeglio
-       Added configuration options
-       
--->
-
-<project name="LB Common component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${lb.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${lb.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="common" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.lb.common/project/tar_exclude b/org.glite.lb.common/project/tar_exclude

deleted file mode 100644 (file)

index e1fcd1a..0000000
--- a/org.glite.lb.common/project/tar_exclude
+++ /dev/null
@@ -1,10 +0,0 @@
-tar_exclude
-CVS
-build.xml
-build
-build.properties
-properties.xml
-configure.properties.xml
-.cvsignore
-.project
-.cdtproject
diff --git a/org.glite.lb.common/project/version.properties b/org.glite.lb.common/project/version.properties

deleted file mode 100644 (file)

index 03f7aea..0000000
--- a/org.glite.lb.common/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:07:06 CEST 2004
-module.version=0.2.0
-module.build=47
-module.age=1
diff --git a/org.glite.lb.common/src/context.c b/org.glite.lb.common/src/context.c

deleted file mode 100644 (file)

index 73eafa1..0000000
--- a/org.glite.lb.common/src/context.c
+++ /dev/null
@@ -1,430 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <globus_config.h>
-
-#include "glite/wmsutils/jobid/strmd5.h"
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "context-int.h"
-#include "glite/lb/producer.h"
-
-static void free_voms_groups(edg_wll_VomsGroups *);
-
-int edg_wll_InitContext(edg_wll_Context *ctx)
-{
-       int i;
-       edg_wll_Context out     = (edg_wll_Context) malloc(sizeof(*out));
-
-       if (!out) return ENOMEM;
-       memset(out,0,sizeof(*out));
-       assert(out->errDesc == NULL);
-
-       out->allowAnonymous = 1;
-       out->notifSock  = -1;
-
-       /* XXX */
-       for (i=0; i<EDG_WLL_PARAM__LAST; i++) edg_wll_SetParam(out,i,NULL);
-
-       out->connPool = (edg_wll_ConnPool *) calloc(out->poolSize, sizeof(edg_wll_ConnPool));
-       out->connPoolNotif = (edg_wll_ConnPool *) calloc(1, sizeof(edg_wll_ConnPool));
-
-       *ctx = out;
-       return 0;
-}
-
-void edg_wll_FreeContext(edg_wll_Context ctx)
-{
-       struct timeval close_timeout = {0, 50000};
-       OM_uint32 min_stat;
-
-       if (!ctx) return;
-
-       if (ctx->errDesc) free(ctx->errDesc);
-       if (ctx->connPool) {
-               int i;
-               
-               for (i=0; i<ctx->poolSize; i++) {
-                       if (ctx->connPool[i].peerName) free(ctx->connPool[i].peerName);
-                       edg_wll_gss_close(&ctx->connPool[i].gss,&close_timeout);
-                       if (ctx->connPool[i].gsiCred)
-                               gss_release_cred(&min_stat, &ctx->connPool[i].gsiCred);
-                       if (ctx->connPool[i].buf) free(ctx->connPool[i].buf);
-               }       
-               free(ctx->connPool);
-       }
-       if (ctx->notifSock >=0) close(ctx->notifSock);
-       if (ctx->srvName) free(ctx->srvName);
-       if (ctx->peerName) free(ctx->peerName);
-       if (ctx->vomsGroups.len) free_voms_groups(&ctx->vomsGroups);
-       if (ctx->dumpStorage) free(ctx->dumpStorage);
-       if (ctx->purgeStorage) free(ctx->purgeStorage);
-
-        if (ctx->p_jobid) edg_wlc_JobIdFree(ctx->p_jobid);
-        if (ctx->p_host) free(ctx->p_host);
-        if (ctx->p_instance) free(ctx->p_instance);
-        if (ctx->p_destination) free(ctx->p_destination);
-        if (ctx->p_query_server) free(ctx->p_query_server);
-        if (ctx->p_notif_server) free(ctx->p_notif_server);
-        if (ctx->p_proxy_filename) free(ctx->p_proxy_filename);
-        if (ctx->p_cert_filename) free(ctx->p_cert_filename);
-        if (ctx->p_key_filename) free(ctx->p_key_filename);
-
-       /* do not free (references only)
-        * ctx->job_index
-        * ctx->job_index_cols
-        * ctx->mysql */
-
-       free(ctx);
-}
-
-static const char* const errTexts[] = {
-       /* standard error strings should appear here */
-       "Broken ULM",
-       "Undefined event",
-       "Message incomplete",
-       "Duplicate ULM key",
-       "Misuse of ULM key",
-       "Warning: extra ULM fields",
-       "XML Parse error",
-       "Server response error",
-       "Bad JobId format",
-       "Database call failed",
-       "Bad URL format",
-       "MD5 key clash",
-       "GSSAPI Error",
-       "No JobId specified in context",
-       "No indexed condition in query",
-       "Interlogger protocol error",
-       "Interlogger internal error",
-       "Interlogger has events pending"
-       "DNS resolver error",
-};
-
-const char *edg_wll_GetErrorText(int code) {
-       return code ? 
-               (code <= EDG_WLL_ERROR_BASE ?
-                       strerror(code) :
-                       errTexts[code - EDG_WLL_ERROR_BASE - 1]
-               ) :
-               NULL;
-}
-
-int edg_wll_Error(edg_wll_Context ctx, char **errText, char **errDesc)
-{
-       char    *text = NULL,*desc = NULL;
-       const char* et = edg_wll_GetErrorText(ctx->errCode);
-
-       if (et) {
-               text = strdup(et);
-               if (ctx->errDesc) desc = (char *) strdup(ctx->errDesc);
-       }
-
-       if (errText) *errText = text; else free(text);
-       if (errDesc) *errDesc = desc; else free(desc);
-       return ctx->errCode;
-}
-
-int edg_wll_ResetError(edg_wll_Context ctx)
-{
-       if (ctx->errDesc) free(ctx->errDesc);
-       ctx->errDesc = NULL;
-       ctx->errCode =  0;
-
-       return ctx->errCode;
-}
-
-int edg_wll_SetError(edg_wll_Context ctx,int code,const char *desc)
-{
-       edg_wll_ResetError(ctx);
-       if (code) {
-               ctx->errCode = code;
-               if (desc) ctx->errDesc = (char *) strdup(desc);
-       }
-
-       return ctx->errCode;
-}
-
-
-int edg_wll_UpdateError(edg_wll_Context ctx,int code,const char *desc)
-{
-        char   *new_desc=NULL;
-       char    *old_desc=NULL;
-        const char* err_text = edg_wll_GetErrorText(ctx->errCode);
-
-       /* first fill in the old_desc */
-        if (ctx->errCode) {
-                if (ctx->errDesc) {
-                        if ((err_text)) // && (code) && (code <> ctx->errCode))
-                                asprintf(&old_desc,"%s;; %s",err_text,ctx->errDesc);
-                        else
-                                old_desc = (char *) strdup(ctx->errDesc);
-                } else {
-                        old_desc = (char *) strdup(err_text);
-                }
-       } else {
-                if (ctx->errDesc) old_desc = (char *) strdup(ctx->errDesc);
-        }
-       if (ctx->errDesc) free(ctx->errDesc);
-
-       /* update errDesc */
-        if (old_desc) {
-                if (desc) {
-                        asprintf(&new_desc,"%s;; %s",desc,old_desc);
-                        ctx->errDesc = (char *) strdup(new_desc);
-                } else {
-                        ctx->errDesc = (char *) strdup(old_desc);
-               }
-        } else {
-                if (desc) ctx->errDesc = (char *) strdup(desc);
-        }
-
-       /* update errCode */
-        if (code) {
-                ctx->errCode = code;
-        }
-
-        if (new_desc) free(new_desc);
-        if (old_desc) free(old_desc);
-
-        return ctx->errCode;
-}
-
-static const char* const srcNames[] = {
-       "Undefined",
-       "UserInterface",
-       "NetworkServer",
-       "WorkloadManager",
-       "BigHelper",
-       "JobController",
-       "LogMonitor",
-       "LRMS",
-       "Application",
-};
-
-edg_wll_Source edg_wll_StringToSource(const char *name)
-{
-       int     i;
-/* XXX: remove
-       for (i=1; srcNames[i] && strcmp(name,srcNames[i]); i++);
-       return srcNames[i] ? i : EDG_WLL_SOURCE_NONE;
-*/
-        for (i=1; i<sizeof(srcNames)/sizeof(srcNames[0]); i++)
-                if (strcasecmp(srcNames[i],name) == 0) return (edg_wll_Source) i;
-        return EDG_WLL_SOURCE_NONE;
-}
-
-char * edg_wll_SourceToString(edg_wll_Source src)
-{
-        if (src < EDG_WLL_SOURCE_NONE || src >= EDG_WLL_SOURCE__LAST) return NULL;
-        return strdup(srcNames[src]);
-}
-
-static const char* const queryResultNames[] = {
-       "Undefined",
-       "None",
-       "All",
-       "Limited"
-};
-
-edg_wll_QueryResults edg_wll_StringToQResult(const char *name)
-{
-       int     i;
-
-       for (i=1; i<sizeof(queryResultNames)/sizeof(queryResultNames[0]); i++)
-               if (strcasecmp(queryResultNames[i],name) == 0)
-                       return (edg_wll_QueryResults) i;
-
-       return EDG_WLL_QUERYRES_UNDEF;
-}
-
-char * edg_wll_QResultToString(edg_wll_QueryResults res)
-{
-       if (res < EDG_WLL_QUERYRES_NONE || res >= EDG_WLL_QUERYRES__LAST)
-               return NULL;
-
-       return strdup(queryResultNames[res]);
-}
-
-
-char *edg_wll_GetSequenceCode(const edg_wll_Context ctx)
-{
-       unsigned int *c;
-       char *ret = NULL;
-
-       c = &ctx->p_seqcode.c[0];
-       asprintf(&ret, "UI=%06d:NS=%010d:WM=%06d:BH=%010d:JSS=%06d"
-                               ":LM=%06d:LRMS=%06d:APP=%06d",
-                       c[EDG_WLL_SOURCE_USER_INTERFACE],
-                       c[EDG_WLL_SOURCE_NETWORK_SERVER],
-                       c[EDG_WLL_SOURCE_WORKLOAD_MANAGER],
-                       c[EDG_WLL_SOURCE_BIG_HELPER],
-                       c[EDG_WLL_SOURCE_JOB_SUBMISSION],
-                       c[EDG_WLL_SOURCE_LOG_MONITOR],
-                       c[EDG_WLL_SOURCE_LRMS],
-                       c[EDG_WLL_SOURCE_APPLICATION]);
-       return ret;
-}
-
-int edg_wll_SetSequenceCode(edg_wll_Context ctx,
-                       const char * seqcode_str, int seq_type)
-{
-       int res;
-       unsigned int *c;
-       int duplicate = 0;
-
-       edg_wll_ResetError(ctx);
-
-       if (seq_type == EDG_WLL_SEQ_DUPLICATE) {
-               duplicate = 1;
-       } else if (seq_type != EDG_WLL_SEQ_NORMAL)
-               return edg_wll_SetError(ctx, EINVAL,
-                       "edg_wll_SetSequenceCode(): unrecognized value of seq_type parameter");
-       
-       if (!seqcode_str) {
-               memset(&ctx->p_seqcode,0,sizeof ctx->p_seqcode);
-               return 0;
-       }
-
-       c = &ctx->p_seqcode.c[0];
-       res =  sscanf(seqcode_str, "UI=%d:NS=%d:WM=%d:BH=%d:JSS=%d:LM=%d:LRMS=%d:APP=%d",
-                       &c[EDG_WLL_SOURCE_USER_INTERFACE],
-                       &c[EDG_WLL_SOURCE_NETWORK_SERVER],
-                       &c[EDG_WLL_SOURCE_WORKLOAD_MANAGER],
-                       &c[EDG_WLL_SOURCE_BIG_HELPER],
-                       &c[EDG_WLL_SOURCE_JOB_SUBMISSION],
-                       &c[EDG_WLL_SOURCE_LOG_MONITOR],
-                       &c[EDG_WLL_SOURCE_LRMS],
-                       &c[EDG_WLL_SOURCE_APPLICATION]);
-
-       assert(EDG_WLL_SOURCE__LAST == 9);
-       if (res != EDG_WLL_SOURCE__LAST-1)
-               return edg_wll_SetError(ctx, EINVAL, "edg_wll_SetSequenceCode(): syntax error in sequence code");
-
-       if (duplicate) {
-               if (ctx->p_source <= EDG_WLL_SOURCE_NONE || ctx->p_source >= EDG_WLL_SOURCE__LAST)
-                       return edg_wll_SetError(ctx,EINVAL,"edg_wll_SetSequenceCode(): context param: source missing");
-               c[ctx->p_source] = time(NULL);
-       }
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-int edg_wll_IncSequenceCode(edg_wll_Context ctx)
-{
-       edg_wll_ResetError(ctx);
-       
-       if (ctx->p_source <= EDG_WLL_SOURCE_NONE || ctx->p_source >= EDG_WLL_SOURCE__LAST)
-               return edg_wll_SetError(ctx,EINVAL,"edg_wll_IncSequenceCode(): context param: source missing");
-
-       ctx->p_seqcode.c[ctx->p_source]++;
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-int edg_wll_GetLoggingJob(const edg_wll_Context ctx,edg_wlc_JobId *out)
-{
-       return edg_wlc_JobIdDup(ctx->p_jobid,out);
-}
-
-int edg_wll_GenerateSubjobIds(
-       edg_wll_Context ctx,
-       const edg_wlc_JobId     parent,
-       int                     num_subjobs,
-       const char *            seed,
-       edg_wlc_JobId **        subjobs)
-{
-       int subjob, ret;
-       char *p_unique, *p_bkserver, *intseed;
-       char *unhashed, *hashed;
-       unsigned int p_port;
-       edg_wlc_JobId *retjobs;
-
-
-       if (num_subjobs < 1)
-               return edg_wll_SetError(ctx, EINVAL,
-                               "edg_wll_GenerateSubjobIds(): num_subjobs < 1");
-       if (seed == NULL)
-               intseed = edg_wll_GetSequenceCode(ctx);
-       else
-               intseed = strdup(seed);
-
-       p_unique = edg_wlc_JobIdGetUnique(parent);
-       edg_wlc_JobIdGetServerParts(parent, &p_bkserver, &p_port);
-
-       retjobs = calloc(num_subjobs+1, sizeof(edg_wlc_JobId));
-
-       if (p_unique == NULL ||
-               intseed == NULL ||
-               p_bkserver == NULL ||
-               retjobs == NULL)
-               return edg_wll_SetError(ctx, ENOMEM, NULL);
-
-       for (subjob = 0; subjob < num_subjobs; subjob++) {
-
-               asprintf(&unhashed, "%s,%s,%d", p_unique, intseed, subjob);
-               if (unhashed == NULL) {
-                       edg_wll_SetError(ctx, ENOMEM, "edg_wll_GenerateSubjobIds(): asprintf() error");
-                       goto handle_error;
-               }
-
-               hashed = str2md5base64(unhashed);
-               free(unhashed);
-               if (hashed == NULL) {
-                       edg_wll_SetError(ctx, ENOMEM, "edg_wll_GenerateSubjobIds(): str2md5base64() error");
-                       goto handle_error;
-               }
-
-               ret = edg_wlc_JobIdRecreate(p_bkserver, p_port, hashed, &retjobs[subjob]);
-               free(hashed);
-               if (ret != 0) {
-                       edg_wll_SetError(ctx, ret, "edg_wll_GenerateSubjobIds(): edg_wlc_JobIdRecreate() error");
-                       goto handle_error;
-               }
-       }
-       
-       free(intseed);
-       free(p_unique);
-       free(p_bkserver);
-
-       *subjobs = retjobs;
-       return 0;
-
-    handle_error:
-       free(intseed);
-       free(p_unique);
-       free(p_bkserver);
-       for ( subjob-- ;subjob >= 0; subjob--)
-               edg_wlc_JobIdFree(retjobs[subjob]);
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-static void
-free_voms_groups(edg_wll_VomsGroups *groups)
-{
-   size_t len;
-
-   if (groups == NULL)
-      return;
-
-   for (len = 0; len < groups->len; len++) {
-      if (groups->val[len].vo)
-        free(groups->val[len].vo);
-      if (groups->val[len].name)
-        free(groups->val[len].name);
-   }
-}
-
-int edg_wll_SetErrorGss(edg_wll_Context ctx, const char *desc, edg_wll_GssStatus *gss_code)
-{
-   char *err_msg;
-
-   edg_wll_gss_get_error(gss_code, desc, &err_msg);
-   edg_wll_SetError(ctx,EDG_WLL_ERROR_GSS, err_msg);
-   free(err_msg);
-   return ctx->errCode;
-}
diff --git a/org.glite.lb.common/src/escape.c b/org.glite.lb.common/src/escape.c

deleted file mode 100644 (file)

index 8ace584..0000000
--- a/org.glite.lb.common/src/escape.c
+++ /dev/null
@@ -1,221 +0,0 @@
-#ident "$Header$"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#include "ulm_parse.h"
-#include "escape.h"
-
-/*
- *----------------------------------------------------------------------
- * 
- * \fn char *edg_wll_LogEscape(const char *str)
- * \param str          a string to escape
- * \return             new (allocated) escaped string
- * \brief in given string escape all ULM_QM, ULM_BS and ULM_LF by ULM_BS
- *
- * Calls: malloc, strlen
- *
- * Algorithm: array lookup
- *             - the new string will be allocated
- *
- *----------------------------------------------------------------------
- */
-
-char *edg_wll_LogEscape(const char *str)
-{
-unsigned int i,j;
-size_t size;
-char *ret;
-
-if (str == NULL) return NULL;
-if ((size = strlen(str)) == 0) return strdup("");
-
-ret = (char*) malloc(1+2*size*sizeof(char));
-
-j = 0;
-for (i=0; i<size; i++) {
-       if ((str[i] != ULM_BS) && (str[i] != ULM_QM) && (str[i] != ULM_LF)) {
-               ret[j] = str[i];
-               j++;
-       }
-       else {
-               ret[j] = ULM_BS;
-               if (str[i] == ULM_LF) {
-                       ret[j+1] = 'n';
-               }
-               else {
-                       ret[j+1] = str[i];
-               }
-               j += 2;
-       }
-} /* for */
-
-ret[j] = 0;
-
-return ret;
-}
-
-/*
- *----------------------------------------------------------------------
- * 
- * \fn char *edg_wll_LogUnescape(const char *str)
- * \param str          a string to unescape
- * \return             new (allocated) unescaped string
- * \brief in given string unescape all escaped ULM_QM, ULM_BS and ULM_LF
- *
- * Calls: malloc, strlen
- *
- * Algorithm: array lookup
- *               - the new string will be allocated
- *
- *----------------------------------------------------------------------
- */
-
-char *edg_wll_LogUnescape(const char *str)
-{
-unsigned int i,j;
-size_t size;
-char *ret;
-
-if (str == NULL) return NULL;
-
-size  = strlen(str);
-ret = (char*) malloc(1+size*sizeof(char));
-
-/*
-j = 0;
-for (i=0; i<size; i++) {
-       if ( (str[i] != ULM_BS) || 
-          ((str[i] == ULM_BS) && ((str[i+1] != ULM_BS) && (str[i+1] != ULM_QM) && (str[i+1] != 'n'))) )
-       {
-               if (str[i] == ULM_LF) { ret[j] = 'n'; }
-               else { ret[j] = str[i]; }
-               j++;
-       }
-} 
-*/
-for (i=j=0; i<size; i++,j++)
-       if (str[i] == ULM_BS) switch(str[++i]) {
-               case 'n': ret[j] = ULM_LF; break;
-               default: ret[j] = str[i]; break;
-       } else { ret[j] = str[i]; }
-
-ret[j] = '\0';
-
-return ret;
-}
-
-static const struct {
-       const char c,*e;
-} xml_etab[] = {
-       { '<',"lt" },
-       { '>',"gt" },
-       { '&',"amp" },
-       { '"',"quot" },
-       { '\'',"apos" },
-       { 0, NULL }
-};
-
-#define XML_ESCAPE_SET "<>&\"'"
-
-char *edg_wll_EscapeXML(const char *in)
-{
-        const char* tmp_in;
-       char    *out;
-       int     cnt,i,j,k;
-
-       if (!in) return NULL;
-
-       for (cnt = 0, tmp_in = in; *tmp_in != '\0'; ++tmp_in) {
-               if (strchr(XML_ESCAPE_SET, *tmp_in) ||
-                       (*tmp_in & 0x7f) < 0x20 /* control character */ ||
-                       (*tmp_in == '%')) cnt++;
-        }
-
-       out = malloc(strlen(in)+1+cnt*5);
-
-       for (i=j=0; in[i]; i++) {
-               for (k=0; xml_etab[k].c && xml_etab[k].c != in[i]; k++);
-               if (xml_etab[k].c) {
-                       int     l;
-
-                       out[j++] = '&';
-                       memcpy(out+j,xml_etab[k].e,l=strlen(xml_etab[k].e));
-                       j += l;
-                       out[j++] = ';';
-               } else if ((in[i] & 0x7f) < 0x20 || in[i] == '%') {
-                       sprintf(out+j, "%%%02x", (unsigned char)in[i]);
-                       j+=3;
-               } else {
-                       out[j++] = in[i];
-               }
-       }
-       out[j] = 0;
-       return out;
-}
-
-char *edg_wll_UnescapeXML(const char *in)
-{
-       char    *out;
-       int     i,j,k;
-       char    xtmp[3];
-       unsigned char   origchar;
-
-       if (!in) return NULL;
-       out = malloc(strlen(in)+1);
-
-       for (i=j=0; in[i]; j++) if (in[i] == '&') {
-               char    *s = strchr(in+i,';');
-               if (s) {
-                       int     l = s-in-i+1;
-                       for (k=0; xml_etab[k].c && strncasecmp(in+i+1,xml_etab[k].e,l-2); k++);
-                       if (xml_etab[k].c) {
-                               out[j] = xml_etab[k].c;
-                               i += l;
-                       } else out[j] = in[i++];
-               } else out[j] = in[i++];
-       } else if (in[i] == '%') {
-               if (isxdigit(xtmp[0]=in[i+1]) && isxdigit(xtmp[1]=in[i+2])) {
-                       xtmp[2] = '\0';
-                       origchar = (unsigned char) strtol(xtmp, NULL, 16);
-                       if ((origchar & 0x7f) < 0x20 || origchar == '%') {
-                               out[j] = origchar;
-                               i += 3;
-                       } else out[j] = in[i++];
-               } else out[j] = in[i++];
-       } else {
-               out[j] = in[i++];
-       }
-       out[j] = 0;
-       return out;
-}
-
-char *edg_wll_EscapeSQL(const char *in)
-{
-        const char* tmp_in;
-       char    *out = NULL;
-       int     i,j,cnt;
-
-       if (!in) return NULL;
-
-       for (cnt = 0, tmp_in = in; (tmp_in = strchr(tmp_in,'\'')) != NULL; ++tmp_in) {
-          ++cnt;
-        }
-       for (tmp_in = in; (tmp_in = strchr(tmp_in,'\\')) != NULL; ++tmp_in) {
-          ++cnt;
-        }
-
-       out = malloc(strlen(in)+1+cnt);
-
-       for (i=j=0; in[i]; i++) {
-               if (in[i] == '\\') out[j++] = '\\';
-               if (in[i] == '\'') out[j++] = '\'';
-               out[j++] = in[i];
-       }
-       out[j] = 0;
-
-       return out;
-}
diff --git a/org.glite.lb.common/src/events.c.T b/org.glite.lb.common/src/events.c.T

deleted file mode 100644 (file)

index 24a8c69..0000000
--- a/org.glite.lb.common/src/events.c.T
+++ /dev/null
@@ -1,349 +0,0 @@
-#ident "$Header$"
-/*
-@@@AUTO
-*/
-@@@LANG: C
-
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
-#include "ulm_parse.h"
-
-static const struct timeval null_timeval = {0,0};
-
-/**
- * Predefined event types names
- */
-static const char *eventNames[] = {
-       "Undefined",
-@@@{
-for my $e (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       gen "\t\"$e\",\n";
-}
-@@@}
-       "SysCmpStat",
-       "SysClStat",
-};
-
-/**
- * \fn edg_wll_EventCode edg_wll_StringToEvent(char *name)
- * \param name          a string event name (e.g. "JobTransfer")
- * \return corresponding numeric code (edg_wll_EventCode)
- * \brief convert a string event name to the corresponding numeric code  
- * Calls: strcasecmp
- * Algorithm: array lookup
- */
-edg_wll_EventCode edg_wll_StringToEvent(char *name)
-{
-       unsigned int    i;
-
-       for (i=1; i<sizeof(eventNames)/sizeof(eventNames[0]); i++)
-               if (strcasecmp(eventNames[i],name) == 0) return (edg_wll_EventCode) i;
-       return EDG_WLL_EVENT_UNDEF;
-}
-
-/**
- * \fn char *edg_wll_EventToString(edg_wll_EventCode event)
- * \param event         an event numeric code (edg_wll_EventCode)
- * \return corresponding string (e.g. "JobTransfer")
- * \brief convert an event numeric code to the corresponding string
- * Calls: strdup
- */
-char *edg_wll_EventToString(edg_wll_EventCode event)
-{
-       if ((int)event < 0 || event >= sizeof(eventNames)/sizeof(eventNames[0])) return NULL;
-       return strdup(eventNames[event]);
-}
-
-
-/**
- * Predefined ULM key types names
- */
-static const char *keyNames[] = {
-       "Undefined",
-       "DG.EVNT",
-@@@{
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = getName $f 'ULM';
-       my $fnu = uc $fn;
-       my $c = $f->{comment};
-       if (hasAlias $f 'ULM') {
-               gen "\t\"$fnu\",\n";
-       } else {
-               gen "\t\"DG.$fnu\",\n";
-       }
-}
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fnu = uc $f->{name};
-               gen "\t\"DG.$tu.$fnu\",\n";
-       }
-}
-@@@}
-       "DG.TYPE",
-};
-
-/*
- * \fn edg_wll_KeyNameCode edg_wll_StringToKeyName(char *name)
- * \param name         a string ULM key name (e.g. "DG.JOB.TRANSFER.DEST")
- * \return corresponding numeric code (edg_wll_KeyNameCode)
- * \brief convert a string ULM key name to the corresponding numeric code
- * Calls: strcasecmp
- * Algorithm: array lookup
- */
-edg_wll_KeyNameCode edg_wll_StringToKeyName(char *name)
-{
-       unsigned int    i;
-
-       for (i=1; i<sizeof(keyNames)/sizeof(keyNames[0]); i++)
-               if (strcasecmp(keyNames[i],name) == 0) return (edg_wll_KeyNameCode) i;
-       return UNDEFINED;
-}
-
-/*
- * \fn char *edg_wll_KeyNameToString(edg_wll_KeyNameCode key)
- * \param key          a ULM key name numeric code (edg_wll_KeyNameCode)
- * \return corresponding string (e.g. "DG.JOB.TRANSFER.DEST")
- * \brief convert a ULM key name numeric code to the corresponding string
- * Calls: strdup
- */
-char *edg_wll_KeyNameToString(edg_wll_KeyNameCode key)
-{
-       if ((int)key < 0 || key >= sizeof(keyNames)/sizeof(keyNames[0])) return NULL;
-       return strdup(keyNames[key]);
-}
-
-
-/**
- * Predefined _code_ types names and
- * related StringTo_code and _code_ToString function implementations
- */
-@@@{
-$indent = "\t";
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       if ($f->{codes}) {
-               my $fn = ucfirst($f->{name});
-               my $fnu = uc $fn;
-               my $c = "${fn}";                # code
-               my $enum = "enum edg_wll\_$c";  # enum name
-               my $char = "edg_wll\_${fn}Names"; # char name
-# static const char:
-               gen qq{
-/**
- * Predefined code names for $c
- */
-static const char \*${char}\[\] = \{
-};
-               gen $indent."\"UNDEFINED\",\n";
-               for (@{$f->{codes}}) {
-                       gen $indent."\"$_->{name}\",\n";
-               }
-               gen "}; \n";
-
-# function StringTo:
-               gen qq{
-/**
- * \\fn $enum edg_wll_StringTo${c}(char *name)
- * Calls: strcasecmp
- * Algorithm: array lookup
- */
-$enum edg_wll_StringTo${c}(char *name) 
-\{
-       unsigned int    i;
-
-       for (i=1; i<sizeof($char)/sizeof(${char}\[0\]); i++) 
-               if (strcasecmp(${char}\[i\],name) == 0) return ($enum) i;
-       return ($enum) EDG_WLL_${fnu}_UNDEFINED;
-\}
-\n};
-
-# function ToString:
-               gen qq{
-/**
- * \\fn *edg_wll\_${c}ToString($enum code)
- * Calls: strdup
- */
-char *edg_wll\_${c}ToString($enum code) 
-\{
-       if ((int)code < 0 || code >= sizeof($char)/sizeof(${char}\[0\])) return NULL;
-       return strdup(${char}\[code\]);
-
-\}
-\n\n};
-       }
-}
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t . '_';
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               if ($f->{codes}) {
-                       my $fn = ucfirst($f->{name});
-                       my $c = "$t${fn}";              # code
-                       my $enum = "enum edg_wll\_$c";  # enum name
-                       my $char = "edg_wll\_$t${fn}Names"; # char name
-# static const char:
-                       gen qq{
-/**
- * Predefined code names for $c
- */
-static const char \*${char}\[\] = \{
-};
-                       gen $indent."\"UNDEFINED\",\n";
-                       for (@{$f->{codes}}) {
-                               gen $indent."\"$_->{name}\",\n";
-                       }
-                       gen "}; \n";
-
-# function StringTo:
-                       gen qq{
-/**
- * \\fn $enum edg_wll_StringTo${c}(char *name)
- * Calls: strcasecmp
- * Algorithm: array lookup
- */
-$enum edg_wll_StringTo${c}(char *name) 
-\{
-       unsigned int    i;
-
-       for (i=1; i<sizeof($char)/sizeof(${char}\[0\]); i++) 
-               if (strcasecmp(${char}\[i\],name) == 0) return ($enum) i;
-       return ($enum) EDG_WLL_${tu}UNDEFINED;
-\}
-\n};
-
-# function ToString:
-                       gen qq{
-/**
- * \\fn *edg_wll\_${c}ToString($enum code)
- * Calls: strdup
- */
-char *edg_wll\_${c}ToString($enum code) 
-\{
-       if ((int)code < 0 || code >= sizeof($char)/sizeof(${char}\[0\])) return NULL;
-       return strdup(${char}\[code\]);
-
-\}
-\n\n};
-               }
-       }
-}
-@@@}
-
-/**
- * Initialise an event structure
- * \return pointer to initialised event structure
- */
-edg_wll_Event *edg_wll_InitEvent(
-               edg_wll_EventCode eventcode     /* eventcode IN */
-) 
-{
-edg_wll_Event *event;
-
-/* allocate memory for 'event' (edg_wll_Event); use calloc to also clean it */
-/* FIXME: what if calloc fails? should be checked somehow -> nomem etc. */
-       event = (edg_wll_Event *) calloc(1,sizeof(edg_wll_Event));
-/* initialize common fields */
-@@@{
-$indent = "\t";
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = $f->getName;
-       my $fd = $f->getDefaultNullValue;
-       gen $indent."event->any.$fn = $fd;\n"
-}
-@@@}
-/* initialize dependent fields */
-switch (eventcode) {
-@@@{
-$indent = "   ";
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       gen $indent."case EDG_WLL_EVENT_$tu : \n";
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->getName;
-               my $fd = $f->getDefaultNullValue;
-               gen $indent."\tevent->$tl.$fn = $fd;\n"
-       }
-       gen $indent.$indent."break;\n";
-}
-@@@}
-   case EDG_WLL_EVENT_UNDEF :
-   default :
-      break;
-}
-return event;
-}
-
-/**
- * edg_wll_FreeEvent 
- * \brief free memory allocated for edg_wll_Event internal fields
- * Calls: free
- */
-void edg_wll_FreeEvent(
-          edg_wll_Event *event       /* event IN */
-)
-{
-edg_wll_EventCode eventcode=event->type;
-
-/* free the common fields */
-        if (event->any.jobId) edg_wlc_JobIdFree(event->any.jobId);
-@@@{
-$indent = "\t";
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = $f->{name};
-       my $ft = $f->{type};
-       if ($ft eq 'string') {
-               gen $indent."if (event->any.$fn) free(event->any.$fn);\n"
-       }
-}
-@@@}
-
-/* free the rest */
-switch (eventcode) {
-@@@{
-$indent = "   ";
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       gen $indent."case EDG_WLL_EVENT_$tu :\n";
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $ft = $f->{type};
-               if ($ft eq 'string') {
-                       gen $indent."\tif (event->$tl.$fn) free(event->$tl.$fn);\n"
-               }
-       }
-       gen $indent.$indent."break;\n"
-}
-@@@}
-   case EDG_WLL_EVENT_UNDEF :
-   default:
-      break;
-}
-
-}
diff --git a/org.glite.lb.common/src/events_parse.c.T b/org.glite.lb.common/src/events_parse.c.T

deleted file mode 100644 (file)

index 87512b2..0000000
--- a/org.glite.lb.common/src/events_parse.c.T
+++ /dev/null
@@ -1,732 +0,0 @@
-#ident "$Header$"
-/*
-@@@AUTO
-*/
-@@@LANG: C
-
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
-
-#include "glite/lb/events.h"
-#include "glite/lb/producer.h"
-#include "events_parse.h"
-#include "ulm_parse.h"
-#include "context-int.h"
-#include "escape.h"
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "trio.h"
-
-static const struct timeval null_timeval = {0,0};
-
-/* -- Internal function prototype -- */
-char *my_edg_wll_ULMGetValueAt( p_edg_wll_ULMFields, int );
-
-/**
- * edg_wll_ParseEvent - parse ULM message to internal structures
- * Calls: calloc, free, sprintf, strdup
- *        edg_wll_ULMNewParseTable, edg_wll_ULMFreeParseTable, edg_wll_ULMProcessParseTable,
- *        edg_wll_ULMGetNameAt, my_edg_wll_ULMGetValueAt, edg_wll_ULMDateToTimeval (edg_wll_ULMDateToDouble),
- *        edg_wll_StringToEvent, edg_wll_StringToKeyName, edg_wll_StringToLevel, edg_wlc_jobid_tParse,
- *        edg_wll_EventToString, edg_wll_KeyNameToString, edg_wll_SetError (or edg_wll_ResetError)
- * Algorithm: break ULM string into fields and then according the event type
- *            fill in the proper structures
- */
-
-#define DUPLICITY { \
-       char *k =  edg_wll_KeyNameToString(keycode); \
-       sprintf(err_desc,"Key %s already exists.", k); \
-       free(k); \
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_KEY_DUPLICITY,err_desc); \
-       goto end; }
-
-#define MISUSE { \
-       char *e = edg_wll_EventToString(eventcode); \
-       char *k =  edg_wll_KeyNameToString(keycode); \
-       sprintf(err_desc,"Key %s schouldn't be used for event type %s.", k,e); \
-       free(e); \
-       free(k); \
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_KEY_MISUSE,err_desc); \
-       goto end; }
-
-edg_wll_ErrorCode edg_wll_ParseEvent(
-        edg_wll_Context context,   /* context IN */
-        edg_wll_LogLine logline,     /* logline IN: ULM string to parse */
-        edg_wll_Event **event      /* event OUT: parsed event 
-                           (may be NULL - syntax checking with no output */
-)
-{
-int                    i;
-int                    extra=0;        /* number of extra unknown key=value pairs */
-char                   err_desc[128];  /* error description for use in edg_wll_SetError */
-char                   *value=NULL;
-p_edg_wll_ULMFields    table = edg_wll_ULMNewParseTable(logline);
-edg_wll_KeyNameCode    keycode=UNDEFINED;
-edg_wll_EventCode      eventcode=EDG_WLL_EVENT_UNDEF;
-edg_wll_ErrorCode      ret;
-edg_wll_Event          *this=NULL;
-
-/* break ULM string into fields */
-if ( edg_wll_ULMProcessParseTable(table) != 0 ) { 
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_BROKEN_ULM,"ULM parse error"); 
-       goto end; 
-}
-
-/* determine the event type */
-for (i=0; i<table->num; i++) {
-   keycode=edg_wll_StringToKeyName(edg_wll_ULMGetNameAt(table,i));
-   if ( keycode == EDG_WLL_EVNT ) { 
-       value=my_edg_wll_ULMGetValueAt(table,i); 
-       eventcode=edg_wll_StringToEvent(value); 
-       free(value);
-       value=NULL;
-       break; 
-   }
-}
-if ( eventcode == EDG_WLL_EVENT_UNDEF ) {
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_EVENT_UNDEF,"Unknown or missing event type"); 
-       goto end; 
-}
-/* allocate memory for 'this' (edg_wll_Event) */
-// XXX:  this = (edg_wll_Event *) calloc(1,sizeof(edg_wll_Event)); 
-this = edg_wll_InitEvent(eventcode);
-this->any.type = eventcode;
-
-/* go through all fields and fill in the edg_wll_Event union
- * in each step check for key duplicity and key name misuse 
- */
-for (i=0; i<table->num; i++) {
-   keycode=edg_wll_StringToKeyName(edg_wll_ULMGetNameAt(table,i));
-   value=my_edg_wll_ULMGetValueAt(table,i); 
-   switch (keycode) {
-   case EDG_WLL_EVNT : 
-       if (this->any.type != edg_wll_StringToEvent(value)) DUPLICITY
-      break;
-@@@{
-$indent = "   ";
-selectType $event '_common_';
-for ($event->getFieldsOrdered) {
-       my $f = selectField $event $_;
-       my $fn = getName $f;
-       my $fnu = uc getName $f 'ULM';
-       if (hasAlias $f 'ULM') {
-               gen $indent."case ULM\_$fnu :\n";
-       } else {
-               gen $indent."case EDG_WLL\_COMMON\_$fnu :\n";
-       }
-       gen "\tif (";
-               gen $f->isnotNULL("this->any.$fn");
-               gen ") DUPLICITY \n";
-       gen "\t";
-       if ($f->{codes}) {
-               my $c = ucfirst(${fn});
-               gen "this->any.$fn = edg_wll_StringTo${c}(value);";
-       } else {
-               gen $f->fromString('value',"this->any.$fn");
-       }
-       gen "\n".$indent.$indent."break;\n";
-}
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       my $misuse = "if (eventcode != EDG_WLL_EVENT_$tu ) MISUSE";
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $fnu = uc $fn;
-               gen $indent."case EDG_WLL\_$tu\_$fnu :\n";
-               gen "\tif ("; 
-                       gen $f->isnotNULL("this->$tl.$fn");
-                       gen ") DUPLICITY\n";
-               gen "\t$misuse\n";
-               if ($f->{codes}) {
-                       my $c = "$t".ucfirst(${fn});
-                       gen "\tthis->$tl.$fn = edg_wll_StringTo${c}(value);";
-               } else {
-                       gen "\t";
-                       gen $f->fromString('value',"this->$tl.$fn");
-               }
-               gen "\n".$indent.$indent."break;\n";
-       }
-}
-@@@}
-
-   case UNDEFINED :
-   case EDG_WLL_INTERNAL_TYPE :
-      break;
-
-   default : 
-       extra++;
-      break;
-   }
-   free(value);
-   value=NULL;
-}
-
-/* now check if all required fields are present */
-ret=edg_wll_CheckEvent(context,this);
-if (ret) { goto end; }
-
-/* parse is OK, only extra fields could occur */
-if (extra) {
-       sprintf(err_desc,"There are %d extra fields in the logline.",extra);
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_OK_WITH_EXTRA_FIELDS,err_desc); }
-else { ret=edg_wll_ResetError(context); }
-
-end:
-   /* finally (if wanted) "return" pointer to the filled edg_wll_Event union
-      NOTE: a pointer (to half-filled structure) is returned even if an error occured ! */
-   if (event != NULL) {
-       *event = this; }
-       /* This also means, that the memory must be freed by edg_wll_FreeEvent() somewhere else */
-   else {
-       edg_wll_FreeEvent(this);
-       free(this);
-   }
-
-   edg_wll_ULMFreeParseTable(table);
-   return ret;
-}
-
-/**
- * edg_wll_UnparseEvent - unparse ULM message from internal structures
- * Calls: malloc, free, strlen, strcmp, asprintf, trio_asprintf
- *        edg_wll_ULMTimevalToDate,
- *        edg_wll_EventToString, edg_wll_KeyNameToString, edg_wll_LevelToString, 
- *        edg_wlc_jobid_tUnparse, 
- * Algorithm: format values from internal structures into a ULM string
- */
-#define NOMEM { if (logline) free(logline); logline = NULL; edg_wll_SetError(context,ENOMEM,NULL); goto clean; }
-
-edg_wll_LogLine edg_wll_UnparseEvent(       /* logline OUT */
-          edg_wll_Context context,    /* context IN */
-          edg_wll_Event *event        /* event IN */
-)
-{
-edg_wll_LogLine                logline;
-edg_wll_EventCode      eventcode=event->type;
-char                   *date, *common, *user, *var, *e, *l, *j, *s;
-edg_wll_Event          nonulls;
-
-logline = date = common = user = var = NULL;
-
-/* FIXME: after EDG_WLL_FORMAT_COMMON automatic generation automate this code as well */
-/* format the common fields */
-date=(char *) malloc(1+ULM_DATE_STRING_LENGTH*sizeof(char));
-edg_wll_ULMTimevalToDate(event->any.timestamp.tv_sec, event->any.timestamp.tv_usec, date);
-
-memcpy(&nonulls,event,sizeof nonulls);
-@@@{
-       selectType $event '_common_';
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               gen "if (!nonulls.any.$fn) nonulls.any.$fn = \"\";\n"
-                       if $f->{type} eq 'string';
-       }
-@@@}
-
-e = edg_wll_EventToString(eventcode);
-l = edg_wll_LevelToString(event->any.level);
-j = edg_wlc_JobIdUnparse(event->any.jobId);
-s = edg_wll_SourceToString(event->any.source);
-if (trio_asprintf(&common,EDG_WLL_FORMAT_COMMON, \
-       date, event->any.host, l, event->any.priority, s, nonulls.any.src_instance, \
-       e, j, nonulls.any.seqcode) == -1) { 
-       if (e) free(e);
-       if (l) free(l);
-       if (j) free(j);
-       if (s) free(s);
-       NOMEM 
-}
-if (e) free(e);
-if (l) free(l);
-if (j) free(j);
-if (s) free(s);
-
-if (trio_asprintf(&user,EDG_WLL_FORMAT_USER, event->any.user) == -1) NOMEM
-
-/* format the rest of the logline */
-switch (eventcode) {
-@@@{
-$indent = "   ";
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       my $free = "";
-       gen $indent."case EDG_WLL_EVENT_$tu :\n";
-       gen "\t\{";
-       selectType $event $t;
-# if there are some _code_, convert them from string:
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $fnu = ucfirst $fn;
-               if ($f->{codes}) {
-                       gen "\tchar \*$fn\_code = edg_wll\_$t${fnu}ToString(event->$tl.$fn);\n"; 
-                       $free = $free . "free($fn\_code); ";
-               }
-               if ($f->{type} eq 'jobid') {
-                       gen "\tchar \*$fn\_str = edg_wlc_JobIdUnparse(event->$tl.$fn);\n";
-                       $free .= "free($fn\_str); ";
-               }
-               if ($f->{type} eq 'notifid') {
-                       gen "\tchar \*$fn\_str = edg_wll_NotifIdUnparse(event->$tl.$fn);\n";
-                       $free .= "free($fn\_str); ";
-               }
-               if ($ULMasString{$f->{type}}) {
-                       gen "\tchar \*$fn\_str = ".$f->getType()."ToString(event->$tl.$fn);\n";
-                       $free .= "free($fn\_str); ";
-               }
-       }
-       
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-
-               gen "\t\tif (!nonulls.$tl.$fn) nonulls.$tl.$fn = \"\";\n"
-                       if $f->{type} eq 'string';
-       }
-       gen "\tif (trio_asprintf(&var,EDG_WLL_FORMAT_$tu";
-# now format remaining parapteres for trio_asprintf:
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               if ($f->{codes}) {
-                       gen ",$fn\_code";
-               }
-               elsif ($f->{type} eq 'jobid' || $f->{type} eq 'notifid' || $ULMasString{$f->{type}}) {
-                       gen ",$fn\_str?$fn\_str:\"\"";
-               } else {
-                       gen ",nonulls.$tl.$fn";
-               }
-       }
-       gen ") == -1 ) \{\n";
-               gen "\t".$indent.$free."NOMEM \}\n";
-       if ($free) { gen "\t$free\n"; }
-       gen "\t\}\n";
-       gen $indent.$indent."break;\n";
-}
-@@@}
-  case EDG_WLL_EVENT_UNDEF :
-  default :
-     break;
-}
-
-/* put it all together (inc. the ending LF) */
-if (asprintf(&logline,"%s%s%s\n",common,user,var) == -1) NOMEM
-
-clean:
-       if (date) free(date);
-       if (common) free(common);
-       if (user) free(user);
-       if (var) free(var);
-       return logline;
-}
-
-
-/**
- * edg_wll_CheckEvent - check internal structures if all required fields are present
- * Calls: free, sprintf, strcmp
- *        edg_wll_KeyNameToString, edg_wll_SetError (or edg_wll_ResetError)
- * Algorithm:
- */
-#define MISSING(m_key) { \
-       char *k =  edg_wll_KeyNameToString(m_key); \
-        sprintf(err_desc,"Message incomplete, missing key %s.", k); \
-       free(k); \
-        ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_MSG_INCOMPLETE,err_desc); \
-        goto end; }
-
-edg_wll_ErrorCode edg_wll_CheckEvent(
-       edg_wll_Context context,        /* context IN */
-       edg_wll_Event *event    /* event IN */
-)
-{
-char err_desc[128];            /* error description for use in edg_wll_SetError */
-edg_wll_EventCode eventcode=EDG_WLL_EVENT_UNDEF;
-edg_wll_ErrorCode ret;
-
-eventcode=event->type;
-if ( eventcode == EDG_WLL_EVENT_UNDEF ) {
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_EVENT_UNDEF,"Unknown or missing event type"); 
-       goto end; 
-}
-
-/*
-FIXME:
-?      if (!event->any.user) MISSING(EDG_WLL_USER) - cannot use in edg_wll_LogEvent(), where is no DG.USER
-*/
-
-@@@{
-       $indent = "   ";
-       selectType $event '_common_';
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               next if $f->{optional};
-               if (!$f->{codes}) {
-                       if (!$f->hasAlias('ULM')) {
-                               my $fu = uc $fn;
-                               gen "\tif (". $f->isNULL("event->any.$fn") .") MISSING(EDG_WLL\_COMMON\_$fu)\n";
-                       } else {
-                               my $fa = $f->getName('ULM');
-                               my $fu = uc $fa;
-                               gen "\tif (". $f->isNULL("event->any.$fn") .") MISSING(ULM\_$fu)\n";
-                       }
-               }
-       }
-@@@}
-
-switch (eventcode) {
-@@@{
-$indent = "   ";
-for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes) {
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       gen $indent."case EDG_WLL_EVENT_$tu :\n";
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               next if $f->{optional};
-               if (!$f->{codes}) {
-                       my $fn = $f->{name};
-                       my $fu = uc $fn;
-                       my $ft = $f->{type};
-                       gen "\tif (". $f->isNULL("event->$tl.$fn") .") MISSING(EDG_WLL\_$tu\_$fu)\n";
-               }
-       }
-       gen $indent.$indent."break;\n";
-}
-@@@}
-
-   case EDG_WLL_EVENT_UNDEF :
-   default:
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_EVENT_UNDEF,"Unknown or missing event type"); 
-        goto end;
-      break;
-};
-ret=edg_wll_ResetError(context);
-
-end:
-       return ret;
-}
-
-
-/**
- * my_edg_wll_ULMGetValueAt - get value at index, but also
- *                - remove surrounding quotes if any
- *                - and unescape the string
- *                - the new string will be allocated (by edg_wll_LogUnescape)
- * Calls: edg_wll_ULMGetValueAt, edg_wll_LogUnescape, calloc and strncpy or strdup
- */
-char *my_edg_wll_ULMGetValueAt( p_edg_wll_ULMFields table, int index )
-{
-char *str = edg_wll_ULMGetValueAt( table, index);
-size_t len = strlen(str);
-char *ret,*first,*last,*tmp;
-
-first = last = str;
-last += len - 1;
-
-/* remove surrounding quotes */
-if ((*first == ULM_QM) && (*last == ULM_QM)) {
-       /* be careful with doppel_ULM_QM */
-       if (len > 2) {
-               tmp = (char *) calloc (1,(len-1)*sizeof(char));
-               strncpy(tmp,first+1,len-2);
-               tmp[len-2] = '\0';
-       }
-       else {
-               tmp = strdup("");
-       }
-}
-else tmp = strdup(str);
-
-if (len > 2) {
-       ret = edg_wll_LogUnescape(tmp);
-       if (tmp) free(tmp);
-}
-else ret = tmp;
-
-return ret;
-}
-
-
-/**
- * edg_wll_GetJobId - parse jobId from ULM message
- * Returns: edg_wlc_jobid_t string or NULL
- * Calls: edg_wll_ULMNewParseTable, edg_wll_ULMFreeParseTable, edg_wll_ULMProcessParseTable,
- *        edg_wll_ULMGetNameAt, my_edg_wll_ULMGetValueAt, edg_wlc_jobid_tParse, strdup
- * Algorithm: break ULM string into fields and then look for jobId
- */
-char *edg_wll_GetJobId(edg_wll_LogLine logline)
-{
-p_edg_wll_ULMFields table = edg_wll_ULMNewParseTable(logline);
-int i;
-char *ret=NULL,*fullid=NULL;
-edg_wll_KeyNameCode keycode=UNDEFINED;
-edg_wlc_JobId jobId = NULL;
-
-/* break ULM string into fields */
-if ( edg_wll_ULMProcessParseTable(table) != 0 ) goto clean;
-
-/* look for jobId */
-for (i=0; i<table->num; i++) {
-       keycode=edg_wll_StringToKeyName(edg_wll_ULMGetNameAt(table,i));
-       if ( keycode == EDG_WLL_COMMON_JOBID ) { fullid=my_edg_wll_ULMGetValueAt(table,i); break; }
-}
-if ( fullid == NULL ) goto clean;
-
-if (edg_wlc_JobIdParse(fullid, &jobId)) goto clean;
-
-ret = strdup(fullid);
-
-clean:
-   if (fullid) free(fullid);
-   if (jobId) edg_wlc_JobIdFree(jobId);
-   edg_wll_ULMFreeParseTable(table);
-   return ret;
-}
-
-/**
- * Parse a special Notification ULM line into a edg_wll_Event structure
- * \param context IN: context to work with
- * \param logline IN: ULM string to parse
- * \param event OUT: parsed event
- *     (may be NULL - syntax checking with no output)
- */
-edg_wll_ErrorCode edg_wll_ParseNotifEvent(
-       edg_wll_Context context,
-       edg_wll_LogLine logline,
-       edg_wll_Event ** event
-)
-{
-int                    i;
-int                    extra=0;        /* number of extra unknown key=value pairs */
-char                   err_desc[128];  /* error description for use in edg_wll_SetError */
-char *value=NULL;
-p_edg_wll_ULMFields    table = edg_wll_ULMNewParseTable(logline);
-edg_wll_KeyNameCode    keycode=UNDEFINED;
-const edg_wll_EventCode        eventcode=EDG_WLL_EVENT_NOTIFICATION;
-edg_wll_ErrorCode      ret;
-edg_wll_Event          *this=NULL;
-
-/* break ULM string into fields */
-if ( edg_wll_ULMProcessParseTable(table) != 0 ) {
-       ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_BROKEN_ULM,"ULM parse error");
-       goto end;
-}
-
-/* allocate memory for 'this' (edg_wll_Event) */
-this = edg_wll_InitEvent(eventcode);
-this->any.type = eventcode;
-
-/* go through all fields and fill in the edg_wll_Event union
- * in each step check for key duplicity and key name misuse 
- */
-for (i=0; i<table->num; i++) {
-   keycode=edg_wll_StringToKeyName(edg_wll_ULMGetNameAt(table,i));
-   value=my_edg_wll_ULMGetValueAt(table,i); 
-   switch (keycode) {
-   case EDG_WLL_EVNT : 
-       if (this->any.type != edg_wll_StringToEvent(value)) DUPLICITY
-      break;
-   case ULM_DATE :
-       if (!((this->any.timestamp).tv_sec == (null_timeval).tv_sec && (this->any.timestamp).tv_usec == (null_timeval).tv_usec)) DUPLICITY 
-       edg_wll_ULMDateToTimeval(value,&this->any.timestamp);
-      break;
-   case ULM_ARR_DATE :
-       if (!((this->any.arrived).tv_sec == (null_timeval).tv_sec && (this->any.arrived).tv_usec == (null_timeval).tv_usec)) DUPLICITY 
-       edg_wll_ULMDateToTimeval(value,&this->any.arrived);
-      break;
-   case ULM_HOST :
-       if (!(((this->any.host) == NULL && (NULL) == NULL) || ((this->any.host)&&(NULL)&& !strcmp(this->any.host,NULL)))) DUPLICITY 
-       this->any.host = strdup(value);
-      break;
-   case ULM_LVL :
-       if (!((this->any.level == 0))) DUPLICITY 
-       this->any.level = edg_wll_StringToLevel(value);
-      break;
-   case EDG_WLL_COMMON_SOURCE :
-       if (!((this->any.source) == (EDG_WLL_SOURCE_NONE))) DUPLICITY 
-       this->any.source = edg_wll_StringToSource(value);
-      break;
-   case EDG_WLL_COMMON_SRC_INSTANCE :
-       if (!(((this->any.src_instance) == NULL && (NULL) == NULL) || ((this->any.src_instance)&&(NULL)&& !strcmp(this->any.src_instance,NULL)))) DUPLICITY 
-       this->any.src_instance = strdup(value);
-      break;
-@@@{
-       $indent = "   ";
-       my $t = 'Notification';
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       my $misuse = "if (eventcode != EDG_WLL_EVENT_$tu ) MISUSE";
-       selectType $event $t;
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $fnu = uc $fn;
-               gen $indent."case EDG_WLL\_$tu\_$fnu :\n";
-               gen "\tif ("; 
-                       gen $f->isnotNULL("this->$tl.$fn");
-                       gen ") DUPLICITY\n";
-               gen "\t$misuse\n";
-               if ($f->{codes}) {
-                       my $c = "$t".ucfirst(${fn});
-                       gen "\tthis->$tl.$fn = edg_wll_StringTo${c}(value);";
-               } else {
-                       gen "\t";
-                       gen $f->fromString('value',"this->$tl.$fn");
-               }
-               gen "\n".$indent.$indent."break;\n";
-       }
-@@@}
-
-   case UNDEFINED :
-   case EDG_WLL_INTERNAL_TYPE :
-      break;
-
-   default : 
-       extra++;
-      break;
-   }
-   free(value);
-   value=NULL;
-}
-
-/* parse is OK, only extra fields could occur */
-if (extra) {
-        sprintf(err_desc,"There are %d extra fields in the logline.",extra);
-        ret=edg_wll_SetError(context,EDG_WLL_ERROR_PARSE_OK_WITH_EXTRA_FIELDS,err_desc); }
-else {  ret=edg_wll_ResetError(context); }
-
-end:
-   /* finally (if wanted) "return" pointer to the filled edg_wll_Event union
-      NOTE: a pointer (to half-filled structure) is returned even if an error occured ! */
-   if (event != NULL) {
-       *event = this; }
-       /* This also means, that the memory must be freed by edg_wll_FreeEvent() somewhere else */
-   else {
-       edg_wll_FreeEvent(this);
-       free(this);
-   }
-
-   edg_wll_ULMFreeParseTable(table);
-   return ret;
-}
-
-/** 
- * Generate a special Notification ULM line from edg_wll_Event structure
- * \param context IN: context to work with
- * \param event IN: event to unparse
- */
-edg_wll_LogLine edg_wll_UnparseNotifEvent(
-       edg_wll_Context context,
-       edg_wll_Event * event
-)
-{
-edg_wll_LogLine logline;
-char           *date, *common, *var, *l, *s;
-edg_wll_Event   nonulls;
-
-logline = date = common = var = l = s = NULL;
-
-/* format the common fields */
-date=(char *) malloc(1+ULM_DATE_STRING_LENGTH*sizeof(char));
-edg_wll_ULMTimevalToDate(event->any.timestamp.tv_sec, event->any.timestamp.tv_usec, date);
-
-memcpy(&nonulls,event,sizeof nonulls);
-if (!nonulls.any.host) nonulls.any.host = "";
-if (!nonulls.any.src_instance) nonulls.any.src_instance = "";
-
-l = edg_wll_LevelToString(event->any.level);
-s = edg_wll_SourceToString(event->any.source);
-if (trio_asprintf(&common,EDG_WLL_FORMAT_NOTIFICATION_COMMON, \
-        date, event->any.host, l, s, nonulls.any.src_instance) == -1) {
-               if (l) free(l);
-               if (s) free(s);
-               NOMEM 
-       }
-if (l) free(l);
-if (s) free(s);
-
-// n = edg_wlc_NotifIdUnparse(event->notification.notifId);
-
-/* format the rest of the logline */
-@@@{
-$indent = "   ";
-       my $t = 'Notification';
-       my $tu = uc $t;
-       my $tl = lcfirst $t;
-       my $free = "";
-##     gen $indent."case EDG_WLL_EVENT_$tu :\n";
-       gen "\t\{";
-       selectType $event $t;
-# if there are some _code_, convert them from string:
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               my $fnu = ucfirst $fn;
-               if ($f->{codes}) {
-                       gen "\tchar \*$fn\_code = edg_wll\_$t${fnu}ToString(event->$tl.$fn);\n"; 
-                       $free = $free . "free($fn\_code); ";
-               }
-               if ($f->{type} eq 'jobid') {
-                       gen "\tchar \*$fn\_str = edg_wlc_JobIdUnparse(event->$tl.$fn);\n";
-                       $free .= "free($fn\_str); ";
-               }
-               if ($f->{type} eq 'notifid') {
-                       gen "\tchar \*$fn\_str = edg_wll_NotifIdUnparse(event->$tl.$fn);\n";
-                       $free .= "free($fn\_str); ";
-               }
-               if ($ULMasString{$f->{type}}) {
-                       gen "\tchar \*$fn\_str = ".$f->getType()."ToString(event->$tl.$fn);\n";
-                       $free .= "free($fn\_str); ";
-               }
-       }
-       
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-
-               gen "\t\tif (!nonulls.$tl.$fn) nonulls.$tl.$fn = \"\";\n"
-                       if $f->{type} eq 'string';
-       }
-       gen "\tif (trio_asprintf(&var,EDG_WLL_FORMAT_$tu";
-# now format remaining parapteres for trio_asprintf:
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = $f->{name};
-               if ($f->{codes}) {
-                       gen ",$fn\_code";
-               }
-               elsif ($f->{type} eq 'jobid' || $f->{type} eq 'notifid' || $ULMasString{$f->{type}}) {
-                       gen ",$fn\_str?$fn\_str:\"\"";
-               } else {
-                       gen ",nonulls.$tl.$fn";
-               }
-       }
-       gen ") == -1 ) \{\n";
-               gen "\t".$indent.$free."NOMEM \}\n";
-       if ($free) { gen "\t$free\n"; }
-       gen "\t\}\n";
-##     gen $indent.$indent."break;\n";
-@@@}
-
-/* put it all together (inc. the ending LF) */
-if (asprintf(&logline,"%s%s\n",common,var) == -1) NOMEM
-
-clean:
-        if (date) free(date);
-        if (common) free(common);
-        if (var) free(var);
-        return logline;
-}
-
diff --git a/org.glite.lb.common/src/il_int.c b/org.glite.lb.common/src/il_int.c

deleted file mode 100644 (file)

index 7d4bdf5..0000000
--- a/org.glite.lb.common/src/il_int.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "il_string.h"
-
-char *
-_put_int(char *p, int d)
-{
-  char buf[32];
-  int len;
-  
-  assert( p != NULL );
-
-  snprintf(buf, sizeof(buf), "%d", d);
-  len = strlen(buf);
-  strncpy(p, buf, len);
-  return(p + len);
-}
-
-
-char *
-put_int(char *p, int d)
-{
-  assert( p != NULL );
-
-  p = _put_int(p, d);
-  *p++ = '\n';
-  return(p);
-}
-
-
-char *
-_get_int(char *p, int *d)
-{
-   char *end;
-
-  assert( p != NULL );
-  assert( d != NULL );
-
-  *d = strtol(p, &end, 10);
-  return(end);
-}
-  
-
-char *
-get_int(char *p, int *d)
-{
-  assert( p != NULL );
-  assert( d != NULL );
-
-  p = _get_int(p, d);
-  if(*p != '\n') 
-    return(NULL);
-  else
-    return(p + 1);
-}
-
-
-int 
-len_int(int d)
-{
-  char buffer[256];
-
-  return(put_int(buffer, d) - buffer);
-}
diff --git a/org.glite.lb.common/src/il_log.c b/org.glite.lb.common/src/il_log.c

deleted file mode 100644 (file)

index 11170c5..0000000
--- a/org.glite.lb.common/src/il_log.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <syslog.h>
-
-int log_level;
-
-int
-il_log(int level, char *fmt, ...)
-{
-       char *err_text;
-       va_list fmt_args;
-
-       va_start(fmt_args, fmt);
-       vasprintf(&err_text, fmt, fmt_args);
-       va_end(fmt_args);
-       
-       if(level <= log_level) 
-               fprintf(stderr, err_text);
-       
-       if(level <= LOG_ERR) {
-               openlog("edg-wl-interlogd", LOG_PID | LOG_CONS, LOG_DAEMON);
-               syslog(level, "%s", err_text);
-               closelog();
-       }
-
-       if(err_text) free(err_text);
-
-       return(0);
-}
diff --git a/org.glite.lb.common/src/il_msg.c b/org.glite.lb.common/src/il_msg.c

deleted file mode 100644 (file)

index 30997f6..0000000
--- a/org.glite.lb.common/src/il_msg.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#ident "$Header$"
-
-#include "il_string.h"
-
-#include <malloc.h>
-#include <stdio.h>
-#include <unistd.h>
-
-int 
-receive_msg(int sd, char **ucs, char **event)
-{
-  char buffer[17];
-  char *p, *q, *msg;
-  int len;
-
-  len = read(sd, buffer, 17);
-
-  if(buffer[16] != '\n') {
-    printf("Error in header!\n");
-    goto err;
-  }
-
-  sscanf(buffer, "%d", &len);
-  if(len > MAXLEN) {
-    printf("Message too long!\n");
-    goto err;
-  }
-  p = msg = malloc(len+1);
-  if(p == NULL) {
-    printf("Error allocating %d bytes\n", len+1);
-    goto err;
-  }
-
-  read(sd, p, len);
-  p[len] = 0;
-
-  if((q = get_string(p, ucs)) == NULL) {
-    printf("Protocol error at %s\n", p);
-    goto err;
-  }
-  p = q;
-  if((q = get_string(p, event)) == NULL) {
-    printf("Protocol error at %s\n", p);
-    goto err;
-  }
-
-  free(msg);
-  return(0);
-
- err: 
-  
-  return(-1);
-}
diff --git a/org.glite.lb.common/src/il_string.c b/org.glite.lb.common/src/il_string.c

deleted file mode 100644 (file)

index 2c4034d..0000000
--- a/org.glite.lb.common/src/il_string.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "il_string.h"
-
-char *
-put_string(char *p, char *s)
-{
-  int len = strlen(s);
-  
-  assert( p != NULL );
-
-  p = _put_int(p, len);
-  *p++ = ' ';
-  strncpy(p, s, len);
-  p += len;
-  *p++ = '\n';
-  return(p);
-}
-
-
-int
-len_string(char *s)
-{
-  int len, slen;
-
-  assert( s != NULL );
-
-  slen = strlen(s);
-  len = len_int(slen);
-
-  return(len + slen + 1);
-}
-
-
-char *
-get_string(char *p, char **s)
-{
-  int len;
-
-  assert( p != NULL );
-
-  *s = NULL;
-
-  p = _get_int(p, &len);
-  if(*p != ' ')
-    return(NULL);
-  else
-    {
-      *s = malloc(len + 1);
-      if(*s == NULL)
-       return(NULL);
-      strncpy(*s, ++p, len);
-      (*s)[len] = '\0';
-      p += len;
-      return( *p++ == '\n' ? p : NULL );
-    }
-}
diff --git a/org.glite.lb.common/src/lb_gss.c b/org.glite.lb.common/src/lb_gss.c

deleted file mode 100644 (file)

index a5642cb..0000000
--- a/org.glite.lb.common/src/lb_gss.c
+++ /dev/null
@@ -1,979 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <time.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <ares.h>
-#include <errno.h>
-
-#include "lb_gss.h"
-
-#define tv_sub(a,b) {\
-       (a).tv_usec -= (b).tv_usec;\
-       (a).tv_sec -= (b).tv_sec;\
-       if ((a).tv_usec < 0) {\
-               (a).tv_sec--;\
-               (a).tv_usec += 1000000;\
-       }\
-}
-
-struct asyn_result {
-       struct hostent *ent;
-       int             err;
-};
-
-static int decrement_timeout(struct timeval *timeout, struct timeval before, struct timeval after)
-{
-        (*timeout).tv_sec = (*timeout).tv_sec - (after.tv_sec - before.tv_sec);
-        (*timeout).tv_usec = (*timeout).tv_usec - (after.tv_usec - before.tv_usec);
-        while ( (*timeout).tv_usec < 0) {
-                (*timeout).tv_sec--;
-                (*timeout).tv_usec += 1000000;
-        }
-        if ( ((*timeout).tv_sec < 0) || (((*timeout).tv_sec == 0) && ((*timeout).tv_usec == 0)) ) return(1);
-        else return(0);
-}
-
-/* ares callback handler for ares_gethostbyname()       */
-static void callback_handler(void *arg, int status, struct hostent *h) {
-       struct asyn_result *arp = (struct asyn_result *) arg;
-
-       switch (status) {
-          case ARES_SUCCESS:
-               if (h && h->h_addr_list[0]) {
-                       arp->ent->h_addr_list =
-                               (char **) malloc(2 * sizeof(char *));
-                       if (arp->ent->h_addr_list == NULL) {
-                               arp->err = NETDB_INTERNAL;
-                               break;
-                       }
-                       arp->ent->h_addr_list[0] =
-                               malloc(sizeof(struct in_addr));
-                       if (arp->ent->h_addr_list[0] == NULL) {
-                               free(arp->ent->h_addr_list);
-                               arp->err = NETDB_INTERNAL;
-                               break;
-                       }
-                       memcpy(arp->ent->h_addr_list[0], h->h_addr_list[0],
-                               sizeof(struct in_addr));
-                       arp->ent->h_addr_list[1] = NULL;
-                       arp->err = NETDB_SUCCESS;
-               } else {
-                       arp->err = NO_DATA;
-               }
-               break;
-           case ARES_EBADNAME:
-           case ARES_ENOTFOUND:
-               arp->err = HOST_NOT_FOUND;
-               break;
-           case ARES_ENOTIMP:
-               arp->err = NO_RECOVERY;
-               break;
-           case ARES_ENOMEM:
-           case ARES_EDESTRUCTION:
-           default:
-               arp->err = NETDB_INTERNAL;
-               break;
-       }
-}
-
-static void free_hostent(struct hostent *h){
-        int i;
-
-        if (h) {
-                if (h->h_name) free(h->h_name);
-               if (h->h_aliases) {
-                       for (i=0; h->h_aliases[i]; i++) free(h->h_aliases[i]);
-                       free(h->h_aliases);
-               }
-                if (h->h_addr_list) {
-                        for (i=0; h->h_addr_list[i]; i++) free(h->h_addr_list[i]);
-                        free(h->h_addr_list);
-                }
-                free(h);
-        }
-}
-
-static int asyn_gethostbyname(char **addrOut, char const *name, struct timeval *timeout) {
-       struct asyn_result ar;
-       ares_channel channel;
-       int nfds;
-       fd_set readers, writers;
-       struct timeval tv, *tvp;
-       struct timeval start_time,check_time;
-
-/* start timer */
-       gettimeofday(&start_time,0);
-
-/* ares init */
-       if ( ares_init(&channel) != ARES_SUCCESS ) return(NETDB_INTERNAL);
-       ar.ent = (struct hostent *) calloc (sizeof(*ar.ent),1);
-
-/* query DNS server asynchronously */
-       ares_gethostbyname(channel, name, AF_INET, callback_handler,
-                          (void *) &ar);
-
-/* wait for result */
-       while (1) {
-               FD_ZERO(&readers);
-               FD_ZERO(&writers);
-               nfds = ares_fds(channel, &readers, &writers);
-               if (nfds == 0)
-                       break;
-
-               gettimeofday(&check_time,0);
-               if (decrement_timeout(timeout, start_time, check_time)) {
-                       ares_destroy(channel);
-                       free_hostent(ar.ent);
-                       return(TRY_AGAIN);
-               }
-               start_time = check_time;
-
-               tvp = ares_timeout(channel, timeout, &tv);
-
-               switch ( select(nfds, &readers, &writers, NULL, tvp) ) {
-                       case -1: if (errno != EINTR) {
-                                       ares_destroy(channel);
-                                       free_hostent(ar.ent);
-                                       return NETDB_INTERNAL;
-                                } else
-                                       continue;
-                       case 0: 
-                               FD_ZERO(&readers);
-                               FD_ZERO(&writers);
-                               /* fallthrough */
-                       default: ares_process(channel, &readers, &writers);
-               }
-       }
-
-       ares_destroy(channel);
-
-       if (ar.err == NETDB_SUCCESS) {
-               *addrOut = malloc(sizeof(struct in_addr));
-               memcpy(*addrOut,ar.ent->h_addr_list[0], sizeof(struct in_addr));
-               free_hostent(ar.ent);
-       }
-       return(ar.err);
-}
-
-static int
-do_connect(int *s, char const *hostname, int port, struct timeval *timeout)
-{
-   int sock;
-   struct timeval before,after,to;
-   struct sockaddr_in a;
-   int sock_err;
-   socklen_t err_len;
-   char *addr;
-   int h_errno;
-
-   sock = socket(AF_INET, SOCK_STREAM, 0);
-   if (sock < 0) return EDG_WLL_GSS_ERROR_ERRNO;
-
-   if (timeout) {
-            int        flags = fcntl(sock, F_GETFL, 0);
-            if (fcntl(sock, F_SETFL, flags | O_NONBLOCK) < 0)
-                    return EDG_WLL_GSS_ERROR_ERRNO;
-            gettimeofday(&before,NULL);
-   }
-   
-   if (timeout) {
-      switch (h_errno = asyn_gethostbyname(&addr, hostname, timeout)) {
-               case NETDB_SUCCESS:
-                       memset(&a,0,sizeof a);
-                       a.sin_family = AF_INET;
-                       memcpy(&a.sin_addr.s_addr,addr,sizeof a.sin_addr.s_addr);
-                       a.sin_port = htons(port);
-                       free(addr);
-                       break;
-               case TRY_AGAIN:
-                       close(sock);
-                       return EDG_WLL_GSS_ERROR_TIMEOUT;
-               case NETDB_INTERNAL: 
-                       /* fall through */
-               default:
-                       close(sock);
-                       /* h_errno may be thread safe with Linux pthread libs,
-                        * but such an assumption is not portable
-                        */
-                       errno = h_errno;
-                       return EDG_WLL_GSS_ERROR_HERRNO;
-      }
-   } else {
-      struct hostent *hp;
-
-      hp = gethostbyname(hostname);
-      if (hp == NULL) {
-        close(sock);
-        errno = h_errno;
-        return EDG_WLL_GSS_ERROR_HERRNO;
-      }
-
-      memset(&a,0,sizeof a);
-      a.sin_family = AF_INET;
-      memcpy(&a.sin_addr.s_addr, hp->h_addr_list[0], sizeof(a.sin_addr.s_addr));
-      a.sin_port = htons(port);
-   }
-
-   if (connect(sock,(struct sockaddr *) &a,sizeof a) < 0) {
-            if (timeout && errno == EINPROGRESS) {
-                    fd_set     fds;
-                    FD_ZERO(&fds);
-                    FD_SET(sock,&fds);
-                    memcpy(&to,timeout,sizeof to);
-                    gettimeofday(&before,NULL);
-                    switch (select(sock+1,NULL,&fds,NULL,&to)) {
-                            case -1: close(sock);
-                                     return EDG_WLL_GSS_ERROR_ERRNO;
-                            case 0: close(sock);
-                                    return EDG_WLL_GSS_ERROR_TIMEOUT;
-                    }
-                    gettimeofday(&after,NULL);
-                    tv_sub(after,before);
-                    tv_sub(*timeout,after);
-
-                    err_len = sizeof sock_err;
-                    if (getsockopt(sock,SOL_SOCKET,SO_ERROR,&sock_err,&err_len)) {
-                            close(sock);
-                            return EDG_WLL_GSS_ERROR_ERRNO;
-                    }
-                    if (sock_err) {
-                            close(sock);
-                            errno = sock_err;
-                            return EDG_WLL_GSS_ERROR_ERRNO;
-                    }
-            }
-            else {
-                    close(sock);
-                    return EDG_WLL_GSS_ERROR_ERRNO;
-            }
-   }
-
-   *s = sock;
-   return 0;
-}
-
-static int
-send_token(int sock, void *token, size_t token_length, struct timeval *to)
-{
-   size_t num_written = 0;
-   ssize_t count;
-   fd_set fds;
-   struct timeval timeout,before,after;
-   int ret;
-
-   if (to) {
-       memcpy(&timeout,to,sizeof(timeout));
-       gettimeofday(&before,NULL);
-   }
-
-
-   ret = 0;
-   while(num_written < token_length) {
-      FD_ZERO(&fds);
-      FD_SET(sock,&fds);
-      switch (select(sock+1, NULL, &fds, NULL, to ? &timeout : NULL)) {
-        case 0: ret = EDG_WLL_GSS_ERROR_TIMEOUT;
-                goto end;
-                break;
-        case -1: ret = EDG_WLL_GSS_ERROR_ERRNO;
-                 goto end;
-                 break;
-      }
-
-      count = write(sock, ((char *)token) + num_written,
-                   token_length - num_written);
-      if(count < 0) {
-        if(errno == EINTR)
-           continue;
-        else {
-           ret = EDG_WLL_GSS_ERROR_ERRNO;
-           goto end;
-        }
-      }
-      num_written += count;
-   }
-
-end:
-   if (to) {
-      gettimeofday(&after,NULL);
-      tv_sub(after,before);
-      tv_sub(*to,after);
-      if (to->tv_sec < 0) {
-        to->tv_sec = 0;
-        to->tv_usec = 0;
-      }
-   }
-
-   return ret;
-}
-
-static int
-recv_token(int sock, void **token, size_t *token_length, struct timeval *to)
-{
-   ssize_t count;
-   char buf[4098];
-   char *t = NULL;
-   char *tmp;
-   size_t tl = 0;
-   fd_set fds;
-   struct timeval timeout,before,after;
-   int ret;
-
-   if (to) {
-      memcpy(&timeout,to,sizeof(timeout));
-      gettimeofday(&before,NULL);
-   }
-
-   ret = 0;
-   do {
-      FD_ZERO(&fds);
-      FD_SET(sock,&fds);
-      switch (select(sock+1, &fds, NULL, NULL, to ? &timeout : NULL)) {
-        case 0: 
-           ret = EDG_WLL_GSS_ERROR_TIMEOUT;
-           goto end;
-           break;
-        case -1:
-           ret = EDG_WLL_GSS_ERROR_ERRNO;
-           goto end;
-           break;
-      }
-      
-      count = read(sock, buf, sizeof(buf));
-      if (count < 0) {
-        if (errno == EINTR)
-           continue;
-        else {
-           ret = EDG_WLL_GSS_ERROR_ERRNO;
-           goto end;
-        }
-      }
-      if (count == 0 && tl == 0 && errno == 0)
-        return EDG_WLL_GSS_ERROR_EOF; 
-      tmp=realloc(t, tl + count);
-      if (tmp == NULL) {
-        errno = ENOMEM;
-        return EDG_WLL_GSS_ERROR_ERRNO;
-      }
-      t = tmp;
-      memcpy(t + tl, buf, count);
-      tl += count;
-   } while (count == sizeof(buf));
-
-end:
-   if (to) {
-      gettimeofday(&after,NULL);
-      tv_sub(after,before);
-      tv_sub(*to,after);
-      if (to->tv_sec < 0) {
-        to->tv_sec = 0;
-        to->tv_usec = 0;
-      }
-   }
-
-   if (ret == 0) {
-      *token = t;
-      *token_length = tl;
-   } else
-      free(t);
-
-   return ret;
-}
-
-static int
-create_proxy(char *cert_file, char *key_file, char **proxy_file)
-{
-   char buf[4096];
-   int in, out;
-   char *name = NULL;
-   int ret, len;
-
-   *proxy_file = NULL;
-
-   asprintf(&name, "%s/%d.lb.XXXXXX", P_tmpdir, getpid());
-
-   out = mkstemp(name);
-   if (out < 0)
-      return EDG_WLL_GSS_ERROR_ERRNO;
-
-   in = open(cert_file, O_RDONLY);
-   if (in < 0) {
-      ret = EDG_WLL_GSS_ERROR_ERRNO;
-      goto end;
-   }
-   while ((ret = read(in, buf, sizeof(buf))) > 0) {
-      len = write(out, buf, ret);
-      if (len != ret) {
-        ret = -1;
-        break;
-      }
-   }
-   close(in);
-   if (ret < 0) {
-      ret = EDG_WLL_GSS_ERROR_ERRNO;
-      goto end;
-   }
-
-   in = open(key_file, O_RDONLY);
-   if (in < 0) {
-      ret = EDG_WLL_GSS_ERROR_ERRNO;
-      goto end;
-   }
-   while ((ret = read(in, buf, sizeof(buf))) > 0) {
-      len = write(out, buf, ret);
-      if (len != ret) {
-        ret = -1;
-        break;
-      }
-   }
-   close(in);
-   if (ret < 0) {
-      ret = EDG_WLL_GSS_ERROR_ERRNO;
-      goto end;
-   }
-
-   ret = 0;
-   *proxy_file = name;
-
-end:
-   close(out);
-   if (ret) {
-      unlink(name);
-      free(name);
-   }
-
-   return ret;
-}
-
-static int
-destroy_proxy(char *proxy_file)
-{
-   /* XXX we should erase the contents safely (i.e. overwrite with 0's) */
-   unlink(proxy_file);
-   return 0;
-}
-
-int
-edg_wll_gss_acquire_cred_gsi(char *cert_file, char *key_file, gss_cred_id_t *cred,
-                            char **name, edg_wll_GssStatus* gss_code)
-{
-   OM_uint32 major_status = 0, minor_status, minor_status2;
-   gss_cred_id_t gss_cred = GSS_C_NO_CREDENTIAL;
-   gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER;
-   gss_name_t gss_name = GSS_C_NO_NAME;
-   OM_uint32 lifetime;
-   char *proxy_file = NULL;
-   int ret;
-
-   if ((cert_file == NULL && key_file != NULL) ||
-       (cert_file != NULL && key_file == NULL))
-      return EINVAL;
-
-   if (cert_file == NULL) {
-      major_status = gss_acquire_cred(&minor_status, GSS_C_NO_NAME, 0,
-                                     GSS_C_NO_OID_SET, GSS_C_BOTH,
-                                     &gss_cred, NULL, NULL);
-      if (GSS_ERROR(major_status)) {
-        ret = EDG_WLL_GSS_ERROR_GSS;
-        goto end;
-      }
-   } else {
-      proxy_file = cert_file;
-      if (strcmp(cert_file, key_file) != 0 &&
-         (ret = create_proxy(cert_file, key_file, &proxy_file))) {
-        proxy_file = NULL;
-        goto end;
-      }
-      
-      asprintf((char**)&buffer.value, "X509_USER_PROXY=%s", proxy_file);
-      if (buffer.value == NULL) {
-        errno = ENOMEM;
-        ret = EDG_WLL_GSS_ERROR_ERRNO;
-        goto end;
-      }
-      buffer.length = strlen(proxy_file);
-
-      major_status = gss_import_cred(&minor_status, &gss_cred, GSS_C_NO_OID, 1,
-                                    &buffer, 0, NULL);
-      free(buffer.value);
-      if (GSS_ERROR(major_status)) {
-        ret = EDG_WLL_GSS_ERROR_GSS;
-        goto end;
-      }
-   }
-
-   /* gss_import_cred() doesn't check validity of credential loaded, so let's
-    * verify it now */
-    major_status = gss_inquire_cred(&minor_status, gss_cred, &gss_name,
-                                   &lifetime, NULL, NULL);
-    if (GSS_ERROR(major_status)) {
-       ret = EDG_WLL_GSS_ERROR_GSS;
-       goto end;
-    }
-
-    if (lifetime == 0) {
-       major_status = GSS_S_CREDENTIALS_EXPIRED;
-       minor_status = 0; /* XXX */
-       ret = EDG_WLL_GSS_ERROR_GSS;
-       goto end;
-    }
-
-    if (name) {
-       major_status = gss_display_name(&minor_status, gss_name, &buffer, NULL);
-       if (GSS_ERROR(major_status)) {
-         ret = EDG_WLL_GSS_ERROR_GSS;
-         goto end;
-       }
-       *name = buffer.value;
-       memset(&buffer, 0, sizeof(buffer));
-    }
-    
-   *cred = gss_cred;
-   gss_cred = GSS_C_NO_CREDENTIAL;
-   ret = 0;
-
-end:
-   if (cert_file && key_file && proxy_file && strcmp(cert_file, key_file) != 0) {
-      destroy_proxy(proxy_file);
-      free(proxy_file);
-   }
-
-   if (gss_name != GSS_C_NO_NAME)
-      gss_release_name(&minor_status2, &gss_name);
-
-   if (gss_cred != GSS_C_NO_CREDENTIAL)
-      gss_release_cred(&minor_status2, &gss_cred);
-
-   if (GSS_ERROR(major_status)) {
-      if (gss_code) {
-        gss_code->major_status = major_status;
-        gss_code->minor_status = minor_status;
-      }
-      ret = EDG_WLL_GSS_ERROR_GSS;
-   }
-
-   return ret;
-}
-
-int 
-edg_wll_gss_connect(gss_cred_id_t cred, char const *hostname, int port,
-                   struct timeval *timeout, edg_wll_GssConnection *connection,
-                   edg_wll_GssStatus* gss_code)
-{
-   int sock, ret;
-   OM_uint32 maj_stat, min_stat, min_stat2, req_flags;
-   int context_established = 0;
-   gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
-   gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
-   gss_name_t server = GSS_C_NO_NAME;
-   gss_ctx_id_t context = GSS_C_NO_CONTEXT;
-   char *servername = NULL;
-
-   maj_stat = min_stat = min_stat2 = req_flags = 0;
-
-   /* GSI specific */
-   req_flags = GSS_C_GLOBUS_SSL_COMPATIBLE;
-
-   ret = do_connect(&sock, hostname, port, timeout);
-   if (ret)
-      return ret;
-
-   /* XXX find appropriate fqdn */
-   asprintf (&servername, "host@%s", hostname);
-   if (servername == NULL) {
-      errno = ENOMEM;
-      ret = EDG_WLL_GSS_ERROR_ERRNO;
-      goto end;
-   }
-   input_token.value = servername;
-   input_token.length = strlen(servername) + 1;
-
-   maj_stat = gss_import_name(&min_stat, &input_token,
-                             GSS_C_NT_HOSTBASED_SERVICE, &server);
-   if (GSS_ERROR(maj_stat)) {
-      ret = EDG_WLL_GSS_ERROR_GSS;
-      goto end;
-   }
-
-   free(servername);
-   memset(&input_token, 0, sizeof(input_token));
-
-   /* XXX if cred == GSS_C_NO_CREDENTIAL set the ANONYMOUS flag */
-
-   /* XXX prepsat na do {} while (maj_stat == CONT) a osetrit chyby*/
-   while (!context_established) {
-      /* XXX verify ret_flags match what was requested */
-      maj_stat = gss_init_sec_context(&min_stat, cred, &context,
-                                     GSS_C_NO_NAME, GSS_C_NO_OID,
-                                     req_flags | GSS_C_MUTUAL_FLAG,
-                                     0, GSS_C_NO_CHANNEL_BINDINGS,
-                                     &input_token, NULL, &output_token,
-                                     NULL, NULL);
-      if (input_token.length > 0) {
-        free(input_token.value);
-        input_token.length = 0;
-      }
-
-      if (output_token.length != 0) {
-        ret = send_token(sock, output_token.value, output_token.length, timeout);
-        gss_release_buffer(&min_stat2, &output_token);
-        if (ret)
-           goto end;
-      }
-
-      if (GSS_ERROR(maj_stat)) {
-        if (context != GSS_C_NO_CONTEXT) {
-           /* XXX send closing token to the friend */
-           gss_delete_sec_context(&min_stat2, &context, GSS_C_NO_BUFFER);
-           context = GSS_C_NO_CONTEXT;
-        }
-        ret = EDG_WLL_GSS_ERROR_GSS;
-        goto end;
-      }
-
-      if(maj_stat & GSS_S_CONTINUE_NEEDED) {
-        ret = recv_token(sock, &input_token.value, &input_token.length, timeout);
-        if (ret)
-           goto end;
-      } else
-        context_established = 1;
-   }
-
-   /* XXX check ret_flags matches to what was requested */
-
-   memset(connection, 0, sizeof(*connection));
-   connection->sock = sock;
-   connection->context = context;
-   servername = NULL;
-   ret = 0;
-
-end:
-   if (ret == EDG_WLL_GSS_ERROR_GSS && gss_code) {
-      gss_code->major_status = maj_stat;
-      gss_code->minor_status = min_stat;
-   }
-   if (server != GSS_C_NO_NAME)
-      gss_release_name(&min_stat2, &server);
-   if (servername == NULL)
-      free(servername);
-   if (ret)
-      close(sock);
-
-   return ret;
-}
-
-int
-edg_wll_gss_accept(gss_cred_id_t cred, int sock, struct timeval *timeout,
-                  edg_wll_GssConnection *connection, edg_wll_GssStatus* gss_code)
-{
-   OM_uint32 maj_stat, min_stat, min_stat2;
-   OM_uint32 ret_flags = 0;
-   gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
-   gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
-   gss_name_t client_name = GSS_C_NO_NAME;
-   gss_ctx_id_t context = GSS_C_NO_CONTEXT;
-   int ret;
-
-   maj_stat = min_stat = min_stat2 = 0;
-
-   /* GSI specific */
-   ret_flags = GSS_C_GLOBUS_SSL_COMPATIBLE;
-
-   do {
-      ret = recv_token(sock, &input_token.value, &input_token.length, timeout);
-      if (ret)
-        goto end;
-
-      maj_stat = gss_accept_sec_context(&min_stat, &context,
-                                       cred, &input_token,
-                                       GSS_C_NO_CHANNEL_BINDINGS,
-                                       &client_name, NULL, &output_token,
-                                       &ret_flags, NULL, NULL);
-      if (input_token.length > 0) {
-        free(input_token.value);
-        input_token.length = 0;
-      }
-
-      if (output_token.length) {
-        ret = send_token(sock, output_token.value, output_token.length, timeout);
-        gss_release_buffer(&min_stat2, &output_token);
-        if (ret)
-           goto end;
-      }
-   } while(maj_stat & GSS_S_CONTINUE_NEEDED);
-
-   if (GSS_ERROR(maj_stat)) {
-      if (context != GSS_C_NO_CONTEXT) {
-        /* XXX send closing token to the friend */
-        gss_delete_sec_context(&min_stat2, &context, GSS_C_NO_BUFFER);
-        context = GSS_C_NO_CONTEXT;
-      }
-      ret = EDG_WLL_GSS_ERROR_GSS;
-      goto end;
-   }
-
-   maj_stat = gss_display_name(&min_stat, client_name, &output_token, NULL);
-   if (GSS_ERROR(maj_stat)) {
-      /* XXX close context ??? */
-      ret = EDG_WLL_GSS_ERROR_GSS;
-      goto end;
-   }
-
-   memset(connection, 0, sizeof(*connection));
-   connection->sock = sock;
-   connection->context = context;
-   memset(&output_token, 0, sizeof(output_token.value));
-   ret = 0;
-
-end:
-   if (ret == EDG_WLL_GSS_ERROR_GSS && gss_code) {
-      gss_code->major_status = maj_stat;
-      gss_code->minor_status = min_stat;
-   }
-   if (client_name != GSS_C_NO_NAME)
-      gss_release_name(&min_stat2, &client_name);
-
-   return ret;
-}
-
-int
-edg_wll_gss_write(edg_wll_GssConnection *connection, const void *buf, size_t bufsize,
-                 struct timeval *timeout, edg_wll_GssStatus* gss_code)
-{
-   OM_uint32  maj_stat, min_stat;
-   gss_buffer_desc  input_token;
-   gss_buffer_desc  output_token;
-   int  ret;
-
-   input_token.value = (void*)buf;
-   input_token.length = bufsize;
-
-   maj_stat = gss_wrap (&min_stat, connection->context, 0, GSS_C_QOP_DEFAULT,
-                       &input_token, NULL, &output_token);
-   if (GSS_ERROR(maj_stat)) {
-      if (gss_code) {
-        gss_code->minor_status = min_stat;
-        gss_code->major_status = maj_stat;
-      }
-
-      return EDG_WLL_GSS_ERROR_GSS;
-   }
-
-   ret = send_token(connection->sock, output_token.value, output_token.length,
-                   timeout);
-   gss_release_buffer(&min_stat, &output_token);
-
-   return ret;
-}
-
-
-int
-edg_wll_gss_read(edg_wll_GssConnection *connection, void *buf, size_t bufsize,
-                struct timeval *timeout, edg_wll_GssStatus* gss_code)
-{
-   OM_uint32 maj_stat, min_stat;
-   gss_buffer_desc input_token;
-   gss_buffer_desc output_token;
-   int ret, i;
-
-   if (connection->bufsize > 0) {
-      size_t len;
-      
-      len = (connection->bufsize < bufsize) ? connection->bufsize : bufsize;
-      memcpy(buf, connection->buffer, len);
-      connection->bufsize -= len;
-      if (connection->bufsize > 0) {
-        for (i = 0; i < sizeof(connection->buffer) - len; i++)
-           connection->buffer[i] = connection->buffer[i+len];
-      }
-
-      return len;
-   }
-
-   do {
-      ret = recv_token(connection->sock, &input_token.value, &input_token.length,
-                      timeout);
-      if (ret)
-        /* XXX cleanup */
-        return ret;
-
-      maj_stat = gss_unwrap(&min_stat, connection->context, &input_token,
-                           &output_token, NULL, NULL);
-      if (GSS_ERROR(maj_stat)) {
-        /* XXX cleanup */
-        return EDG_WLL_GSS_ERROR_GSS;
-      }
-   } while (maj_stat == 0 && output_token.length == 0 && output_token.value == NULL);
-
-   if (output_token.length > bufsize) {
-      if (output_token.length - bufsize > sizeof(connection->buffer))
-        return EINVAL;
-      connection->bufsize = output_token.length - bufsize;
-      memcpy(connection->buffer, output_token.value + bufsize, connection->bufsize);
-      output_token.length = bufsize;
-   }
-   memcpy(buf, output_token.value, output_token.length);
-
-   return output_token.length;
-}
-
-int
-edg_wll_gss_read_full(edg_wll_GssConnection *connection, void *buf, 
-                             size_t bufsize, struct timeval *timeout, size_t *total,
-                     edg_wll_GssStatus* gss_code)
-{
-   int     len,i;
-   *total = 0;
-
-   if (connection->bufsize > 0) {
-      size_t len;
-
-
-      len = (connection->bufsize < bufsize) ? connection->bufsize : bufsize;
-      memcpy(buf, connection->buffer, len);
-      connection->bufsize -= len;
-      if (connection->bufsize > 0) {
-         for (i = 0; i < sizeof(connection->buffer) - len; i++)
-            connection->buffer[i] = connection->buffer[i+len];
-      }
-      *total = len;
-   }
-
-   while (*total < bufsize) {
-      len = edg_wll_gss_read(connection, buf+*total, bufsize-*total,
-                            timeout, gss_code);
-      if (len < 0) return len;
-      *total += len;
-   }
-
-   return 0;
-}
-
-int
-edg_wll_gss_write_full(edg_wll_GssConnection *connection, const void *buf,
-                       size_t bufsize, struct timeval *timeout, size_t *total,
-                      edg_wll_GssStatus* gss_code)
-{
-   return edg_wll_gss_write(connection, buf, bufsize, timeout, gss_code);
-}
-
-/* XXX: I'm afraid the contents of stuct stat is somewhat OS dependent */
-int
-edg_wll_gss_watch_creds(const char *proxy_file, time_t *proxy_mtime)
-{
-       struct stat     pstat;
-       int     reload = 0;
-
-       if (!proxy_file) return 0;
-       if (stat(proxy_file,&pstat)) return -1;
-
-       if (!*proxy_mtime) *proxy_mtime = pstat.st_mtime;
-
-       if (*proxy_mtime != pstat.st_mtime) {
-               *proxy_mtime = pstat.st_mtime;
-               reload = 1;
-       }
-
-       return reload;
-}
-
-int
-edg_wll_gss_close(edg_wll_GssConnection *con, struct timeval *timeout)
-{
-   OM_uint32 min_stat;
-
-   /* XXX if timeout is NULL use value of 120 secs */
-
-   if (con->context != GSS_C_NO_CONTEXT) {
-      gss_delete_sec_context(&min_stat, &con->context, GSS_C_NO_BUFFER);
-      /* XXX send the buffer (if any) to the peer. GSSAPI specs doesn't
-       * recommend sending it, though */
-
-      /* XXX can socket be open even if context == GSS_C_NO_CONTEXT) ? */
-      /* XXX ensure that edg_wll_GssConnection is created with sock set to -1 */
-      if (con->sock >= 0)
-        close(con->sock);
-   }
-   memset(con, 0, sizeof(*con));
-   con->context = GSS_C_NO_CONTEXT;
-   con->sock = -1;
-   return 0;
-}
-
-int
-edg_wll_gss_get_error(edg_wll_GssStatus *gss_err, const char *prefix, char **msg)
-{
-   OM_uint32 maj_stat, min_stat;
-   OM_uint32 msg_ctx = 0;
-   gss_buffer_desc maj_status_string = GSS_C_EMPTY_BUFFER;
-   gss_buffer_desc min_status_string = GSS_C_EMPTY_BUFFER;
-   char *str = NULL;
-   char *line, *tmp;
-
-   str = strdup(prefix);
-   do {
-      maj_stat = gss_display_status(&min_stat, gss_err->major_status,
-                                   GSS_C_GSS_CODE, GSS_C_NO_OID,
-                                   &msg_ctx, &maj_status_string);
-      if (GSS_ERROR(maj_stat))
-        break;
-
-      maj_stat = gss_display_status(&min_stat, gss_err->minor_status,
-                                   GSS_C_MECH_CODE, GSS_C_NULL_OID,
-                                   &msg_ctx, &min_status_string);
-      if (GSS_ERROR(maj_stat)) {
-        gss_release_buffer(&min_stat, &maj_status_string);
-        break;
-      }
-
-      asprintf(&line, ": %s (%s)", (char *)maj_status_string.value,
-              (char *)min_status_string.value);
-      gss_release_buffer(&min_stat, &maj_status_string);
-      gss_release_buffer(&min_stat, &min_status_string);
-
-      tmp = realloc(str, strlen(str) + strlen(line) + 1);
-      if (tmp == NULL) {
-         /* abort() ? */
-        free(line);
-        free(str);
-        str = "WARNING: Not enough memory to produce error message";
-        break;
-      }
-      str = tmp;
-      strcat(str, line);
-      free(line);
-   } while (!GSS_ERROR(maj_stat) && msg_ctx != 0);
-
-   *msg = str;
-   return 0;
-}
-
-int
-edg_wll_gss_oid_equal(const gss_OID a, const gss_OID b)
-{
-   if (a == b)
-      return 1;
-   else {
-      if (a == GSS_C_NO_OID || b == GSS_C_NO_OID || a->length != b->length)
-        return 0;
-      else
-        return (memcmp(a->elements, b->elements, a->length) == 0);
-   }
-}
-
-int 
-edg_wll_gss_reject(int sock)
-{
-   /* XXX is it possible to cut & paste edg_wll_ssl_reject() ? */
-   return 0;
-}
diff --git a/org.glite.lb.common/src/mini_http.c b/org.glite.lb.common/src/mini_http.c

deleted file mode 100644 (file)

index 5f4f13a..0000000
--- a/org.glite.lb.common/src/mini_http.c
+++ /dev/null
@@ -1,218 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <signal.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <syslog.h>
-
-#include "globus_config.h"
-
-#include "mini_http.h"
-#include "lb_gss.h"
-#include "context-int.h"
-
-#define min(x,y)       ((x) < (y) ? (x) : (y))
-#define CONTENT_LENGTH "Content-Length:"
-
-edg_wll_ErrorCode edg_wll_http_recv(edg_wll_Context ctx,char **firstOut,char ***hdrOut,char **bodyOut)
-{
-       char    **hdr = NULL,*first = NULL,*body = NULL;
-       enum    { FIRST, HEAD, BODY, DONE }     pstat = FIRST;
-       int     len, nhdr = 0,rdmore = 0,clen = 0,blen = 0;
-       int     sock;
-       edg_wll_GssStatus gss_code;
-
-#define bshift(shift) {\
-       memmove(ctx->connPool[ctx->connToUse].buf,ctx->connPool[ctx->connToUse].buf+(shift),ctx->connPool[ctx->connToUse].bufUse-(shift));\
-       ctx->connPool[ctx->connToUse].bufUse -= (shift);\
-}
-       edg_wll_ResetError(ctx);
-
-       if (ctx->connPool[ctx->connToUse].gss.context != GSS_C_NO_CONTEXT)
-               sock = ctx->connPool[ctx->connToUse].gss.sock;
-       else {
-               edg_wll_SetError(ctx,ENOTCONN,NULL);
-               goto error;
-       }
-
-       if (!ctx->connPool[ctx->connToUse].buf) ctx->connPool[ctx->connToUse].buf = malloc(ctx->connPool[ctx->connToUse].bufSize = BUFSIZ);
-
-       do {
-               len = edg_wll_gss_read(&ctx->connPool[ctx->connToUse].gss,
-                       ctx->connPool[ctx->connToUse].buf+ctx->connPool[ctx->connToUse].bufUse,ctx->connPool[ctx->connToUse].bufSize-ctx->connPool[ctx->connToUse].bufUse,&ctx->p_tmp_timeout, &gss_code);
-
-               switch (len) {
-                       case EDG_WLL_GSS_OK:
-                               break;
-                       case EDG_WLL_GSS_ERROR_GSS:
-                               edg_wll_SetErrorGss(ctx, "receving HTTP request", &gss_code);
-                               goto error;
-                       case EDG_WLL_GSS_ERROR_ERRNO:
-                               edg_wll_SetError(ctx,errno,"edg_wll_gss_read()");
-                               goto error;
-                       case EDG_WLL_GSS_ERROR_TIMEOUT:
-                               edg_wll_SetError(ctx,ETIMEDOUT,NULL);
-                               goto error; 
-                       case EDG_WLL_GSS_ERROR_EOF:
-                               edg_wll_SetError(ctx,ENOTCONN,NULL);
-                               goto error; 
-                       /* default: fallthrough */
-               }
-
-
-               ctx->connPool[ctx->connToUse].bufUse += len;
-               rdmore = 0;
-
-               while (!rdmore && pstat != DONE) switch (pstat) {
-                       char    *cr; 
-
-                       case FIRST:
-                               if ((cr = memchr(ctx->connPool[ctx->connToUse].buf,'\r',ctx->connPool[ctx->connToUse].bufUse)) &&
-                                       ctx->connPool[ctx->connToUse].bufUse >= cr-ctx->connPool[ctx->connToUse].buf+2 && cr[1] == '\n')
-                               {
-                                       *cr = 0;
-                                       first = strdup(ctx->connPool[ctx->connToUse].buf);
-                                       bshift(cr-ctx->connPool[ctx->connToUse].buf+2);
-                                       pstat = HEAD;
-                               } else rdmore = 1;
-                               break;
-                       case HEAD:
-                               if ((cr = memchr(ctx->connPool[ctx->connToUse].buf,'\r',ctx->connPool[ctx->connToUse].bufUse)) &&
-                                       ctx->connPool[ctx->connToUse].bufUse >= cr-ctx->connPool[ctx->connToUse].buf+2 && cr[1] == '\n')
-                               {
-                                       if (cr == ctx->connPool[ctx->connToUse].buf) {
-                                               bshift(2);
-                                               pstat = clen ? BODY : DONE;
-                                               if (clen) body = malloc(clen+1);
-                                               break;
-                                       }
-
-                                       *cr = 0;
-                                       hdr = realloc(hdr,(nhdr+2) * sizeof(*hdr));
-                                       hdr[nhdr] = strdup(ctx->connPool[ctx->connToUse].buf);
-                                       hdr[++nhdr] = NULL;
-
-                                       if (!strncasecmp(ctx->connPool[ctx->connToUse].buf,CONTENT_LENGTH,sizeof(CONTENT_LENGTH)-1))
-                                               clen = atoi(ctx->connPool[ctx->connToUse].buf+sizeof(CONTENT_LENGTH)-1);
-       
-                                       bshift(cr-ctx->connPool[ctx->connToUse].buf+2);
-                               } else rdmore = 1;
-                               break;
-                       case BODY:
-                               if (ctx->connPool[ctx->connToUse].bufUse) {
-                                       int     m = min(ctx->connPool[ctx->connToUse].bufUse,clen-blen);
-                                       memcpy(body+blen,ctx->connPool[ctx->connToUse].buf,m);
-                                       blen += m;
-                                       bshift(m);
-                               }
-                               rdmore = 1;
-                               if (blen == clen) {
-                                       pstat = DONE;
-                                       body[blen] = 0;
-                               }
-                               break;
-                       default:
-                               break;
-               }
-       } while (pstat != DONE);
-
-error:
-       if (edg_wll_Error(ctx,NULL,NULL)) {
-               if (hdr) {
-                       char    **h;
-                       for (h = hdr; *h; h++) free(*h);
-                       free(hdr);
-               }
-               free(first);
-               free(body);
-       } else {
-               if (firstOut) *firstOut = first; else free(first);
-               if (hdrOut) *hdrOut = hdr; 
-               else if (hdr) {
-                       char    **h;
-                       for (h = hdr; *h; h++) free(*h);
-                       free(hdr);
-               }
-               if (bodyOut) *bodyOut = body; else free(body);
-       }
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static int real_write(edg_wll_Context ctx, edg_wll_GssConnection *con,const char *data,int len)
-{
-       int     total = 0;
-       struct sigaction        sa,osa;
-       edg_wll_GssStatus       gss_code;
-       int     ret;
-
-       memset(&sa,0,sizeof(sa)); assert(sa.sa_handler == NULL);
-       sa.sa_handler = SIG_IGN;
-       sigaction(SIGPIPE,&sa,&osa);
-
-       ret = edg_wll_gss_write_full(con, (void*)data, len, &ctx->p_tmp_timeout,
-                                    &total, &gss_code);
-       sigaction(SIGPIPE,&osa,NULL);
-
-       switch(ret) {
-          case EDG_WLL_GSS_OK:
-             return 0;
-          case EDG_WLL_GSS_ERROR_EOF:
-             errno = ENOTCONN;
-             return -1;
-          case EDG_WLL_GSS_ERROR_TIMEOUT:
-             errno = ETIMEDOUT;
-             return -1;
-          case EDG_WLL_GSS_ERROR_ERRNO:
-             if (errno == EPIPE) errno = ENOTCONN;
-             return -1;
-          case EDG_WLL_GSS_ERROR_GSS:
-             errno = EDG_WLL_ERROR_GSS;
-             return -1;
-          default:
-             /* XXX DK: */
-             errno = ENOTCONN;
-             return -1;
-       }
-}
-
-edg_wll_ErrorCode edg_wll_http_send(edg_wll_Context ctx,const char *first,const char * const *head,const char *body)
-{
-       const char* const *h;
-       int     len = 0, blen;
-
-       edg_wll_ResetError(ctx);
-
-       if (ctx->connPool[ctx->connToUse].gss.context == GSS_C_NO_CONTEXT)
-          return edg_wll_SetError(ctx,ENOTCONN,NULL);
-
-       if (real_write(ctx,&ctx->connPool[ctx->connToUse].gss,first,strlen(first)) < 0 ||
-               real_write(ctx,&ctx->connPool[ctx->connToUse].gss,"\r\n",2) < 0) 
-               return edg_wll_SetError(ctx,errno,"edg_wll_http_send()");
-
-       if (head) for (h=head; *h; h++) 
-               if (real_write(ctx,&ctx->connPool[ctx->connToUse].gss,*h,strlen(*h)) < 0 ||
-                       real_write(ctx,&ctx->connPool[ctx->connToUse].gss,"\r\n",2) < 0) 
-                       return edg_wll_SetError(ctx,errno,"edg_wll_http_send()");
-
-       if (body) {
-               char    buf[100];
-
-               len = strlen(body);
-               blen = sprintf(buf,CONTENT_LENGTH " %d\r\n",len);
-               if (real_write(ctx,&ctx->connPool[ctx->connToUse].gss,buf,blen) < 0) 
-                       return edg_wll_SetError(ctx,errno,"edg_wll_http_send()");
-       }
-
-       if (real_write(ctx,&ctx->connPool[ctx->connToUse].gss,"\r\n",2) < 0) 
-               return edg_wll_SetError(ctx,errno,"edg_wll_http_send()");
-       if (body && real_write(ctx,&ctx->connPool[ctx->connToUse].gss,body,len) < 0)  
-               return edg_wll_SetError(ctx,errno,"edg_wll_http_send()");
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.common/src/notifid.c b/org.glite.lb.common/src/notifid.c

deleted file mode 100644 (file)

index 8a1d5fe..0000000
--- a/org.glite.lb.common/src/notifid.c
+++ /dev/null
@@ -1,88 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/notifid.h"
-
-int edg_wll_NotifIdParse(const char *s,edg_wll_NotifId *n)
-{
-       edg_wlc_JobId   j;
-       int             ret = edg_wlc_JobIdParse(s,&j);
-
-       if (!ret) *n = (edg_wll_NotifId) j; 
-       return ret;
-}
-
-char* edg_wll_NotifIdUnparse(const edg_wll_NotifId n)
-{
-       return edg_wlc_JobIdUnparse((edg_wlc_JobId) n);
-}
-
-int edg_wll_NotifIdCreate(const char *server,int port,edg_wll_NotifId *n)
-{
-       edg_wlc_JobId   j,j2;
-       int     ret = edg_wlc_JobIdCreate(server,port,&j);
-       char    *u,*u2;
-
-       if (!ret) {
-               u = edg_wlc_JobIdGetUnique(j);
-               asprintf(&u2,"NOTIF:%s",u);
-               free(u);
-               ret = edg_wlc_JobIdRecreate(server,port,u2,&j2);
-               free(u2);
-               edg_wlc_JobIdFree(j);
-               if (!ret) *n = (edg_wll_NotifId) j2;
-       }
-
-       return ret;
-}
-
-int edg_wll_NotifIdSetUnique(edg_wll_NotifId *n, const char *un)
-{
-       char               *aux, *srv;
-       int                             ret;
-       unsigned int    port;
-
-
-       asprintf(&aux, "NOTIF:%s", un);
-       if ( !aux )
-               return -1;
-
-       edg_wll_NotifIdGetServerParts(*((edg_wlc_JobId *)n), &srv, &port);
-       ret = edg_wlc_JobIdRecreate(srv, port, aux, (edg_wlc_JobId *)n);
-       free(aux);
-       free(srv);
-
-       return ret;
-}
-
-void edg_wll_NotifIdFree(edg_wll_NotifId n)
-{
-       edg_wlc_JobIdFree((edg_wlc_JobId) n);
-}
-
-void edg_wll_NotifIdGetServerParts(const edg_wll_NotifId notifId, char **srvName, unsigned int *srvPort)
-{
-       edg_wlc_JobIdGetServerParts((edg_wlc_JobId) notifId, srvName, srvPort);
-}
-
-char* edg_wll_NotifIdGetUnique(const edg_wll_NotifId notifid)
-{
-       char       *id = edg_wlc_JobIdGetUnique((edg_wlc_JobId)notifid);
-
-       if ( id )
-       {
-               char *s = strchr(id, ':');
-
-               if ( s )
-               {
-               char *ret = strdup(s+1);
-                       free(id);
-                       return ret;
-               }
-       }
-
-       free(id);
-       return NULL;
-}
diff --git a/org.glite.lb.common/src/param.c b/org.glite.lb.common/src/param.c

deleted file mode 100644 (file)

index 0f4ba51..0000000
--- a/org.glite.lb.common/src/param.c
+++ /dev/null
@@ -1,429 +0,0 @@
-#include <string.h>
-#include <stdarg.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <errno.h>
-
-#include <globus_common.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/notification.h"
-#include "context-int.h"
-#include "log_proto.h"
-
-
-/* XXX: must match edg_wll_ContextParam */
-static const char *myenv[] = {
-       "GLOBUS_HOSTNAME",
-       NULL,
-       NULL,
-       NULL,
-       "EDG_WL_LOG_DESTINATION",
-       "EDG_WL_LOG_DESTINATION",
-       "EDG_WL_LOG_TIMEOUT",
-       "EDG_WL_LOG_SYNC_TIMEOUT",
-       "EDG_WL_QUERY_SERVER",
-       "EDG_WL_QUERY_SERVER",
-       "EDG_WL_QUERY_SERVER_OVERRIDE",
-       "EDG_WL_QUERY_TIMEOUT",
-       "EDG_WL_QUERY_JOBS_LIMIT",
-       "EDG_WL_QUERY_EVENTS_LIMIT",
-       "EDG_WL_QUERY_RESULTS",
-       "EDG_WL_QUERY_CONNECTIONS",
-       "EDG_WL_NOTIF_SERVER",
-       "EDG_WL_NOTIF_SERVER",
-       "EDG_WL_NOTIF_TIMEOUT",
-/* don't care about X509_USER_*, GSI looks at them anyway */
-       NULL,
-       NULL,
-       NULL,
-};
-
-/* XXX: does not parse URL, just hostname[:port] */
-
-static int extract_port(edg_wll_ContextParam param,int dflt)
-{
-       char    *p = NULL,*s = NULL;
-       if (myenv[param]) {
-               s = getenv(myenv[param]);
-               if (s) p = strchr(s,':');
-       }
-       return  p ? atoi(p+1) : dflt;
-}
-
-static int extract_num(edg_wll_ContextParam param,int dflt)
-{
-       if (myenv[param]) {
-               char *s = getenv(myenv[param]);
-               if (s) return(atoi(s));
-       }
-       return dflt;
-}
-
-static char *extract_host(edg_wll_ContextParam param,const char *dflt)
-{
-       char    *p,*s = NULL;
-
-       if (myenv[param]) s = getenv(myenv[param]);
-       if (!s && !dflt) return NULL;
-       s = strdup(s?s:dflt),
-       p = strchr(s,':');
-       if (p) *p = 0;
-       return s;
-}
-
-static void extract_time(edg_wll_ContextParam param,double dflt,struct timeval *t)
-{
-       char    *s = NULL;
-       double  d;
-
-       if (myenv[param]) s = getenv(myenv[param]);
-       d = s ? atof(s) : dflt;
-       t->tv_sec = (long) d;
-       t->tv_usec = (long) ((d-t->tv_sec)*1e6);
-}
-
-static char *extract_split(edg_wll_ContextParam param,char by,int index)
-{
-       int     i;
-       char    *s,*e;
-
-       if (!myenv[param]) return NULL;
-       if (!(s = getenv(myenv[param]))) return NULL;
-       for (i=0; i<index && (s=strchr(s,by));i++) s++;
-       return i==index ? ( (e = strchr(s,by)) ? strndup(s,e-s) : strdup(s))
-                       : NULL;
-}
-
-
-int edg_wll_SetParamString(edg_wll_Context ctx,edg_wll_ContextParam param,const char *val)
-{
-       char    hn[200];
-
-       switch (param) {
-               case EDG_WLL_PARAM_HOST:             
-                       globus_libc_gethostname(hn,sizeof hn);
-                       free(ctx->p_host);
-                       ctx->p_host = val ? strdup(val) : extract_host(param,hn);
-                       break;
-               case EDG_WLL_PARAM_INSTANCE:         
-                       free(ctx->p_instance);
-                       ctx->p_instance = val ? strdup(val) : extract_split(param,'/',1);
-                       break;
-               case EDG_WLL_PARAM_DESTINATION:      
-                       free(ctx->p_destination);
-                       ctx->p_destination = val ? strdup(val) : extract_host(param,EDG_WLL_LOG_HOST_DEFAULT);
-                       break;
-               case EDG_WLL_PARAM_QUERY_SERVER:     
-                       free(ctx->p_query_server);
-                       ctx->p_query_server = val ? strdup(val) : extract_host(param,NULL);
-                       break;
-               case EDG_WLL_PARAM_NOTIF_SERVER:     
-                       free(ctx->p_notif_server);
-                       ctx->p_notif_server = val ? strdup(val) : extract_host(param,NULL);
-                       break;
-               case EDG_WLL_PARAM_X509_PROXY:       
-                       free(ctx->p_proxy_filename);
-                       ctx->p_proxy_filename = val ? strdup(val) : NULL;
-                       break;
-               case EDG_WLL_PARAM_X509_KEY:         
-                       free(ctx->p_key_filename);
-                       ctx->p_key_filename = val ? strdup(val) : NULL;
-                       break;
-               case EDG_WLL_PARAM_X509_CERT:        
-                       free(ctx->p_cert_filename);
-                       ctx->p_cert_filename = val ? strdup(val) : NULL;
-                       break;
-               case EDG_WLL_PARAM_QUERY_SERVER_OVERRIDE:
-                       if (!val) val = getenv(myenv[param]);
-                       if (!val) val = "no";
-                       ctx->p_query_server_override = !strcasecmp(val,"yes");
-                       break;
-               default:
-                       return edg_wll_SetError(ctx,EINVAL,"unknown parameter");
-       }
-       return edg_wll_ResetError(ctx);
-}
-
-int edg_wll_SetParamInt(edg_wll_Context ctx,edg_wll_ContextParam param,int val)
-{
-       switch (param) {
-               case EDG_WLL_PARAM_LEVEL:
-                       ctx->p_level = val ? val : EDG_WLL_LEVEL_SYSTEM;
-                       break;
-               case EDG_WLL_PARAM_DESTINATION_PORT:
-                       ctx->p_dest_port = val ? val : extract_port(param,EDG_WLL_LOG_PORT_DEFAULT);
-                       break;
-               case EDG_WLL_PARAM_QUERY_SERVER_PORT:
-                       ctx->p_query_server_port = val ? val :
-                               extract_port(param,GLITE_WMSC_JOBID_DEFAULT_PORT);;
-                       break;
-               case EDG_WLL_PARAM_NOTIF_SERVER_PORT:
-                       ctx->p_notif_server_port = val ? val :
-                               extract_port(param,0);;
-                       // XXX: when default port is known, put it here
-                       break;
-               case EDG_WLL_PARAM_QUERY_JOBS_LIMIT:
-                       ctx->p_query_jobs_limit = val ? val :
-                               extract_num(param,0);
-                       break;
-               case EDG_WLL_PARAM_QUERY_EVENTS_LIMIT:
-                       ctx->p_query_events_limit = val ? val :
-                               extract_num(param,0);
-                       break;
-               case EDG_WLL_PARAM_QUERY_RESULTS:
-                       if (val) {
-                               if (val <= EDG_WLL_QUERYRES_UNDEF || val >= EDG_WLL_QUERYRES__LAST)
-                                       return edg_wll_SetError(ctx,EINVAL,"Query result parameter value out of range");
-
-                               ctx->p_query_results = val;
-                       }
-                       else {
-                               char    *s = extract_split(param,'/',0);
-                               if (s) {
-                                       val = edg_wll_StringToQResult(s);
-                                       if (!val) return edg_wll_SetError(ctx,EINVAL,"can't parse query result parameter name");
-                                       ctx->p_query_results = val;
-                                       free(s);
-                               }
-                               return edg_wll_SetError(ctx,EINVAL,"can't parse query result parameter name");
-                       }
-                       break;
-               case EDG_WLL_PARAM_QUERY_CONNECTIONS:
-                       {
-                               char *s = getenv(myenv[param]);
-                               
-                               if (!val && s) val = atoi(s);
-                               ctx->poolSize = val ? val : EDG_WLL_LOG_CONNECTIONS_DEFAULT;
-                       }
-                       break;
-               case EDG_WLL_PARAM_SOURCE:           
-                       if (val) {
-                               if (val <= EDG_WLL_SOURCE_NONE || val >= EDG_WLL_SOURCE__LAST)
-                                       return edg_wll_SetError(ctx,EINVAL,"Source out of range");
-
-                               ctx->p_source = val;
-                       }
-                       else {
-                               char    *s = extract_split(param,'/',0);
-                               if (s) {
-                                       val = edg_wll_StringToSource(s);
-                                       if (!val) return edg_wll_SetError(ctx,EINVAL,"can't parse source name");
-                                       ctx->p_source = val;
-                                       free(s);
-                               }
-                               return edg_wll_SetError(ctx,EINVAL,"can't parse source name");
-                       }
-                       break;
-               default:
-                       return edg_wll_SetError(ctx,EINVAL,"unknown parameter");
-       }
-       return edg_wll_ResetError(ctx);
-}
-
-int edg_wll_SetParamTime(edg_wll_Context ctx,edg_wll_ContextParam param,const struct timeval *val)
-{
-       switch (param) {
-               case EDG_WLL_PARAM_LOG_TIMEOUT:      
-/* XXX: check also if val is not grater than EDG_WLL_LOG_TIMEOUT_MAX */
-                       if (val) memcpy(&ctx->p_log_timeout,val,sizeof *val);
-                       else extract_time(param,EDG_WLL_LOG_TIMEOUT_DEFAULT,&ctx->p_log_timeout);
-                       break;
-               case EDG_WLL_PARAM_LOG_SYNC_TIMEOUT: 
-/* XXX: check also if val is not grater than EDG_WLL_LOG_SYNC_TIMEOUT_MAX */
-                       if (val) memcpy(&ctx->p_sync_timeout,val,sizeof *val);
-                       else extract_time(param,EDG_WLL_LOG_SYNC_TIMEOUT_DEFAULT,&ctx->p_sync_timeout);
-                       break;
-               case EDG_WLL_PARAM_QUERY_TIMEOUT:    
-/* XXX: check also if val is not grater than EDG_WLL_QUERY_TIMEOUT_MAX */
-                       if (val) memcpy(&ctx->p_query_timeout,val,sizeof *val);
-                       else extract_time(param,EDG_WLL_QUERY_TIMEOUT_DEFAULT,&ctx->p_query_timeout);
-                       break;
-               case EDG_WLL_PARAM_NOTIF_TIMEOUT:    
-/* XXX: check also if val is not grater than EDG_WLL_NOTIF_TIMEOUT_MAX */
-                       if (val) memcpy(&ctx->p_notif_timeout,val,sizeof *val);
-                       else extract_time(param,EDG_WLL_NOTIF_TIMEOUT_DEFAULT,&ctx->p_notif_timeout);
-                       break;
-               default:
-                       return edg_wll_SetError(ctx,EINVAL,"unknown parameter");
-       }
-       return edg_wll_ResetError(ctx);
-}
-
-int edg_wll_SetParam(edg_wll_Context ctx,edg_wll_ContextParam param,...)
-{
-       va_list ap;
-
-       va_start(ap,param);
-       switch (param) {
-               case EDG_WLL_PARAM_LEVEL:            
-               case EDG_WLL_PARAM_DESTINATION_PORT: 
-               case EDG_WLL_PARAM_QUERY_SERVER_PORT:
-               case EDG_WLL_PARAM_NOTIF_SERVER_PORT:
-               case EDG_WLL_PARAM_QUERY_JOBS_LIMIT:      
-               case EDG_WLL_PARAM_QUERY_EVENTS_LIMIT:      
-               case EDG_WLL_PARAM_QUERY_RESULTS:
-               case EDG_WLL_PARAM_QUERY_CONNECTIONS:
-               case EDG_WLL_PARAM_SOURCE:           
-                       return edg_wll_SetParamInt(ctx,param,va_arg(ap,int));
-               case EDG_WLL_PARAM_HOST:             
-               case EDG_WLL_PARAM_INSTANCE:         
-               case EDG_WLL_PARAM_DESTINATION:      
-               case EDG_WLL_PARAM_QUERY_SERVER:     
-               case EDG_WLL_PARAM_NOTIF_SERVER:     
-               case EDG_WLL_PARAM_QUERY_SERVER_OVERRIDE:
-               case EDG_WLL_PARAM_X509_PROXY:       
-               case EDG_WLL_PARAM_X509_KEY:         
-               case EDG_WLL_PARAM_X509_CERT:        
-                       return edg_wll_SetParamString(ctx,param,va_arg(ap,char *));
-               case EDG_WLL_PARAM_LOG_TIMEOUT:      
-               case EDG_WLL_PARAM_LOG_SYNC_TIMEOUT: 
-               case EDG_WLL_PARAM_QUERY_TIMEOUT:    
-               case EDG_WLL_PARAM_NOTIF_TIMEOUT:    
-                       return edg_wll_SetParamTime(ctx,param,va_arg(ap,struct timeval *));
-               default: 
-                       return edg_wll_SetError(ctx,EINVAL,"unknown parameter");
-       }
-}
-
-int edg_wll_GetParam(edg_wll_Context ctx,edg_wll_ContextParam param,...)
-{
-       va_list ap;
-       int     *p_int;
-       char    **p_string;
-       struct timeval  *p_tv;
-
-       edg_wll_ResetError(ctx);
-
-       va_start(ap,param);
-       switch (param) {
-               case EDG_WLL_PARAM_LEVEL:            
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_level;
-                       break;
-               case EDG_WLL_PARAM_DESTINATION_PORT: 
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_dest_port;
-                       break;
-               case EDG_WLL_PARAM_QUERY_SERVER_PORT:
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_query_server_port;
-                       break;
-               case EDG_WLL_PARAM_NOTIF_SERVER_PORT:
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_notif_server_port;
-                       break;
-               case EDG_WLL_PARAM_QUERY_JOBS_LIMIT:      
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_query_jobs_limit;
-                       break;
-               case EDG_WLL_PARAM_QUERY_EVENTS_LIMIT:      
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_query_events_limit;
-                       break;
-               case EDG_WLL_PARAM_QUERY_RESULTS:
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_query_results;
-                       break;
-               case EDG_WLL_PARAM_QUERY_CONNECTIONS:
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->poolSize;
-                       break;
-               case EDG_WLL_PARAM_SOURCE:           
-                       p_int = va_arg(ap, int *);
-                       *p_int = ctx->p_source;
-                       break;
-
-#define estrdup(x) ((x) ? strdup(x) : x)
-
-               case EDG_WLL_PARAM_HOST:             
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_host);
-                       break;
-               case EDG_WLL_PARAM_INSTANCE:         
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_instance);
-                       break;
-               case EDG_WLL_PARAM_DESTINATION:      
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_destination);
-                       break;
-               case EDG_WLL_PARAM_QUERY_SERVER:     
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_query_server);
-                       break;
-               case EDG_WLL_PARAM_NOTIF_SERVER:     
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_notif_server);
-                       break;
-               case EDG_WLL_PARAM_QUERY_SERVER_OVERRIDE:
-                       p_string = va_arg(ap, char **);
-                       *p_string = strdup(ctx->p_query_server_override ? "yes" : "no");
-                       break;
-               case EDG_WLL_PARAM_X509_PROXY:       
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_proxy_filename);
-                       break;
-               case EDG_WLL_PARAM_X509_KEY:         
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_key_filename);
-                       break;
-               case EDG_WLL_PARAM_X509_CERT:        
-                       p_string = va_arg(ap, char **);
-                       *p_string = estrdup(ctx->p_cert_filename);
-                       break;
-
-               case EDG_WLL_PARAM_LOG_TIMEOUT:      
-                       p_tv = va_arg(ap,struct timeval *);
-                       *p_tv = ctx->p_log_timeout;
-                       break;
-               case EDG_WLL_PARAM_LOG_SYNC_TIMEOUT: 
-                       p_tv = va_arg(ap,struct timeval *);
-                       *p_tv = ctx->p_sync_timeout;
-                       break;
-               case EDG_WLL_PARAM_QUERY_TIMEOUT:    
-                       p_tv = va_arg(ap,struct timeval *);
-                       *p_tv = ctx->p_query_timeout;
-                       break;
-               case EDG_WLL_PARAM_NOTIF_TIMEOUT:    
-                       p_tv = va_arg(ap,struct timeval *);
-                       *p_tv = ctx->p_notif_timeout;
-                       break;
-
-               default: 
-                       return edg_wll_SetError(ctx, EINVAL, "unknown parameter");
-                       break;
-       }
-       va_end(ap);
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-#if 0
-/* only for reference */
-edg_wll_ErrorCode edg_wll_SetLoggingParams(edg_wll_Context ctx, 
-                               const char      *jobid,
-                               const char      *service,
-                               const char      *hostname,
-                               const char      *instance,
-                               enum edg_wll_Level      level,
-                               const char      *proxy_filename,
-                               const char      *cert_filename,
-                               const char      *key_filename)
-{
-       edg_wll_ResetError(ctx);
-
-       if (jobid != NULL) ctx->p_jobid = strdup(jobid);
-       if (service != NULL) ctx->p_service = strdup(service);
-       if (hostname != NULL) ctx->p_hostname = strdup(hostname);
-       if (instance != NULL) ctx->p_instance = strdup(instance);
-
-        ctx->p_level = level;
-
-       if (proxy_filename != NULL) ctx->p_proxy_filename = strdup(proxy_filename);
-       if (cert_filename != NULL) ctx->p_cert_filename = strdup(cert_filename);
-       if (key_filename != NULL) ctx->p_key_filename = strdup(key_filename);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-#endif
diff --git a/org.glite.lb.common/src/query_rec.c b/org.glite.lb.common/src/query_rec.c

deleted file mode 100644 (file)

index 6abeb4f..0000000
--- a/org.glite.lb.common/src/query_rec.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/consumer.h"
-
-/*
- * edg_wll_QueryRec manipulation routines
- */
-
-void edg_wll_QueryRecFree(edg_wll_QueryRec *prec)
-{
-       if (prec == NULL) {
-               fprintf(stderr, "Error: edg_wll_QueryRecFree called with NULL parameter\n");
-               return;
-       }
-       switch (prec->attr) {
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-                       free(prec->attr_id.tag);
-               case EDG_WLL_QUERY_ATTR_OWNER: 
-               case EDG_WLL_QUERY_ATTR_LOCATION:
-               case EDG_WLL_QUERY_ATTR_DESTINATION:
-               case EDG_WLL_QUERY_ATTR_HOST:
-               case EDG_WLL_QUERY_ATTR_INSTANCE:
-                       if ( prec->value.c ) free(prec->value.c);
-                       break;
-               case EDG_WLL_QUERY_ATTR_JOBID:
-               case EDG_WLL_QUERY_ATTR_PARENT:
-                       edg_wlc_JobIdFree(prec->value.j);
-                       break;
-               case EDG_WLL_QUERY_ATTR_STATUS:
-               case EDG_WLL_QUERY_ATTR_DONECODE:
-               case EDG_WLL_QUERY_ATTR_LEVEL:
-               case EDG_WLL_QUERY_ATTR_SOURCE:
-               case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-               case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       /* do nothing */
-                       break;
-               default:
-                       fprintf(stderr,"Error(edg_wll_QueryRecFree): unknown edg_wll_QueryRec.attr=%d\n", prec->attr);
-                       break;
-       }
-}
-
diff --git a/org.glite.lb.common/src/status.c.T b/org.glite.lb.common/src/status.c.T

deleted file mode 100644 (file)

index 301c96b..0000000
--- a/org.glite.lb.common/src/status.c.T
+++ /dev/null
@@ -1,172 +0,0 @@
-#ident "$Header$"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "glite/lb/consumer.h"
-
-static const struct timeval null_timeval = {0,0};
-
-
-void edg_wll_FreeStatus(edg_wll_JobStat *stat)
-{ 
-  if (stat) {
-       int     i;
-    
-@@@{
-        selectType $status '_common_';
-        for (getFieldsOrdered $status) {
-                my $f = selectField $status $_;
-                my $ft = $f->{type};
-                if ($ft eq 'jobid') {
-                        gen "\tedg_wlc_JobIdFree(stat->$_);\n";
-                }
-                if ($ft eq 'string') {
-                        gen "\tif (stat->$_ != NULL )    \tfree(stat->$_);\n";
-                }
-                if ($ft eq 'intlist') {
-                        gen "\tif (stat->$_ != NULL )    \tfree(stat->$_);\n";
-                }
-                if ($ft eq 'strlist') {
-                        gen "\tif (stat->$_ != NULL ) {\n";
-                       gen "\t\tfor (i=0; stat->$_\[i]; i++)\n";
-                       gen "\t\t\tfree(stat->$_\[i]);\n";
-                       gen "\t\tfree(stat->$_);\n";
-                       gen "\t}\n";
-                }
-                if ($ft eq 'taglist') {
-                        gen "\tif (stat->$_ != NULL ) {\n";
-                       gen "\t\tfor (i=0; stat->$_\[i].tag; i++) {\n";
-                       gen "\t\t\tfree(stat->$_\[i].tag);\n";
-                       gen "\t\t\tfree(stat->$_\[i].value);\n";
-                       gen "\t\t}\n";
-                       gen "\t\tfree(stat->$_);\n";
-                       gen "\t}\n";
-                }
-                if ($ft eq 'stslist') {
-                        gen "\tif (stat->$_ != NULL ) {\n";
-                       gen "\t\tfor (i=0; stat->$_\[i].state; i++)\n";
-                       gen "\t\t\tedg_wll_FreeStatus(&stat->$_\[i]);\n";
-                       gen "\t\tfree(stat->$_);\n";
-                       gen "\t}\n";
-                }
-
-        }
-@@@}
-    
-  }
-}
-
-edg_wll_JobStat *edg_wll_CpyStatus(const edg_wll_JobStat *src, edg_wll_JobStat *dest)
-{
-       int     i;
-
-
-       if ( !src || !dest )
-               return NULL;
-
-       edg_wll_InitStatus(dest);
-       dest->state = src->state;
-@@@{
-               selectType $status '_common_';
-               for (getFieldsOrdered $status) {
-                       my $f = selectField $status $_;
-                       my $ft = $f->{type};
-                       if ($ft eq 'jobid') {
-                               gen "\tif ( edg_wlc_JobIdDup(src->$_, &(dest->$_)) ) goto err;\n";
-                       }
-                       if ($ft eq 'string') {
-                               gen "\tif ( src->$_ != NULL )\n";
-                               gen "\t\tif ( !(dest->$_ = strdup(src->$_)) ) goto err;\n";
-                       }
-                       if ($ft eq 'intlist') {
-                               gen "\tif ( src->$_ != NULL )\n\t{\n";
-                               gen "\t\ti = 1 + src->$_\[0];\n";
-                               gen "\t\tif ( !(dest->$_ = malloc(sizeof(*src->$_)*i)) ) goto err;\n";
-                               gen "\t\tmemcpy(dest->$_,src->$_,sizeof(*src->$_)*i);\n\t}\n";
-                       }
-                       if ($ft eq 'strlist') {
-                               gen "\tif ( src->$_ != NULL )\n\t{\n";
-                               gen "\t\tfor ( i = 0; src->$_\[i]; i++ ) ;\n";
-                               gen "\t\tif ( !(dest->$_ = malloc(sizeof(*src->$_)*(i+1))) ) goto err;\n";
-                               gen "\t\tfor ( i = 0; src->$_\[i]; i++ )\n";
-                               gen "\t\t\tif ( !(dest->$_\[i] = strdup(src->$_\[i])) ) goto err;\n";
-                               gen "\t\tdest->$_\[i] = NULL;\n\t}\n";
-                       }
-                       if ($ft eq 'stslist') {
-                               gen "\tif ( src->$_ != NULL )\n\t{\n";
-                               gen "\t\tfor ( i = 0; src->$_\[i].state; i++ ) ;\n";
-                               gen "\t\tif ( !(dest->$_ = malloc(sizeof(*src->$_)*(i+1))) ) goto err;\n";
-                               gen "\t\tfor ( i = 0; src->$_\[i].state; i++ )\n";
-                               gen "\t\t\tif ( !edg_wll_CpyStatus(&src->$_\[i], &dest->$_\[i]) ) goto err;\n";
-                               gen "\t\tdest->$_\[i].state = EDG_WLL_JOB_UNDEF;\n\t}\n";
-                       }
-                       if (($ft eq 'bool') or ($ft eq 'timeval') or ($ft eq 'logsrc')
-                               or ($ft eq 'port') or ($ft eq 'level') or ($ft eq 'int')) {
-                               gen "\tdest->$_ = src->$_;\n";
-                       }
-                       if ($ft eq 'taglist') {
-                               gen qq{
-!      if (src->$_ != NULL) \{
-!              for (i=0; src->$_\[i].tag; i++);
-!              dest->$_ = malloc(sizeof(*src->$_)*(i+1));
-!              for (i=0; src->$_\[i].tag; i++) \{
-!                      dest->$_\[i].tag = strdup(src->$_\[i].tag);
-!                      dest->$_\[i].value = strdup(src->$_\[i].value);
-!              \}
-!              dest->$_\[i].tag = NULL;
-!        \}
-                               };
-                       }
-               }
-@@@}
-    
-  return dest;
-
-err:
-  edg_wll_FreeStatus(dest);
-  return NULL;
-}
-
-
-int edg_wll_InitStatus(edg_wll_JobStat *stat)
-{
-       if (!stat) return -1;
-       
-       stat->state = EDG_WLL_JOB_UNDEF;
-
-@@@{
-        selectType $status '_common_';
-        for (getFieldsOrdered $status) {
-                my $f = selectField $status $_;
-                gen "\tstat->$_ = $f->{null};\n"
-        }
-@@@}
-
-       return 0;
-}
-
-static const char * const statNames[] = {
-       "Undefined",
-@@@{
-        for (getTypesOrdered $status) {
-                gen "\t\"$_\",\n";
-        }
-@@@}
-};
-
-edg_wll_JobStatCode edg_wll_StringToStat(const char *name)
-
-{
-        unsigned int     i;
-
-        for (i=0; i<sizeof(statNames)/sizeof(statNames[0]); i++)
-                if (strcasecmp(statNames[i],name) == 0) return (edg_wll_JobStatCode) i;
-        return (edg_wll_JobStatCode) -1; 
-}
-
-char *edg_wll_StatToString(edg_wll_JobStatCode statCode)
-{
-        if ((int)statCode < 0 || statCode >= sizeof(statNames)/sizeof(statNames[0])) return (char *) NULL; 
-        return strdup(statNames[statCode]);
-}
diff --git a/org.glite.lb.common/src/strio.c b/org.glite.lb.common/src/strio.c

deleted file mode 100644 (file)

index f1ab5b8..0000000
--- a/org.glite.lb.common/src/strio.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************/
-
-/*
- * TODO
- * - StrToLongDouble
- */
- 
-static const char rcsid[] = "@(#)$Id$";
-
-#if defined(unix) || defined(__xlC__) || defined(__QNX__)
-# define PLATFORM_UNIX
-#elif defined(WIN32) || defined(_WIN32)
-# define PLATFORM_WIN32
-#elif defined(AMIGA) && defined(__GNUC__)
-# define PLATFORM_UNIX
-#endif
-
-#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L)
-# define TRIO_C99
-#endif
-
-#include "strio.h"
-#include <string.h>
-#include <locale.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <time.h>
-#include <math.h>
-#ifndef DEBUG
-# define NDEBUG
-#endif
-#include <assert.h>
-
-#ifndef NULL
-# define NULL 0
-#endif
-#define NIL ((char)0)
-#ifndef FALSE
-# define FALSE (1 == 0)
-# define TRUE (! FALSE)
-#endif
-
-#define VALID(x) (NULL != (x))
-#define INVALID(x) (NULL == (x))
-
-#if defined(PLATFORM_UNIX)
-# define USE_STRCASECMP
-# define USE_STRNCASECMP
-# define USE_STRERROR
-# if defined(__QNX__)
-#  define strcasecmp(x,y) stricmp(x,y)
-#  define strncasecmp(x,y,n) strnicmp(x,y,n)
-# endif
-#elif defined(PLATFORM_WIN32)
-# define USE_STRCASECMP
-# define strcasecmp(x,y) strcmpi(x,y)
-#endif
-
-/*************************************************************************
- * StrAppendMax
- */
-char *StrAppendMax(char *target, size_t max, const char *source)
-{
-  assert(VALID(target));
-  assert(VALID(source));
-  assert(max > 0);
-
-  max -= StrLength(target) + 1;
-  return (max > 0) ? strncat(target, source, max) : target;
-}
-
-/*************************************************************************
- * StrCopyMax
- */
-char *StrCopyMax(char *target, size_t max, const char *source)
-{
-  assert(VALID(target));
-  assert(VALID(source));
-  assert(max > 0); /* Includes != 0 */
-
-  target = strncpy(target, source, max - 1);
-  target[max - 1] = (char)0;
-  return target;
-}
-
-/*************************************************************************
- * StrDuplicate
- */
-char *StrDuplicate(const char *source)
-{
-  char *target;
-
-  assert(VALID(source));
-
-  target = StrAlloc(StrLength(source) + 1);
-  if (target)
-    {
-      StrCopy(target, source);
-    }
-  return target;
-}
-
-/*************************************************************************
- * StrDuplicateMax
- */
-char *StrDuplicateMax(const char *source, size_t max)
-{
-  char *target;
-  size_t len;
-
-  assert(VALID(source));
-  assert(max > 0);
-
-  /* Make room for string plus a terminating zero */
-  len = StrLength(source) + 1;
-  if (len > max)
-    {
-      len = max;
-    }
-  target = StrAlloc(len);
-  if (target)
-    {
-      StrCopyMax(target, len, source);
-    }
-  return target;
-}
-
-/*************************************************************************
- * StrEqual
- */
-int StrEqual(const char *first, const char *second)
-{
-  assert(VALID(first));
-  assert(VALID(second));
-
-  if (VALID(first) && VALID(second))
-    {
-#if defined(USE_STRCASECMP)
-      return (0 == strcasecmp(first, second));
-#else
-      while ((*first != NIL) && (*second != NIL))
-       {
-         if (toupper(*first) != toupper(*second))
-           {
-             break;
-           }
-         first++;
-         second++;
-       }
-      return ((*first == NIL) && (*second == NIL));
-#endif
-    }
-  return FALSE;
-}
-
-/*************************************************************************
- * StrEqualCase
- */
-int StrEqualCase(const char *first, const char *second)
-{
-  assert(VALID(first));
-  assert(VALID(second));
-
-  if (VALID(first) && VALID(second))
-    {
-      return (0 == strcmp(first, second));
-    }
-  return FALSE;
-}
-
-/*************************************************************************
- * StrEqualCaseMax
- */
-int StrEqualCaseMax(const char *first, size_t max, const char *second)
-{
-  assert(VALID(first));
-  assert(VALID(second));
-
-  if (VALID(first) && VALID(second))
-    {
-      return (0 == strncmp(first, second, max));
-    }
-  return FALSE;
-}
-
-/*************************************************************************
- * StrEqualLocale
- */
-int StrEqualLocale(const char *first, const char *second)
-{
-  assert(VALID(first));
-  assert(VALID(second));
-
-#if defined(LC_COLLATE)
-  return (strcoll(first, second) == 0);
-#else
-  return StrEqual(first, second);
-#endif
-}
-
-/*************************************************************************
- * StrEqualMax
- */
-int StrEqualMax(const char *first, size_t max, const char *second)
-{
-  assert(VALID(first));
-  assert(VALID(second));
-
-  if (VALID(first) && VALID(second))
-    {
-#if defined(USE_STRNCASECMP)
-      return (0 == strncasecmp(first, second, max));
-#else
-      /* Not adequately tested yet */
-      size_t cnt = 0;
-      while ((*first != NIL) && (*second != NIL) && (cnt <= max))
-       {
-         if (toupper(*first) != toupper(*second))
-           {
-             break;
-           }
-         first++;
-         second++;
-         cnt++;
-       }
-      return ((cnt == max) || ((*first == NIL) && (*second == NIL)));
-#endif
-    }
-  return FALSE;
-}
-
-/*************************************************************************
- * StrError
- */
-const char *StrError(int errorNumber)
-{
-#if defined(USE_STRERROR)
-  return strerror(errorNumber);
-#else
-  return "unknown";
-#endif
-}
-
-/*************************************************************************
- * StrFormatDate
- */
-size_t StrFormatDateMax(char *target,
-                       size_t max,
-                       const char *format,
-                       const struct tm *datetime)
-{
-  assert(VALID(target));
-  assert(VALID(format));
-  assert(VALID(datetime));
-  assert(max > 0);
-  
-  return strftime(target, max, format, datetime);
-}
-
-/*************************************************************************
- * StrHash
- */
-unsigned long StrHash(const char *string, int type)
-{
-  unsigned long value = 0L;
-  char ch;
-
-  assert(VALID(string));
-  
-  switch (type)
-    {
-    case STRIO_HASH_PLAIN:
-      while ( (ch = *string++) != NIL )
-       {
-         value *= 31;
-         value += (unsigned long)ch;
-       }
-      break;
-    default:
-      assert(FALSE);
-      break;
-    }
-  return value;
-}
-
-/*************************************************************************
- * StrMatch
- */
-int StrMatch(char *string, char *pattern)
-{
-  assert(VALID(string));
-  assert(VALID(pattern));
-  
-  for (; ('*' != *pattern); ++pattern, ++string)
-    {
-      if (NIL == *string)
-       {
-         return (NIL == *pattern);
-       }
-      if ((toupper((int)*string) != toupper((int)*pattern))
-         && ('?' != *pattern))
-       {
-         return FALSE;
-       }
-    }
-  /* two-line patch to prevent *too* much recursiveness: */
-  while ('*' == pattern[1])
-    pattern++;
-
-  do
-    {
-      if ( StrMatch(string, &pattern[1]) )
-       {
-         return TRUE;
-       }
-    }
-  while (*string++);
-  
-  return FALSE;
-}
-
-/*************************************************************************
- * StrMatchCase
- */
-int StrMatchCase(char *string, char *pattern)
-{
-  assert(VALID(string));
-  assert(VALID(pattern));
-  
-  for (; ('*' != *pattern); ++pattern, ++string)
-    {
-      if (NIL == *string)
-       {
-         return (NIL == *pattern);
-       }
-      if ((*string != *pattern)
-         && ('?' != *pattern))
-       {
-         return FALSE;
-       }
-    }
-  /* two-line patch to prevent *too* much recursiveness: */
-  while ('*' == pattern[1])
-    pattern++;
-
-  do
-    {
-      if ( StrMatchCase(string, &pattern[1]) )
-       {
-         return TRUE;
-       }
-    }
-  while (*string++);
-  
-  return FALSE;
-}
-
-/*************************************************************************
- * StrSpanFunction
- *
- * Untested
- */
-size_t StrSpanFunction(char *source, int (*Function)(int))
-{
-  size_t count = 0;
-
-  assert(VALID(source));
-  assert(VALID(Function));
-  
-  while (*source != NIL)
-    {
-      if (Function(*source))
-       break; /* while */
-      source++;
-      count++;
-    }
-  return count;
-}
-
-/*************************************************************************
- * StrSubstringMax
- */
-char *StrSubstringMax(const char *string, size_t max, const char *find)
-{
-  size_t count;
-  size_t size;
-  char *result = NULL;
-
-  assert(VALID(string));
-  assert(VALID(find));
-  
-  size = StrLength(find);
-  if (size <= max)
-    {
-      for (count = 0; count <= max - size; count++)
-       {
-         if (StrEqualMax(find, size, &string[count]))
-           {
-             result = (char *)&string[count];
-             break;
-           }
-       }
-    }
-  return result;
-}
-
-/*************************************************************************
- * StrToDouble
- *
- * double ::= [ <sign> ]
- *            ( <number> |
- *              <number> <decimal_point> <number> |
- *              <decimal_point> <number> )
- *            [ <exponential> [ <sign> ] <number> ]
- * number ::= 1*( <digit> )
- * digit ::= ( '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9' )
- * exponential ::= ( 'e' | 'E' )
- * sign ::= ( '-' | '+' )
- * decimal_point ::= '.'
- */
-double StrToDouble(const char *source, const char **endp)
-{
-#if defined(TRIO_C99)
-  return strtod(source, endp);
-#else
-  /* Preliminary code */
-  int isNegative = FALSE;
-  int isExponentNegative = FALSE;
-  unsigned long integer = 0;
-  unsigned long fraction = 0;
-  unsigned long fracdiv = 1;
-  unsigned long exponent = 0;
-  double value = 0.0;
-
-  /* First try hex-floats */
-  if ((source[0] == '0') && ((source[1] == 'x') || (source[1] == 'X')))
-    {
-      source += 2;
-      while (isxdigit((int)*source))
-       {
-         integer *= 16;
-         integer += (isdigit((int)*source)
-                     ? (*source - '0')
-                     : 10 + (toupper((int)*source) - 'A'));
-         source++;
-       }
-      if (*source == '.')
-       {
-         source++;
-         while (isxdigit((int)*source))
-           {
-             fraction *= 16;
-             fraction += (isdigit((int)*source)
-                          ? (*source - '0')
-                          : 10 + (toupper((int)*source) - 'A'));
-             fracdiv *= 16;
-             source++;
-           }
-         if ((*source == 'p') || (*source == 'P'))
-           {
-             source++;
-             if ((*source == '+') || (*source == '-'))
-               {
-                 isExponentNegative = (*source == '-');
-                 source++;
-               }
-             while (isdigit((int)*source))
-               {
-                 exponent *= 10;
-                 exponent += (*source - '0');
-                 source++;
-               }
-           }
-       }
-    }
-  else /* Then try normal decimal floats */
-    {
-      isNegative = (*source == '-');
-      /* Skip sign */
-      if ((*source == '+') || (*source == '-'))
-       source++;
-
-      /* Integer part */
-      while (isdigit((int)*source))
-       {
-         integer *= 10;
-         integer += (*source - '0');
-         source++;
-       }
-
-      if (*source == '.')
-       {
-         source++; /* skip decimal point */
-         while (isdigit((int)*source))
-           {
-             fraction *= 10;
-             fraction += (*source - '0');
-             fracdiv *= 10;
-             source++;
-           }
-       }
-      if ((*source == 'e') || (*source == 'E'))
-       {
-         source++; /* Skip exponential indicator */
-         isExponentNegative = (*source == '-');
-         if ((*source == '+') || (*source == '-'))
-           source++;
-         while (isdigit((int)*source))
-           {
-             exponent *= 10;
-             exponent += (*source - '0');
-             source++;
-           }
-       }
-    }
-  
-  value = (double)integer;
-  if (fraction != 0)
-    {
-      value += (double)fraction / (double)fracdiv;
-    }
-  if (exponent != 0)
-    {
-      if (isExponentNegative)
-       value /= pow((double)10, (double)exponent);
-      else
-       value *= pow((double)10, (double)exponent);
-    }
-  if (isNegative)
-    value = -value;
-
-  if (endp)
-    *endp = source;
-  return value;
-#endif
-}
-
-/*************************************************************************
- * StrToFloat
- */
-float StrToFloat(const char *source, const char **endp)
-{
-#if defined(TRIO_C99)
-  return strtof(source, endp);
-#else
-  return (float)StrToDouble(source, endp);
-#endif
-}
-
-/*************************************************************************
- * StrToUpper
- */
-int StrToUpper(char *target)
-{
-  int i = 0;
-
-  assert(VALID(target));
-  
-  while (NIL != *target)
-    {
-      *target = toupper((int)*target);
-      target++;
-      i++;
-    }
-  return i;
-}
diff --git a/org.glite.lb.common/src/strio.h b/org.glite.lb.common/src/strio.h

deleted file mode 100644 (file)

index 68845a3..0000000
--- a/org.glite.lb.common/src/strio.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************/
-
-#ifndef TRIO_STRIO_H
-#define TRIO_STRIO_H
-
-#if !(defined(DEBUG) || defined(NDEBUG))
-# define NDEBUG
-#endif
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#ifndef STRIO_MALLOC
-# define STRIO_MALLOC(n) malloc(n)
-#endif
-#ifndef STRIO_FREE
-# define STRIO_FREE(x) free(x)
-#endif
-
-/*
- * StrAppend(target, source)
- * StrAppendMax(target, maxsize, source)
- *
- *   Append 'source' to 'target'
- *
- * target = StrAlloc(size)
- *
- *   Allocate a new string
- *
- * StrContains(target, substring)
- *
- *   Find out if the string 'substring' is
- *   contained in the string 'target'
- *
- * StrCopy(target, source)
- * StrCopyMax(target, maxsize, source)
- *
- *   Copy 'source' to 'target'
- *
- * target = StrDuplicate(source)
- * target = StrDuplicateMax(source, maxsize)
- *
- *   Allocate and copy 'source' to 'target'
- *
- * StrEqual(first, second)
- * StrEqualMax(first, maxsize, second)
- *
- *   Compare if 'first' is equal to 'second'.
- *   Case-independent.
- *
- * StrEqualCase(first, second)
- * StrEqualCaseMax(first, maxsize, second)
- *
- *   Compare if 'first' is equal to 'second'
- *   Case-dependent. Please note that the use of the
- *   word 'case' has the opposite meaning as that of
- *   strcasecmp().
- *
- * StrFormat(target, format, ...)
- * StrFormatMax(target, maxsize, format, ...)
- *
- *   Build 'target' according to 'format' and succesive
- *   arguments. This is equal to the sprintf() and
- *   snprintf() functions.
- *
- * StrFormatDate(target, format, ...)
- *
- * StrFree(target)
- *
- *   De-allocates a string
- *
- * StrHash(string, type)
- *
- *   Calculates the hash value of 'string' based on the
- *   'type'.
- *
- * StrIndex(target, character)
- * StrIndexLast(target, character)
- *
- *   Find the first/last occurrence of 'character' in
- *   'target'
- *
- * StrLength(target)
- *
- *   Return the length of 'target'
- *
- * StrMatch(string, pattern)
- * StrMatchCase(string, pattern)
- *
- *   Find 'pattern' within 'string'. 'pattern' may contain
- *   wildcards such as * (asterics) and ? (question mark)
- *   which matches zero or more characters and exactly
- *   on character respectively
- *
- * StrScan(source, format, ...)
- *
- *   Equal to sscanf()
- *
- * StrSubstring(target, substring)
- *
- *   Find the first occurrence of the string 'substring'
- *   within the string 'target'
- *
- * StrTokenize(target, list)
- *
- *   Split 'target' into the first token delimited by
- *   one of the characters in 'list'. If 'target' is
- *   NULL then next token will be returned.
- *
- * StrToUpper(target)
- *
- *   Convert all lower case characters in 'target' into
- *   upper case characters.
- */
-
-enum {
-  STRIO_HASH_NONE = 0,
-  STRIO_HASH_PLAIN,
-  STRIO_HASH_TWOSIGNED
-};
-
-#if !defined(DEBUG) || defined(__DECC)
-#define StrAlloc(n) (char *)STRIO_MALLOC(n)
-#define StrAppend(x,y) strcat((x), (y))
-#define StrContains(x,y) (0 != strstr((x), (y)))
-#define StrCopy(x,y) strcpy((x), (y))
-#define StrIndex(x,y) strchr((x), (y))
-#define StrIndexLast(x,y) strrchr((x), (y))
-#define StrFree(x) STRIO_FREE(x)
-#define StrLength(x) strlen((x))
-#define StrSubstring(x,y) strstr((x), (y))
-#define StrTokenize(x,y) strtok((x), (y))
-#define StrToLong(x,y,n) strtol((x), (y), (n))
-#define StrToUnsignedLong(x,y,n) strtoul((x), (y), (n))
-#else /* DEBUG */
- /*
-  * To be able to use these macros everywhere, including in
-  * if() sentences, the assertions are put first in a comma
-  * seperated list.
-  *
-  * Unfortunately the DECC compiler does not seem to like this
-  * so it will use the un-asserted functions above for the
-  * debugging case too.
-  */
-#define StrAlloc(n) \
-     (assert((n) > 0),\
-      (char *)STRIO_MALLOC(n))
-#define StrAppend(x,y) \
-     (assert((x) != NULL),\
-      assert((y) != NULL),\
-      strcat((x), (y)))
-#define StrContains(x,y) \
-     (assert((x) != NULL),\
-      assert((y) != NULL),\
-      (0 != strstr((x), (y))))
-#define StrCopy(x,y) \
-     (assert((x) != NULL),\
-      assert((y) != NULL),\
-      strcpy((x), (y)))
-#define StrIndex(x,c) \
-     (assert((x) != NULL),\
-      strchr((x), (c)))
-#define StrIndexLast(x,c) \
-     (assert((x) != NULL),\
-      strrchr((x), (c)))
-#define StrFree(x) \
-     (assert((x) != NULL),\
-      STRIO_FREE(x))
-#define StrLength(x) \
-     (assert((x) != NULL),\
-      strlen((x)))
-#define StrSubstring(x,y) \
-     (assert((x) != NULL),\
-      assert((y) != NULL),\
-      strstr((x), (y)))
-#define StrTokenize(x,y) \
-     (assert((y) != NULL),\
-      strtok((x), (y)))
-#define StrToLong(x,y,n) \
-     (assert((x) != NULL),\
-      assert((y) != NULL),\
-      assert((n) >= 2 && (n) <= 36),\
-      strtol((x), (y), (n)))
-#define StrToUnsignedLong(x,y,n) \
-     (assert((x) != NULL),\
-      assert((y) != NULL),\
-      assert((n) >= 2 && (n) <= 36),\
-      strtoul((x), (y), (n)))
-#endif /* DEBUG */
-
-char *StrAppendMax(char *target, size_t max, const char *source);
-char *StrCopyMax(char *target, size_t max, const char *source);
-char *StrDuplicate(const char *source);
-char *StrDuplicateMax(const char *source, size_t max);
-int StrEqual(const char *first, const char *second);
-int StrEqualCase(const char *first, const char *second);
-int StrEqualCaseMax(const char *first, size_t max, const char *second);
-int StrEqualLocale(const char *first, const char *second);
-int StrEqualMax(const char *first, size_t max, const char *second);
-const char *StrError(int);
-size_t StrFormatDateMax(char *target, size_t max, const char *format, const struct tm *datetime);
-unsigned long StrHash(const char *string, int type);
-int StrMatch(char *string, char *pattern);
-int StrMatchCase(char *string, char *pattern);
-size_t StrSpanFunction(char *source, int (*Function)(int));
-char *StrSubstringMax(const char *string, size_t max, const char *find);
-float StrToFloat(const char *source, const char **target);
-double StrToDouble(const char *source, const char **target);
-int StrToUpper(char *target);
-
-#endif /* TRIO_STRIO_H */
diff --git a/org.glite.lb.common/src/trio.c b/org.glite.lb.common/src/trio.c

deleted file mode 100644 (file)

index d46736e..0000000
--- a/org.glite.lb.common/src/trio.c
+++ /dev/null
@@ -1,5708 +0,0 @@
-
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (C) 1998 Bjorn Reese and Daniel Stenberg.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- *************************************************************************
- *
- * A note to trio contributors:
- *
- * Avoid heap allocation at all costs to ensure that the trio functions
- * are async-safe. The exceptions are the printf/fprintf functions, which
- * uses fputc, and the asprintf functions and the <alloc> modifier, which
- * by design are required to allocate form the heap.
- *
- ************************************************************************/
-
-/*
- * TODO:
- *  - Scan is probably too permissive about its modifiers.
- *  - C escapes in %#[] ?
- *  - C99 support has not been properly tested.
- *  - Multibyte characters (done for format parsing, except scan groups)
- *  - Complex numbers? (C99 _Complex)
- *  - Boolean values? (C99 _Bool)
- *  - C99 NaN(n-char-sequence) missing
- *  - Should we support the GNU %a alloc modifier? GNU has an ugly hack
- *    for %a, because C99 used %a for other purposes. If specified as
- *    %as or %a[ it is interpreted as the alloc modifier, otherwise as
- *    the C99 hex-float. This means that you cannot scan %as as a hex-float
- *    immediately followed by an 's'.
- *  - Scanning of collating symbols.
- */
-
-static const char rcsid[] = "@(#)$Id$";
-
-/*************************************************************************
- * Trio include files
- */
-#include "trio.h"
-#include "triop.h"
-#include "strio.h"
-
-#ifdef DATAGRID_EXTENSION
-#include "glite/lb/events.h"
-#include "escape.h"
-//#include "edg/workload/thirdparty/trio/events.h"
-#endif
-
-/*
- * Encode the error code and the position. This is decoded
- * with TRIO_ERROR_CODE and TRIO_ERROR_POSITION.
- */
-#if TRIO_ERRORS
-# define TRIO_ERROR_RETURN(x,y) (- ((x) + ((y) << 8)))
-#else
-# define TRIO_ERROR_RETURN(x,y) (-1)
-#endif
-
-
-/*************************************************************************
- * Platform and compiler support detection
- */
-#if defined(unix) || defined(__xlC__) || defined(_AIX) || defined(__QNX__)
-# define PLATFORM_UNIX
-#elif defined(AMIGA) && defined(__GNUC__)
-# define PLATFORM_UNIX
-#elif defined(WIN32) || defined(_WIN32) || defined(_MSC_VER)
-# define PLATFORM_WIN32
-# define TRIO_MSVC_5 1100
-#endif
-
-#if defined(__STDC__) && defined(__STDC_VERSION__)
-# if (__STDC_VERSION__ >= 199409L)
-#  define TRIO_COMPILER_SUPPORTS_ISO94
-# endif
-# if (__STDC_VERSION__ >= 199901L)
-#  define TRIO_COMPILER_SUPPORTS_C99
-# endif
-#endif
-
-#if defined(_XOPEN_SOURCE) && defined(_XOPEN_SOURCE_EXTENDED)
-# define TRIO_COMPILER_SUPPORTS_UNIX98
-#endif
-
-#if defined(__STDC_ISO_10646__) || defined(MB_LEN_MAX) || defined(USE_MULTIBYTE) || TRIO_WIDECHAR
-# define TRIO_COMPILER_SUPPORTS_MULTIBYTE
-# if !defined(MB_LEN_MAX)
-#  define MB_LEN_MAX 6
-# endif
-#endif
-
-
-/*************************************************************************
- * Generic definitions
- */
-
-#if !(defined(DEBUG) || defined(NDEBUG))
-# define NDEBUG
-#endif
-#include <assert.h>
-#include <ctype.h>
-#if !defined(TRIO_COMPILER_SUPPORTS_C99) && !defined(isblank)
-# define isblank(x) (((x)==32) || ((x)==9))
-#endif
-#include <math.h>
-#include <limits.h>
-#include <float.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <errno.h>
-
-#ifndef NULL
-# define NULL 0
-#endif
-#define NIL ((char)0)
-#ifndef FALSE
-# define FALSE (1 == 0)
-# define TRUE (! FALSE)
-#endif
-#define BOOLEAN_T int
-
-/* mincore() can be used for debugging purposes */
-#define VALID(x) (NULL != (x))
-
-/* xlC crashes on log10(0) */
-#define guarded_log10(x) (((x) == 0.0) ? -HUGE_VAL : log10(x))
-#define guarded_log16(x) (guarded_log10(x) / log10(16.0))
-
-
-/*************************************************************************
- * Platform specific definitions
- */
-#if defined(PLATFORM_UNIX)
-# include <unistd.h>
-# include <signal.h>
-# include <locale.h>
-# define USE_LOCALE
-#endif /* PLATFORM_UNIX */
-#if defined(PLATFORM_WIN32)
-# include <io.h>
-# define read _read
-# define write _write
-#endif /* PLATFORM_WIN32 */
-
-#if TRIO_WIDECHAR
-# if defined(TRIO_COMPILER_SUPPORTS_ISO94)
-#  include <wchar.h>
-#  include <wctype.h>
-# else
-typedef char wchar_t;
-typedef int wint_t;
-#  define WEOF EOF
-#  define iswalnum(x) isalnum(x)
-#  define iswalpha(x) isalpha(x)
-#  define iswblank(x) isblank(x)
-#  define iswcntrl(x) iscntrl(x)
-#  define iswdigit(x) isdigit(x)
-#  define iswgraph(x) isgraph(x)
-#  define iswlower(x) islower(x)
-#  define iswprint(x) isprint(x)
-#  define iswpunct(x) ispunct(x)
-#  define iswspace(x) isspace(x)
-#  define iswupper(x) isupper(x)
-#  define iswxdigit(x) isxdigit(x)
-# endif
-#endif
-
-
-/*************************************************************************
- * Compiler dependent definitions
- */
-
-/* Support for long long */
-#ifndef __cplusplus
-# if !defined(USE_LONGLONG)
-#  if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-#   define USE_LONGLONG
-#  elif defined(__SUNPRO_C)
-#   define USE_LONGLONG
-#  elif defined(_LONG_LONG) || defined(_LONGLONG)
-#   define USE_LONGLONG
-#  endif
-# endif
-#endif
-
-/* The extra long numbers */
-#if defined(USE_LONGLONG)
-typedef signed long long int trio_longlong_t;
-typedef unsigned long long int trio_ulonglong_t;
-#elif defined(_MSC_VER)
-# if (_MSC_VER >= TRIO_MSVC_5)
-typedef signed __int64 trio_longlong_t;
-typedef unsigned __int64 trio_ulonglong_t;
-# else
-typedef signed long int trio_longlong_t;
-typedef unsigned long int trio_ulonglong_t;
-# endif
-#else
-typedef signed long int trio_longlong_t;
-typedef unsigned long int trio_ulonglong_t;
-#endif
-
-/* Maximal and fixed integer types */
-#if defined(TRIO_COMPILER_SUPPORTS_C99)
-# include <stdint.h>
-typedef intmax_t trio_intmax_t;
-typedef uintmax_t trio_uintmax_t;
-typedef int8_t trio_int8_t;
-typedef int16_t trio_int16_t;
-typedef int32_t trio_int32_t;
-typedef int64_t trio_int64_t;
-#elif defined(TRIO_COMPILER_SUPPORTS_UNIX98)
-# include <inttypes.h>
-typedef intmax_t trio_intmax_t;
-typedef uintmax_t trio_uintmax_t;
-typedef int8_t trio_int8_t;
-typedef int16_t trio_int16_t;
-typedef int32_t trio_int32_t;
-typedef int64_t trio_int64_t;
-#elif defined(_MSC_VER) && (_MSC_VER >= TRIO_MSVC_5)
-typedef trio_longlong_t trio_intmax_t;
-typedef trio_ulonglong_t trio_uintmax_t;
-typedef __int8 trio_int8_t;
-typedef __int16 trio_int16_t;
-typedef __int32 trio_int32_t;
-typedef __int64 trio_int64_t;
-#else
-typedef trio_longlong_t trio_intmax_t;
-typedef trio_ulonglong_t trio_uintmax_t;
-# if defined(TRIO_INT8_T)
-typedef TRIO_INT8_T trio_int8_t;
-# else
-typedef signed char trio_int8_t;
-# endif
-# if defined(TRIO_INT16_T)
-typedef TRIO_INT16_T trio_int16_t;
-# else
-typedef signed short trio_int16_t;
-# endif
-# if defined(TRIO_INT32_T)
-typedef TRIO_INT32_T trio_int32_t;
-# else
-typedef signed int trio_int32_t;
-# endif
-# if defined(TRIO_INT64_T)
-typedef TRIO_INT64_T trio_int64_t;
-# else
-typedef trio_longlong_t trio_int64_t;
-# endif
-#endif
-
-
-/*************************************************************************
- * Internal definitions
- */
-
-/* Long double sizes */
-#ifdef LDBL_DIG
-# define MAX_MANTISSA_DIGITS LDBL_DIG
-# define MAX_EXPONENT_DIGITS 4
-#else
-# define MAX_MANTISSA_DIGITS DBL_DIG
-# define MAX_EXPONENT_DIGITS 3
-#endif
-
-/* The maximal number of digits is for base 2 */
-#define MAX_CHARS_IN(x) (sizeof(x) * CHAR_BIT)
-/* The width of a pointer. The number of bits in a hex digit is 4 */
-#define POINTER_WIDTH ((sizeof("0x") - 1) + sizeof(void *) * CHAR_BIT / 4)
-
-/* Infinite and Not-A-Number for floating-point */
-#define INFINITE_LOWER "inf"
-#define INFINITE_UPPER "INF"
-#define LONG_INFINITE_LOWER "infinite"
-#define LONG_INFINITE_UPPER "INFINITE"
-#define NAN_LOWER "nan"
-#define NAN_UPPER "NAN"
-
-/* Various constants */
-enum {
-  TYPE_PRINT = 1,
-  TYPE_SCAN  = 2,
-
-  /* Flags. Use maximum 32 */
-  FLAGS_NEW                 = 0,
-  FLAGS_STICKY              = 1,
-  FLAGS_SPACE               = 2 * FLAGS_STICKY,
-  FLAGS_SHOWSIGN            = 2 * FLAGS_SPACE,
-  FLAGS_LEFTADJUST          = 2 * FLAGS_SHOWSIGN,
-  FLAGS_ALTERNATIVE         = 2 * FLAGS_LEFTADJUST,
-  FLAGS_SHORT               = 2 * FLAGS_ALTERNATIVE,
-  FLAGS_SHORTSHORT          = 2 * FLAGS_SHORT,
-  FLAGS_LONG                = 2 * FLAGS_SHORTSHORT,
-  FLAGS_QUAD                = 2 * FLAGS_LONG,
-  FLAGS_LONGDOUBLE          = 2 * FLAGS_QUAD,
-  FLAGS_SIZE_T              = 2 * FLAGS_LONGDOUBLE,
-  FLAGS_PTRDIFF_T           = 2 * FLAGS_SIZE_T,
-  FLAGS_INTMAX_T            = 2 * FLAGS_PTRDIFF_T,
-  FLAGS_NILPADDING          = 2 * FLAGS_INTMAX_T,
-  FLAGS_UNSIGNED            = 2 * FLAGS_NILPADDING,
-  FLAGS_UPPER               = 2 * FLAGS_UNSIGNED,
-  FLAGS_WIDTH               = 2 * FLAGS_UPPER,
-  FLAGS_WIDTH_PARAMETER     = 2 * FLAGS_WIDTH,
-  FLAGS_PRECISION           = 2 * FLAGS_WIDTH_PARAMETER,
-  FLAGS_PRECISION_PARAMETER = 2 * FLAGS_PRECISION,
-  FLAGS_BASE                = 2 * FLAGS_PRECISION_PARAMETER,
-  FLAGS_BASE_PARAMETER      = 2 * FLAGS_BASE,
-  FLAGS_FLOAT_E             = 2 * FLAGS_BASE_PARAMETER,
-  FLAGS_FLOAT_G             = 2 * FLAGS_FLOAT_E,
-  FLAGS_QUOTE               = 2 * FLAGS_FLOAT_G,
-  FLAGS_WIDECHAR            = 2 * FLAGS_QUOTE,
-  FLAGS_ALLOC               = 2 * FLAGS_WIDECHAR,
-  FLAGS_IGNORE              = 2 * FLAGS_ALLOC,
-  FLAGS_IGNORE_PARAMETER    = 2 * FLAGS_IGNORE,
-  FLAGS_VARSIZE_PARAMETER   = 2 * FLAGS_IGNORE_PARAMETER,
-  FLAGS_FIXED_SIZE          = 2 * FLAGS_VARSIZE_PARAMETER,
-  /* Reused flags */
-  FLAGS_EXCLUDE             = FLAGS_SHORT,
-  FLAGS_USER_DEFINED        = FLAGS_IGNORE,
-  /* Compounded flags */
-  FLAGS_ALL_VARSIZES        = FLAGS_LONG | FLAGS_QUAD | FLAGS_INTMAX_T | FLAGS_PTRDIFF_T | FLAGS_SIZE_T,
-  FLAGS_ALL_SIZES           = FLAGS_ALL_VARSIZES | FLAGS_SHORTSHORT | FLAGS_SHORT,
-
-  NO_POSITION  = -1,
-  NO_WIDTH     =  0,
-  NO_PRECISION = -1,
-  NO_SIZE      = -1,
-
-  NO_BASE      = -1,
-  MIN_BASE     =  2,
-  MAX_BASE     = 36,
-  BASE_BINARY  =  2,
-  BASE_OCTAL   =  8,
-  BASE_DECIMAL = 10,
-  BASE_HEX     = 16,
-
-  /* Maximal number of allowed parameters */
-  MAX_PARAMETERS = 64,
-  /* Maximal number of characters in class */
-  MAX_CHARACTER_CLASS = UCHAR_MAX,
-
-  /* Maximal string lengths for user-defined specifiers */
-  MAX_USER_NAME = 64,
-  MAX_USER_DATA = 256,
-  
-  /* Maximal length of locale separator strings */
-  MAX_LOCALE_SEPARATOR_LENGTH = MB_LEN_MAX,
-  /* Maximal number of integers in grouping */
-  MAX_LOCALE_GROUPS = 64
-};
-
-#define NO_GROUPING ((int)CHAR_MAX)
-
-/* Fundamental formatting parameter types */
-#define FORMAT_UNKNOWN   0
-#define FORMAT_INT       1
-#define FORMAT_DOUBLE    2
-#define FORMAT_CHAR      3
-#define FORMAT_STRING    4
-#define FORMAT_POINTER   5
-#define FORMAT_COUNT     6
-#define FORMAT_PARAMETER 7
-#define FORMAT_GROUP     8
-#if TRIO_GNU
-# define FORMAT_ERRNO    9
-#endif
-#if TRIO_EXTENSION
-# define FORMAT_USER_DEFINED 10
-#endif
-
-/* Character constants */
-#define CHAR_IDENTIFIER '%'
-#define CHAR_BACKSLASH '\\'
-#define CHAR_QUOTE '\"'
-#define CHAR_ADJUST ' '
-
-/* Character class expressions */
-#define CLASS_ALNUM ":alnum:"
-#define CLASS_ALPHA ":alpha:"
-#define CLASS_CNTRL ":cntrl:"
-#define CLASS_DIGIT ":digit:"
-#define CLASS_GRAPH ":graph:"
-#define CLASS_LOWER ":lower:"
-#define CLASS_PRINT ":print:"
-#define CLASS_PUNCT ":punct:"
-#define CLASS_SPACE ":space:"
-#define CLASS_UPPER ":upper:"
-#define CLASS_XDIGIT ":xdigit:"
-
-/*
- * SPECIFIERS:
- *
- *
- * a  Hex-float
- * A  Hex-float
- * c  Character
- * C  Widechar character (wint_t)
- * d  Decimal
- * e  Float
- * E  Float
- * F  Float
- * F  Float
- * g  Float
- * G  Float
- * i  Integer
- * m  Error message
- * n  Count
- * o  Octal
- * p  Pointer
- * s  String
- * S  Widechar string (wchar_t *)
- * u  Unsigned
- * x  Hex
- * X  Hex
- * [] Group
- * <> User-defined
- *
- * Reserved:
- *
- * D  Binary Coded Decimal %D(length,precision) (OS/390)
- */
-#define SPECIFIER_CHAR 'c'
-#define SPECIFIER_STRING 's'
-#define SPECIFIER_DECIMAL 'd'
-#define SPECIFIER_INTEGER 'i'
-#define SPECIFIER_UNSIGNED 'u'
-#define SPECIFIER_OCTAL 'o'
-#define SPECIFIER_HEX 'x'
-#define SPECIFIER_HEX_UPPER 'X'
-#define SPECIFIER_FLOAT_E 'e'
-#define SPECIFIER_FLOAT_E_UPPER 'E'
-#define SPECIFIER_FLOAT_F 'f'
-#define SPECIFIER_FLOAT_F_UPPER 'F'
-#define SPECIFIER_FLOAT_G 'g'
-#define SPECIFIER_FLOAT_G_UPPER 'G'
-#define SPECIFIER_POINTER 'p'
-#define SPECIFIER_GROUP '['
-#define SPECIFIER_UNGROUP ']'
-#define SPECIFIER_COUNT 'n'
-#if TRIO_UNIX98
-# define SPECIFIER_CHAR_UPPER 'C'
-# define SPECIFIER_STRING_UPPER 'S'
-#endif
-#if TRIO_C99
-# define SPECIFIER_HEXFLOAT 'a'
-# define SPECIFIER_HEXFLOAT_UPPER 'A'
-#endif
-#if TRIO_GNU
-# define SPECIFIER_ERRNO 'm'
-#endif
-#if TRIO_EXTENSION
-# define SPECIFIER_BINARY 'b'
-# define SPECIFIER_BINARY_UPPER 'B'
-# define SPECIFIER_USER_DEFINED_BEGIN '<'
-# define SPECIFIER_USER_DEFINED_END '>'
-# define SPECIFIER_USER_DEFINED_SEPARATOR ':'
-#endif
-
-/*
- * QUALIFIERS:
- *
- *
- * Numbers = d,i,o,u,x,X
- * Float = a,A,e,E,f,F,g,G
- * String = s
- * Char = c
- *
- *
- * 9$ Position
- *      Use the 9th parameter. 9 can be any number between 1 and
- *      the maximal argument
- *
- * 9 Width
- *      Set width to 9. 9 can be any number, but must not be postfixed
- *      by '$'
- *
- * h  Short
- *    Numbers:
- *      (unsigned) short int
- *
- * hh Short short
- *    Numbers:
- *      (unsigned) char
- *
- * l  Long
- *    Numbers:
- *      (unsigned) long int
- *    String:
- *      as the S specifier
- *    Char:
- *      as the C specifier
- *
- * ll Long Long
- *    Numbers:
- *      (unsigned) long long int
- *
- * L  Long Double
- *    Float
- *      long double
- *
- * #  Alternative
- *    Float:
- *      Decimal-point is always present
- *    String:
- *      non-printable characters are handled as \number
- *
- *    Spacing
- *
- * +  Sign
- *
- * -  Alignment
- *
- * .  Precision
- *
- * *  Parameter
- *    print: use parameter
- *    scan: no parameter (ignore)
- *
- * q  Quad
- *
- * Z  size_t
- *
- * w  Widechar
- *
- * '  Thousands/quote
- *    Numbers:
- *      Integer part grouped in thousands
- *    Binary numbers:
- *      Number grouped in nibbles (4 bits)
- *    String:
- *      Quoted string
- *
- * j  intmax_t
- * t  prtdiff_t
- * z  size_t
- *
- * !  Sticky
- * @  Parameter (for both print and scan)
- *
- * I  n-bit Integer
- *    Numbers:
- *      The following options exists
- *        I8  = 8-bit integer
- *        I16 = 16-bit integer
- *        I32 = 32-bit integer
- *        I64 = 64-bit integer
- */
-#define QUALIFIER_POSITION '$'
-#define QUALIFIER_SHORT 'h'
-#define QUALIFIER_LONG 'l'
-#define QUALIFIER_LONG_UPPER 'L'
-#define QUALIFIER_ALTERNATIVE '#'
-#define QUALIFIER_SPACE ' '
-#define QUALIFIER_PLUS '+'
-#define QUALIFIER_MINUS '-'
-#define QUALIFIER_DOT '.'
-#define QUALIFIER_STAR '*'
-#define QUALIFIER_CIRCUMFLEX '^'
-#if TRIO_C99
-# define QUALIFIER_SIZE_T 'z'
-# define QUALIFIER_PTRDIFF_T 't'
-# define QUALIFIER_INTMAX_T 'j'
-#endif
-#if TRIO_BSD || TRIO_GNU
-# define QUALIFIER_QUAD 'q'
-#endif
-#if TRIO_GNU
-# define QUALIFIER_SIZE_T_UPPER 'Z'
-#endif
-#if TRIO_MISC
-# define QUALIFIER_WIDECHAR 'w'
-#endif
-#if TRIO_MICROSOFT
-# define QUALIFIER_FIXED_SIZE 'I'
-#endif
-#if TRIO_EXTENSION
-# define QUALIFIER_QUOTE '\''
-# define QUALIFIER_STICKY '!'
-# define QUALIFIER_VARSIZE '&' /* This should remain undocumented */
-# define QUALIFIER_PARAM '@' /* Experimental */
-# define QUALIFIER_COLON ':' /* For scanlists */
-# define QUALIFIER_EQUAL '=' /* For scanlists */
-#endif
-#if DATAGRID_EXTENSION
-# define QUALIFIER_ESCAPE '|'
-#endif
-
-
-/*************************************************************************
- * Internal structures
- */
-
-/* Parameters */
-typedef struct {
-  int type;
-  unsigned long flags;
-  int width;
-  int precision;
-  int base;
-  int varsize;
-#ifdef QUALIFIER_ESCAPE
-  enum dg_escape { ESCAPE_NONE, ESCAPE_ULM, ESCAPE_XML, ESCAPE_SQL } escape;
-#endif
-  int indexAfterSpecifier;
-  union {
-    char *string;
-#if TRIO_WIDECHAR
-    wchar_t *wstring;
-#endif
-    void *pointer;
-    union {
-      trio_uintmax_t as_signed;
-      trio_intmax_t as_unsigned;
-    } number;
-    double doubleNumber;
-    double *doublePointer;
-    long double longdoubleNumber;
-    long double *longdoublePointer;
-    int errorNumber;
-  } data;
-  /* For the user-defined specifier */
-  char user_name[MAX_USER_NAME];
-  char user_data[MAX_USER_DATA];
-} parameter_T;
-
-/* General trio "class" */
-typedef struct _trio_T {
-  void *location;
-  void (*OutStream)(struct _trio_T *, int);
-  void (*InStream)(struct _trio_T *, int *);
-  /*
-   * The number of characters that would have been written/read if
-   * there had been sufficient space.
-   */
-  int processed;
-  /*
-   * The number of characters that are actually written/read.
-   * Processed and committed with only differ for the *nprintf
-   * and *nscanf functions.
-   */
-  int committed;
-  int max;
-  int current;
-} trio_T;
-
-/* References (for user-defined callbacks) */
-typedef struct _reference_T {
-  trio_T *data;
-  parameter_T *parameter;
-} reference_T;
-
-/* Registered entries (for user-defined callbacks) */
-typedef struct _userdef_T {
-  struct _userdef_T *next;
-  trio_callback_t callback;
-  char *name;
-} userdef_T;
-
-
-/*************************************************************************
- * Internal variables
- */
-
-static const char null[] = "(nil)";
-
-#if defined(USE_LOCALE)
-static struct lconv *internalLocaleValues = NULL;
-#endif
-
-/*
- * UNIX98 says "in a locale where the radix character is not defined,
- * the radix character defaults to a period (.)"
- */
-static char internalDecimalPoint[MAX_LOCALE_SEPARATOR_LENGTH + 1] = ".";
-static char internalThousandSeparator[MAX_LOCALE_SEPARATOR_LENGTH + 1] = ",";
-static char internalGrouping[MAX_LOCALE_GROUPS] = { (char)NO_GROUPING };
-
-static const char internalDigitsLower[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-static const char internalDigitsUpper[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-static BOOLEAN_T internalDigitsUnconverted = TRUE;
-static int internalDigitArray[128];
-#if TRIO_EXTENSION
-static BOOLEAN_T internalCollationUnconverted = TRUE;
-static char internalCollationArray[MAX_CHARACTER_CLASS][MAX_CHARACTER_CLASS];
-#endif
-
-static volatile trio_callback_t internalEnterCriticalRegion = NULL;
-static volatile trio_callback_t internalLeaveCriticalRegion = NULL;
-static userdef_T *internalUserDef = NULL;
-
-
-/*************************************************************************
- * trio_strerror [public]
- */
-const char *trio_strerror(int errorcode)
-{
-  /* Textual versions of the error codes */
-  switch (TRIO_ERROR_CODE(errorcode))
-    {
-    case TRIO_EOF:
-      return "End of file";
-    case TRIO_EINVAL:
-      return "Invalid argument";
-    case TRIO_ETOOMANY:
-      return "Too many arguments";
-    case TRIO_EDBLREF:
-      return "Double reference";
-    case TRIO_EGAP:
-      return "Reference gap";
-    case TRIO_ENOMEM:
-      return "Out of memory";
-    case TRIO_ERANGE:
-      return "Invalid range";
-    default:
-      return "Unknown";
-    }
-}
-
-/*************************************************************************
- * TrioIsQualifier [private]
- *
- * Description:
- *  Remember to add all new qualifiers to this function.
- *  QUALIFIER_POSITION must not be added.
- */
-static BOOLEAN_T
-TrioIsQualifier(const char ch)
-{
-  /* QUALIFIER_POSITION is not included */
-  switch (ch)
-    {
-    case '0': case '1': case '2': case '3': case '4':
-    case '5': case '6': case '7': case '8': case '9':
-    case QUALIFIER_PLUS:
-    case QUALIFIER_MINUS:
-    case QUALIFIER_SPACE:
-    case QUALIFIER_DOT:
-    case QUALIFIER_STAR:
-    case QUALIFIER_ALTERNATIVE:
-    case QUALIFIER_SHORT:
-    case QUALIFIER_LONG:
-    case QUALIFIER_LONG_UPPER:
-    case QUALIFIER_CIRCUMFLEX:
-#if defined(QUALIFIER_SIZE_T)
-    case QUALIFIER_SIZE_T:
-#endif
-#if defined(QUALIFIER_PTRDIFF_T)
-    case QUALIFIER_PTRDIFF_T:
-#endif
-#if defined(QUALIFIER_INTMAX_T)
-    case QUALIFIER_INTMAX_T:
-#endif
-#if defined(QUALIFIER_QUAD)
-    case QUALIFIER_QUAD:
-#endif
-#if defined(QUALIFIER_SIZE_T_UPPER)
-    case QUALIFIER_SIZE_T_UPPER:
-#endif
-#if defined(QUALIFIER_WIDECHAR)
-    case QUALIFIER_WIDECHAR:
-#endif
-#if defined(QUALIFIER_QUOTE)
-    case QUALIFIER_QUOTE:
-#endif
-#if defined(QUALIFIER_STICKY)
-    case QUALIFIER_STICKY:
-#endif
-#if defined(QUALIFIER_VARSIZE)
-    case QUALIFIER_VARSIZE:
-#endif
-#if defined(QUALIFIER_PARAM)
-    case QUALIFIER_PARAM:
-#endif
-#if defined(QUALIFIER_FIXED_SIZE)
-    case QUALIFIER_FIXED_SIZE:
-#endif
-#ifdef QUALIFIER_ESCAPE
-    case QUALIFIER_ESCAPE:
-#endif
-      return TRUE;
-    default:
-      return FALSE;
-    }
-}
-
-/*************************************************************************
- * TrioGenerateNan [private]
- *
- * Calculating NaN portably is difficult. Some compilers will emit
- * warnings about divide by zero, and others will simply fail to
- * generate a NaN.
- */
-static double
-TrioGenerateNaN(void)
-{
-#if defined(TRIO_COMPILER_SUPPORTS_C99)
-  return nan(NULL);
-#elif defined(DBL_QNAN)
-  return DBL_QNAN;
-#elif defined(PLATFORM_UNIX)
-  double value;
-  void (*signal_handler)(int);
-  
-  signal_handler = signal(SIGFPE, SIG_IGN);
-  value = 0.0 / 0.0;
-  signal(SIGFPE, signal_handler);
-  return value;
-#else
-  return 0.0 / 0.0;
-#endif
-}
-
-/*************************************************************************
- * TrioIsNan [private]
- */
-static int
-TrioIsNan(double number)
-{
-#ifdef isnan
-  /* C99 defines isnan() as a macro */
-  return isnan(number);
-#else
-  double integral, fraction;
-  
-  return (/* NaN is the only number which does not compare to itself */
-         (number != number) ||
-         /* Fallback solution if NaN compares to NaN */
-         ((number != 0.0) &&
-          (fraction = modf(number, &integral),
-           integral == fraction)));
-#endif
-}
-
-/*************************************************************************
- * TrioIsInfinite [private]
- */
-static int
-TrioIsInfinite(double number)
-{
-#ifdef isinf
-  /* C99 defines isinf() as a macro */
-  return isinf(number);
-#else
-  return ((number == HUGE_VAL) ? 1 : ((number == -HUGE_VAL) ? -1 : 0));
-#endif
-}
-
-/*************************************************************************
- * TrioSetLocale [private]
- */
-#if defined(USE_LOCALE)
-static void
-TrioSetLocale(void)
-{
-  internalLocaleValues = (struct lconv *)localeconv();
-  if (internalLocaleValues)
-    {
-      if ((internalLocaleValues->decimal_point) &&
-         (internalLocaleValues->decimal_point[0] != NIL))
-       {
-         StrCopyMax(internalDecimalPoint,
-                    sizeof(internalDecimalPoint),
-                    internalLocaleValues->decimal_point);
-       }
-      if ((internalLocaleValues->thousands_sep) &&
-         (internalLocaleValues->thousands_sep[0] != NIL))
-       {
-         StrCopyMax(internalThousandSeparator,
-                    sizeof(internalThousandSeparator),
-                    internalLocaleValues->thousands_sep);
-       }
-      if ((internalLocaleValues->grouping) &&
-         (internalLocaleValues->grouping[0] != NIL))
-       {
-         StrCopyMax(internalGrouping,
-                    sizeof(internalGrouping),
-                    internalLocaleValues->grouping);
-       }
-    }
-}
-#endif /* defined(USE_LOCALE) */
-
-/*************************************************************************
- * TrioGetPosition [private]
- *
- * Get the %n$ position.
- */
-static int
-TrioGetPosition(const char *format,
-               int *indexPointer)
-{
-  char *tmpformat;
-  int number = 0;
-  int index = *indexPointer;
-
-  number = (int)StrToLong(&format[index], &tmpformat, BASE_DECIMAL);
-  index = (int)(tmpformat - format);
-  if ((number != 0) && (QUALIFIER_POSITION == format[index++]))
-    {
-      *indexPointer = index;
-      /*
-       * number is decreased by 1, because n$ starts from 1, whereas
-       * the array it is indexing starts from 0.
-       */
-      return number - 1;
-    }
-  return NO_POSITION;
-}
-
-/*************************************************************************
- * TrioFindNamespace [private]
- *
- * Find registered user-defined specifier.
- * The prev argument is used for optimisation only.
- */
-static userdef_T *
-TrioFindNamespace(const char *name, userdef_T **prev)
-{
-  userdef_T *def;
-  
-  if (internalEnterCriticalRegion)
-    (void)internalEnterCriticalRegion(NULL);
-  
-  for (def = internalUserDef; def; def = def->next)
-    {
-      /* Case-sensitive string comparison */
-      if (StrEqualCase(def->name, name))
-       break;
-      
-      if (prev)
-       *prev = def;
-    }
-  
-  if (internalLeaveCriticalRegion)
-    (void)internalLeaveCriticalRegion(NULL);
-  
-  return def;
-}
-
-/*************************************************************************
- * TrioPreprocess [private]
- *
- * Description:
- *  Parse the format string
- */
-static int
-TrioPreprocess(int type,
-              const char *format,
-              parameter_T *parameters,
-              va_list arglist,
-              void **argarray)
-{
-#if TRIO_ERRORS
-  /* Count the number of times a parameter is referenced */
-  unsigned short usedEntries[MAX_PARAMETERS];
-#endif
-  /* Parameter counters */
-  int parameterPosition;
-  int currentParam;
-  int maxParam = -1;
-  /* Utility variables */
-  unsigned long flags;
-  int width;
-  int precision;
-  int varsize;
-#ifdef QUALIFIER_ESCAPE
-  enum dg_escape escape;
-#endif
-  int base;
-  int index;  /* Index into formatting string */
-  int dots;  /* Count number of dots in modifier part */
-  BOOLEAN_T positional;  /* Does the specifier have a positional? */
-  BOOLEAN_T got_sticky = FALSE;  /* Are there any sticky modifiers at all? */
-  /*
-   * indices specifies the order in which the parameters must be
-   * read from the va_args (this is necessary to handle positionals)
-   */
-  int indices[MAX_PARAMETERS];
-  int pos = 0;
-  /* Various variables */
-  char ch;
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  int charlen;
-#endif
-  int i = -1;
-  int num;
-  char *tmpformat;
-
-
-#if TRIO_ERRORS
-  /*
-   * The 'parameters' array is not initialized, but we need to
-   * know which entries we have used.
-   */
-  memset(usedEntries, 0, sizeof(usedEntries));
-#endif
-
-  index = 0;
-  parameterPosition = 0;
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  mblen(NULL, 0);
-#endif
-  
-  while (format[index])
-    {
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-      if (! isascii(format[index]))
-       {
-         /*
-          * Multibyte characters cannot be legal specifiers or
-          * modifiers, so we skip over them.
-          */
-         charlen = mblen(&format[index], MB_LEN_MAX);
-         index += (charlen > 0) ? charlen : 1;
-         continue; /* while */
-       }
-#endif /* TRIO_COMPILER_SUPPORTS_MULTIBYTE */
-      if (CHAR_IDENTIFIER == format[index++])
-       {
-         if (CHAR_IDENTIFIER == format[index])
-           {
-             index++;
-             continue; /* while */
-           }
-
-         flags = FLAGS_NEW;
-         dots = 0;
-         currentParam = TrioGetPosition(format, &index);
-         positional = (NO_POSITION != currentParam);
-         if (!positional)
-           {
-             /* We have no positional, get the next counter */
-             currentParam = parameterPosition;
-           }
-          if(currentParam >= MAX_PARAMETERS)
-           {
-             /* Bail out completely to make the error more obvious */
-             return TRIO_ERROR_RETURN(TRIO_ETOOMANY, index);
-           }
-
-         if (currentParam > maxParam)
-           maxParam = currentParam;
-
-         /* Default values */
-         width = NO_WIDTH;
-         precision = NO_PRECISION;
-         base = NO_BASE;
-         varsize = NO_SIZE;
-#ifdef QUALIFIER_ESCAPE
-         escape = ESCAPE_NONE;
-#endif
-
-         while (TrioIsQualifier(format[index]))
-           {
-             ch = format[index++];
-
-             switch (ch)
-               {
-               case QUALIFIER_SPACE:
-                 flags |= FLAGS_SPACE;
-                 break;
-
-               case QUALIFIER_PLUS:
-                 flags |= FLAGS_SHOWSIGN;
-                 break;
-
-               case QUALIFIER_MINUS:
-                 flags |= FLAGS_LEFTADJUST;
-                 flags &= ~FLAGS_NILPADDING;
-                 break;
-
-               case QUALIFIER_ALTERNATIVE:
-                 flags |= FLAGS_ALTERNATIVE;
-                 break;
-
-               case QUALIFIER_DOT:
-                 if (dots == 0) /* Precision */
-                   {
-                     dots++;
-
-                     /* Skip if no precision */
-                     if (QUALIFIER_DOT == format[index])
-                       break;
-                     
-                     /* After the first dot we have the precision */
-                     flags |= FLAGS_PRECISION;
-                     if ((QUALIFIER_STAR == format[index]) ||
-                         (QUALIFIER_PARAM == format[index]))
-                       {
-                         index++;
-                         flags |= FLAGS_PRECISION_PARAMETER;
-
-                         precision = TrioGetPosition(format, &index);
-                         if (precision == NO_POSITION)
-                           {
-                             parameterPosition++;
-                             if (positional)
-                               precision = parameterPosition;
-                             else
-                               {
-                                 precision = currentParam;
-                                 currentParam = precision + 1;
-                               }
-                           }
-                         else
-                           {
-                             if (! positional)
-                               currentParam = precision + 1;
-                             if (width > maxParam)
-                               maxParam = precision;
-                           }
-                         if (currentParam > maxParam)
-                           maxParam = currentParam;
-                       }
-                     else
-                       {
-                         precision = StrToLong(&format[index], &tmpformat, BASE_DECIMAL);
-                         index = (int)(tmpformat - format);
-                       }
-                   }
-                 else if (dots == 1) /* Base */
-                   {
-                     dots++;
-                     
-                     /* After the second dot we have the base */
-                     flags |= FLAGS_BASE;
-                     if ((QUALIFIER_STAR == format[index]) ||
-                         (QUALIFIER_PARAM == format[index]))
-                       {
-                         index++;
-                         flags |= FLAGS_BASE_PARAMETER;
-                         base = TrioGetPosition(format, &index);
-                         if (base == NO_POSITION)
-                           {
-                             parameterPosition++;
-                             if (positional)
-                               base = parameterPosition;
-                             else
-                               {
-                                 base = currentParam;
-                                 currentParam = base + 1;
-                               }
-                           }
-                         else
-                           {
-                             if (! positional)
-                               currentParam = base + 1;
-                             if (base > maxParam)
-                               maxParam = base;
-                           }
-                         if (currentParam > maxParam)
-                           maxParam = currentParam;
-                       }
-                     else
-                       {
-                         base = StrToLong(&format[index], &tmpformat, BASE_DECIMAL);
-                         if (base > MAX_BASE)
-                           return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-                         index = (int)(tmpformat - format);
-                       }
-                   }
-                 else
-                   {
-                     return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-                   }
-                 break; /* QUALIFIER_DOT */
-
-               case QUALIFIER_PARAM:
-                 type = TYPE_PRINT;
-                 /* FALLTHROUGH */
-               case QUALIFIER_STAR:
-                 /* This has different meanings for print and scan */
-                 if (TYPE_PRINT == type)
-                   {
-                     /* Read with from parameter */
-                     flags |= (FLAGS_WIDTH | FLAGS_WIDTH_PARAMETER);
-                     width = TrioGetPosition(format, &index);
-                     if (width == NO_POSITION)
-                       {
-                         parameterPosition++;
-                         if (positional)
-                           width = parameterPosition;
-                         else
-                           {
-                             width = currentParam;
-                             currentParam = width + 1;
-                           }
-                       }
-                     else
-                       {
-                         if (! positional)
-                           currentParam = width + 1;
-                         if (width > maxParam)
-                           maxParam = width;
-                       }
-                     if (currentParam > maxParam)
-                       maxParam = currentParam;
-                   }
-                 else
-                   {
-                     /* Scan, but do not store result */
-                     flags |= FLAGS_IGNORE;
-                   }
-
-                 break; /* QUALIFIER_STAR */
-
-               case '0':
-                 if (! (flags & FLAGS_LEFTADJUST))
-                   flags |= FLAGS_NILPADDING;
-                 /* FALLTHROUGH */
-               case '1': case '2': case '3': case '4':
-               case '5': case '6': case '7': case '8': case '9':
-                 flags |= FLAGS_WIDTH;
-                 /* &format[index - 1] is used to "rewind" the read
-                  * character from format
-                  */
-                 width = StrToLong(&format[index - 1], &tmpformat, BASE_DECIMAL);
-                 index = (int)(tmpformat - format);
-                 break;
-
-               case QUALIFIER_SHORT:
-                 if (flags & FLAGS_SHORTSHORT)
-                   return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-                 else if (flags & FLAGS_SHORT)
-                   flags |= FLAGS_SHORTSHORT;
-                 else
-                   flags |= FLAGS_SHORT;
-                 break;
-
-               case QUALIFIER_LONG:
-                 if (flags & FLAGS_QUAD)
-                   return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-                 else if (flags & FLAGS_LONG)
-                   flags |= FLAGS_QUAD;
-                 else
-                   flags |= FLAGS_LONG;
-                 break;
-
-               case QUALIFIER_LONG_UPPER:
-                 flags |= FLAGS_LONGDOUBLE;
-                 break;
-
-#if defined(QUALIFIER_SIZE_T)
-               case QUALIFIER_SIZE_T:
-                 flags |= FLAGS_SIZE_T;
-                 /* Modify flags for later truncation of number */
-                 if (sizeof(size_t) == sizeof(trio_ulonglong_t))
-                   flags |= FLAGS_QUAD;
-                 else if (sizeof(size_t) == sizeof(long))
-                   flags |= FLAGS_LONG;
-                 break;
-#endif
-
-#if defined(QUALIFIER_PTRDIFF_T)
-               case QUALIFIER_PTRDIFF_T:
-                 flags |= FLAGS_PTRDIFF_T;
-                 if (sizeof(ptrdiff_t) == sizeof(trio_ulonglong_t))
-                   flags |= FLAGS_QUAD;
-                 else if (sizeof(ptrdiff_t) == sizeof(long))
-                   flags |= FLAGS_LONG;
-                 break;
-#endif
-
-#if defined(QUALIFIER_INTMAX_T)
-               case QUALIFIER_INTMAX_T:
-                 flags |= FLAGS_INTMAX_T;
-                 if (sizeof(trio_intmax_t) == sizeof(trio_ulonglong_t))
-                   flags |= FLAGS_QUAD;
-                 else if (sizeof(trio_intmax_t) == sizeof(long))
-                   flags |= FLAGS_LONG;
-                 break;
-#endif
-
-#if defined(QUALIFIER_QUAD)
-               case QUALIFIER_QUAD:
-                 flags |= FLAGS_QUAD;
-                 break;
-#endif
-
-#if defined(QUALIFIER_FIXED_SIZE)
-               case QUALIFIER_FIXED_SIZE:
-                 if (flags & FLAGS_FIXED_SIZE)
-                   return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-
-                 if (flags & (FLAGS_ALL_SIZES | FLAGS_LONGDOUBLE |
-                              FLAGS_WIDECHAR | FLAGS_VARSIZE_PARAMETER))
-                   return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-
-                 if ((format[index] == '6') &&
-                     (format[index + 1] == '4'))
-                   {
-                     varsize = sizeof(trio_int64_t);
-                     index += 2;
-                   }
-                 else if ((format[index] == '3') &&
-                          (format[index + 1] == '2'))
-                   {
-                     varsize = sizeof(trio_int32_t);
-                     index += 2;
-                   }
-                 else if ((format[index] == '1') &&
-                          (format[index + 1] == '6'))
-                   {
-                     varsize = sizeof(trio_int16_t);
-                     index += 2;
-                   }
-                 else if (format[index] == '8')
-                   {
-                     varsize = sizeof(trio_int8_t);
-                     index++;
-                   }
-                 else
-                   return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-                 
-                 flags |= FLAGS_FIXED_SIZE;
-                 break;
-#endif
-
-#ifdef QUALIFIER_ESCAPE
-               case QUALIFIER_ESCAPE:
-                 switch (format[index++]) {
-                   case 'U': escape = ESCAPE_ULM; break;
-                   case 'X': escape = ESCAPE_XML; break;
-                   case 'S': escape = ESCAPE_SQL; break;
-                   default: return TRIO_ERROR_RETURN(TRIO_EINVAL,index);
-                 }
-                 break;
-#endif
-
-
-#if defined(QUALIFIER_WIDECHAR)
-               case QUALIFIER_WIDECHAR:
-                 flags |= FLAGS_WIDECHAR;
-                 break;
-#endif
-
-#if defined(QUALIFIER_SIZE_T_UPPER)
-               case QUALIFIER_SIZE_T_UPPER:
-                 break;
-#endif
-
-#if defined(QUALIFIER_QUOTE)
-               case QUALIFIER_QUOTE:
-                 flags |= FLAGS_QUOTE;
-                 break;
-#endif
-
-#if defined(QUALIFIER_STICKY)
-               case QUALIFIER_STICKY:
-                 flags |= FLAGS_STICKY;
-                 got_sticky = TRUE;
-                 break;
-#endif
-                 
-#if defined(QUALIFIER_VARSIZE)
-               case QUALIFIER_VARSIZE:
-                 flags |= FLAGS_VARSIZE_PARAMETER;
-                 parameterPosition++;
-                 if (positional)
-                   varsize = parameterPosition;
-                 else
-                   {
-                     varsize = currentParam;
-                     currentParam = varsize + 1;
-                   }
-                 if (currentParam > maxParam)
-                   maxParam = currentParam;
-                 break;
-#endif
-
-               default:
-                 /* Bail out completely to make the error more obvious */
-                  return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-               }
-           } /* while qualifier */
-
-         /*
-          * Parameters only need the type and value. The value is
-          * read later.
-          */
-         if (flags & FLAGS_WIDTH_PARAMETER)
-           {
-#if TRIO_ERRORS
-             usedEntries[width] += 1;
-#endif
-             parameters[pos].type = FORMAT_PARAMETER;
-             indices[width] = pos;
-             width = pos++;
-           }
-         if (flags & FLAGS_PRECISION_PARAMETER)
-           {
-#if TRIO_ERRORS
-             usedEntries[precision] += 1;
-#endif
-             parameters[pos].type = FORMAT_PARAMETER;
-             indices[precision] = pos;
-             precision = pos++;
-           }
-         if (flags & FLAGS_BASE_PARAMETER)
-           {
-#if TRIO_ERRORS
-             usedEntries[base] += 1;
-#endif
-             parameters[pos].type = FORMAT_PARAMETER;
-             indices[base] = pos;
-             base = pos++;
-           }
-         if (flags & FLAGS_VARSIZE_PARAMETER)
-           {
-#if TRIO_ERRORS
-             usedEntries[varsize] += 1;
-#endif
-             parameters[pos].type = FORMAT_PARAMETER;
-             indices[varsize] = pos;
-             varsize = pos++;
-           }
-         
-         indices[currentParam] = pos;
-         
-         switch (format[index++])
-           {
-#if defined(SPECIFIER_CHAR_UPPER)
-           case SPECIFIER_CHAR_UPPER:
-             flags |= FLAGS_WIDECHAR;
-             /* FALLTHROUGH */
-#endif
-           case SPECIFIER_CHAR:
-             if (flags & FLAGS_LONG)
-               flags |= FLAGS_WIDECHAR;
-             else if (flags & FLAGS_SHORT)
-               flags &= ~FLAGS_WIDECHAR;
-             parameters[pos].type = FORMAT_CHAR;
-             break;
-
-#if defined(SPECIFIER_STRING_UPPER)
-           case SPECIFIER_STRING_UPPER:
-             flags |= FLAGS_WIDECHAR;
-             /* FALLTHROUGH */
-#endif
-           case SPECIFIER_STRING:
-             if (flags & FLAGS_LONG)
-               flags |= FLAGS_WIDECHAR;
-             else if (flags & FLAGS_SHORT)
-               flags &= ~FLAGS_WIDECHAR;
-             parameters[pos].type = FORMAT_STRING;
-             break;
-
-
-           case SPECIFIER_GROUP:
-             if (TYPE_SCAN == type)
-               {
-                 int depth = 1;
-                 parameters[pos].type = FORMAT_GROUP;
-                 if (format[index] == QUALIFIER_CIRCUMFLEX)
-                   index++;
-                 if (format[index] == SPECIFIER_UNGROUP)
-                   index++;
-                 if (format[index] == QUALIFIER_MINUS)
-                   index++;
-                 /* Skip nested brackets */
-                 while (format[index] != NIL)
-                   {
-                     if (format[index] == SPECIFIER_GROUP)
-                       {
-                         depth++;
-                       }
-                     else if (format[index] == SPECIFIER_UNGROUP)
-                       {
-                         if (--depth <= 0)
-                           {
-                             index++;
-                             break;
-                           }
-                       }
-                     index++;
-                   }
-               }
-             break;
-             
-           case SPECIFIER_INTEGER:
-             parameters[pos].type = FORMAT_INT;
-             break;
-             
-           case SPECIFIER_UNSIGNED:
-             flags |= FLAGS_UNSIGNED;
-             parameters[pos].type = FORMAT_INT;
-             break;
-
-           case SPECIFIER_DECIMAL:
-             /* Disable base modifier */
-             flags &= ~FLAGS_BASE_PARAMETER;
-             base = BASE_DECIMAL;
-             parameters[pos].type = FORMAT_INT;
-             break;
-
-           case SPECIFIER_OCTAL:
-             flags &= ~FLAGS_BASE_PARAMETER;
-             base = BASE_OCTAL;
-             parameters[pos].type = FORMAT_INT;
-             break;
-
-#if defined(SPECIFIER_BINARY)
-           case SPECIFIER_BINARY_UPPER:
-             flags |= FLAGS_UPPER;
-             /* FALLTHROUGH */
-           case SPECIFIER_BINARY:
-             flags |= FLAGS_NILPADDING;
-             flags &= ~FLAGS_BASE_PARAMETER;
-             base = BASE_BINARY;
-             parameters[pos].type = FORMAT_INT;
-             break;
-#endif
-
-           case SPECIFIER_HEX_UPPER:
-             flags |= FLAGS_UPPER;
-             /* FALLTHROUGH */
-           case SPECIFIER_HEX:
-             flags |= FLAGS_UNSIGNED;
-             flags &= ~FLAGS_BASE_PARAMETER;
-             base = BASE_HEX;
-             parameters[pos].type = FORMAT_INT;
-             break;
-
-           case SPECIFIER_FLOAT_E_UPPER:
-             flags |= FLAGS_UPPER;
-             /* FALLTHROUGH */
-           case SPECIFIER_FLOAT_E:
-             flags |= FLAGS_FLOAT_E;
-             parameters[pos].type = FORMAT_DOUBLE;
-             break;
-
-           case SPECIFIER_FLOAT_G_UPPER:
-             flags |= FLAGS_UPPER;
-             /* FALLTHROUGH */
-           case SPECIFIER_FLOAT_G:
-             flags |= FLAGS_FLOAT_G;
-             parameters[pos].type = FORMAT_DOUBLE;
-             break;
-
-           case SPECIFIER_FLOAT_F_UPPER:
-             flags |= FLAGS_UPPER;
-             /* FALLTHROUGH */
-           case SPECIFIER_FLOAT_F:
-             parameters[pos].type = FORMAT_DOUBLE;
-             break;
-
-           case SPECIFIER_POINTER:
-             parameters[pos].type = FORMAT_POINTER;
-             break;
-
-           case SPECIFIER_COUNT:
-             parameters[pos].type = FORMAT_COUNT;
-             break;
-
-#if defined(SPECIFIER_HEXFLOAT)
-# if defined(SPECIFIER_HEXFLOAT_UPPER)
-           case SPECIFIER_HEXFLOAT_UPPER:
-             flags |= FLAGS_UPPER;
-             /* FALLTHROUGH */
-# endif
-           case SPECIFIER_HEXFLOAT:
-             base = BASE_HEX;
-             parameters[pos].type = FORMAT_DOUBLE;
-             break;
-#endif
-
-#if defined(FORMAT_ERRNO)
-           case SPECIFIER_ERRNO:
-             parameters[pos].type = FORMAT_ERRNO;
-             break;
-#endif
-
-#if defined(SPECIFIER_USER_DEFINED_BEGIN)
-           case SPECIFIER_USER_DEFINED_BEGIN:
-             {
-               unsigned int max;
-               int without_namespace = TRUE;
-               
-               parameters[pos].type = FORMAT_USER_DEFINED;
-               parameters[pos].user_name[0] = NIL;
-               tmpformat = (char *)&format[index];
-             
-               while ((ch = format[index]))
-                 {
-                   index++;
-                   if (ch == SPECIFIER_USER_DEFINED_END)
-                     {
-                       if (without_namespace)
-                         {
-                           /* We must get the handle first */
-                           parameters[pos].type = FORMAT_PARAMETER;
-                           parameters[pos].indexAfterSpecifier = index;
-                           parameters[pos].flags = FLAGS_USER_DEFINED;
-                           /* Adjust parameters for insertion of new one */
-                           pos++;
-# if TRIO_ERRORS
-                           usedEntries[currentParam] += 1;
-# endif
-                           parameters[pos].type = FORMAT_USER_DEFINED;
-                           currentParam++;
-                           indices[currentParam] = pos;
-                           if (currentParam > maxParam)
-                             maxParam = currentParam;
-                         }
-                       /* Copy the user data */
-                       max = (unsigned int)(&format[index] - tmpformat);
-                       if (max > MAX_USER_DATA)
-                         max = MAX_USER_DATA;
-                       StrCopyMax(parameters[pos].user_data,
-                                  max,
-                                  tmpformat);
-                       break; /* while */
-                     }
-                   if (ch == SPECIFIER_USER_DEFINED_SEPARATOR)
-                     {
-                       without_namespace = FALSE;
-                       /* Copy the namespace for later looking-up */
-                       max = (int)(&format[index] - tmpformat);
-                       if (max > MAX_USER_NAME)
-                         max = MAX_USER_NAME;
-                       StrCopyMax(parameters[pos].user_name,
-                                  max,
-                                  tmpformat);
-                       tmpformat = (char *)&format[index];
-                     }
-                 }
-               if (ch != SPECIFIER_USER_DEFINED_END)
-                 return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-             }
-             break;
-#endif /* defined(SPECIFIER_USER_DEFINED_BEGIN) */
-             
-           default:
-             /* Bail out completely to make the error more obvious */
-              return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-           }
-
-#if TRIO_ERRORS
-         /*  Count the number of times this entry has been used */
-         usedEntries[currentParam] += 1;
-#endif
-         
-         /* Find last sticky parameters */
-         if (got_sticky && !(flags & FLAGS_STICKY))
-           {
-             for (i = pos - 1; i >= 0; i--)
-               {
-                 if (parameters[i].type == FORMAT_PARAMETER)
-                   continue;
-                 if ((parameters[i].flags & FLAGS_STICKY) &&
-                     (parameters[i].type == parameters[pos].type))
-                   {
-                     /* Do not overwrite current qualifiers */
-                     flags |= (parameters[i].flags & (unsigned long)~FLAGS_STICKY);
-                     if (width == NO_WIDTH)
-                       width = parameters[i].width;
-                     if (precision == NO_PRECISION)
-                       precision = parameters[i].precision;
-                     if (base == NO_BASE)
-                       base = parameters[i].base;
-                     break;
-                   }
-               }
-           }
-         
-         parameters[pos].indexAfterSpecifier = index;
-         parameters[pos].flags = flags;
-         parameters[pos].width = width;
-         parameters[pos].precision = precision;
-         parameters[pos].base = (base == NO_BASE) ? BASE_DECIMAL : base;
-         parameters[pos].varsize = varsize;
-#ifdef QUALIFIER_ESCAPE
-         parameters[pos].escape = escape;
-#endif
-         pos++;
-         
-         if (! positional)
-           parameterPosition++;
-         
-       } /* if identifier */
-      
-    } /* while format characters left */
-
-  for (num = 0; num <= maxParam; num++)
-    {
-#if TRIO_ERRORS
-      if (usedEntries[num] != 1)
-       {
-         if (usedEntries[num] == 0) /* gap detected */
-           return TRIO_ERROR_RETURN(TRIO_EGAP, num);
-         else /* double references detected */
-           return TRIO_ERROR_RETURN(TRIO_EDBLREF, num);
-       }
-#endif
-      
-      i = indices[num];
-
-      /*
-       * FORMAT_PARAMETERS are only present if they must be read,
-       * so it makes no sense to check the ignore flag (besides,
-       * the flags variable is not set for that particular type)
-       */
-      if ((parameters[i].type != FORMAT_PARAMETER) &&
-         (parameters[i].flags & FLAGS_IGNORE))
-       continue; /* for all arguments */
-
-      /*
-       * The stack arguments are read according to ANSI C89
-       * default argument promotions:
-       *
-       *  char           = int
-       *  short          = int
-       *  unsigned char  = unsigned int
-       *  unsigned short = unsigned int
-       *  float          = double
-       *
-       * In addition to the ANSI C89 these types are read (the
-       * default argument promotions of C99 has not been
-       * considered yet)
-       *
-       *  long long
-       *  long double
-       *  size_t
-       *  ptrdiff_t
-       *  intmax_t
-       */
-      switch (parameters[i].type)
-       {
-       case FORMAT_GROUP:
-       case FORMAT_STRING:
-#if TRIO_WIDECHAR
-         if (flags & FLAGS_WIDECHAR)
-           {
-             parameters[i].data.wstring = (argarray == NULL)
-               ? va_arg(arglist, wchar_t *)
-               : (wchar_t *)(argarray[num]);
-           }
-         else
-#endif
-           {
-             parameters[i].data.string = (argarray == NULL)
-               ? va_arg(arglist, char *)
-               : (char *)(argarray[num]);
-           }
-         break;
-
-       case FORMAT_POINTER:
-       case FORMAT_COUNT:
-       case FORMAT_USER_DEFINED:
-       case FORMAT_UNKNOWN:
-         parameters[i].data.pointer = (argarray == NULL)
-           ? va_arg(arglist, void *)
-           : argarray[num];
-         break;
-
-       case FORMAT_CHAR:
-       case FORMAT_INT:
-         if (TYPE_SCAN == type)
-           {
-              if (argarray == NULL)
-                parameters[i].data.pointer = 
-                  (trio_uintmax_t *)va_arg(arglist, void *);
-              else
-                {
-                  if (parameters[i].type == FORMAT_CHAR)
-                    parameters[i].data.pointer =
-                      (trio_uintmax_t *)((char *)argarray[num]);
-                  else if (parameters[i].flags & FLAGS_SHORT)
-                    parameters[i].data.pointer =
-                      (trio_uintmax_t *)((short *)argarray[num]);
-                  else
-                    parameters[i].data.pointer =
-                      (trio_uintmax_t *)((int *)argarray[num]);
-                }
-           }
-         else
-           {
-#if defined(QUALIFIER_VARSIZE) || defined(QUALIFIER_FIXED_SIZE)
-             if ((parameters[i].flags & FLAGS_VARSIZE_PARAMETER) ||
-                 (parameters[i].flags & FLAGS_FIXED_SIZE))
-               {
-                 if (parameters[i].flags & FLAGS_VARSIZE_PARAMETER)
-                   {
-                     /*
-                      * Variable sizes are mapped onto the fixed sizes, in
-                      * accordance with integer promotion.
-                      *
-                      * Please note that this may not be portable, as we
-                      * only guess the size, not the layout of the numbers.
-                      * For example, if int is little-endian, and long is
-                      * big-endian, then this will fail.
-                      */
-                     varsize = (int)parameters[parameters[i].varsize].data.number.as_unsigned;
-                   }
-                 else
-                   {
-                     /* Used for the I<bits> modifiers */
-                     varsize = parameters[i].varsize;
-                   }
-                 parameters[i].flags &= ~FLAGS_ALL_VARSIZES;
-                 
-                 if (varsize <= (int)sizeof(int))
-                   ;
-                 else if (varsize <= (int)sizeof(long))
-                   parameters[i].flags |= FLAGS_LONG;
-#if defined(QUALIFIER_INTMAX_T)
-                 else if (varsize <= (int)sizeof(trio_longlong_t))
-                   parameters[i].flags |= FLAGS_QUAD;
-                 else
-                   parameters[i].flags |= FLAGS_INTMAX_T;
-#else
-                 else
-                   parameters[i].flags |= FLAGS_QUAD;
-#endif
-               }
-#endif /* defined(QUALIFIER_VARSIZE) */
-#if defined(QUALIFIER_SIZE_T) || defined(QUALIFIER_SIZE_T_UPPER)
-             if (parameters[i].flags & FLAGS_SIZE_T)
-               parameters[i].data.number.as_unsigned = (argarray == NULL)
-                 ? (trio_uintmax_t)va_arg(arglist, size_t)
-                 : (trio_uintmax_t)(*((size_t *)argarray[num]));
-             else
-#endif
-#if defined(QUALIFIER_PTRDIFF_T)
-             if (parameters[i].flags & FLAGS_PTRDIFF_T)
-               parameters[i].data.number.as_unsigned = (argarray == NULL)
-                 ? (trio_uintmax_t)va_arg(arglist, ptrdiff_t)
-                 : (trio_uintmax_t)(*((ptrdiff_t *)argarray[num]));
-             else
-#endif
-#if defined(QUALIFIER_INTMAX_T)
-             if (parameters[i].flags & FLAGS_INTMAX_T)
-               parameters[i].data.number.as_unsigned = (argarray == NULL)
-                 ? (trio_uintmax_t)va_arg(arglist, trio_intmax_t)
-                 : (trio_uintmax_t)(*((trio_intmax_t *)argarray[num]));
-             else
-#endif
-             if (parameters[i].flags & FLAGS_QUAD)
-               parameters[i].data.number.as_unsigned = (argarray == NULL)
-                 ? (trio_uintmax_t)va_arg(arglist, trio_ulonglong_t)
-                 : (trio_uintmax_t)(*((trio_ulonglong_t *)argarray[num]));
-             else if (parameters[i].flags & FLAGS_LONG)
-               parameters[i].data.number.as_unsigned = (argarray == NULL)
-                 ? (trio_uintmax_t)va_arg(arglist, long)
-                 : (trio_uintmax_t)(*((long *)argarray[num]));
-             else
-               {
-                 if (argarray == NULL)
-                   parameters[i].data.number.as_unsigned = (trio_uintmax_t)va_arg(arglist, int);
-                 else
-                   {
-                     if (parameters[i].type == FORMAT_CHAR)
-                       parameters[i].data.number.as_unsigned = (trio_uintmax_t)(*((char *)argarray[num]));
-                     else if (parameters[i].flags & FLAGS_SHORT)
-                       parameters[i].data.number.as_unsigned = (trio_uintmax_t)(*((short *)argarray[num]));
-                     else
-                       parameters[i].data.number.as_unsigned = (trio_uintmax_t)(*((int *)argarray[num]));
-                   }
-               }
-           }
-         break;
-
-       case FORMAT_PARAMETER:
-         /*
-          * The parameter for the user-defined specifier is a pointer,
-          * whereas the rest (width, precision, base) uses an integer.
-          */
-         if (parameters[i].flags & FLAGS_USER_DEFINED)
-           parameters[i].data.pointer = (argarray == NULL)
-             ? va_arg(arglist, void *)
-             : argarray[num];
-         else
-           parameters[i].data.number.as_unsigned = (argarray == NULL)
-             ? (trio_uintmax_t)va_arg(arglist, int)
-             : (trio_uintmax_t)(*((int *)argarray[num]));
-         break;
-
-       case FORMAT_DOUBLE:
-         if (TYPE_SCAN == type)
-           {
-             if (parameters[i].flags & FLAGS_LONG)
-               parameters[i].data.longdoublePointer = (argarray == NULL)
-                 ? va_arg(arglist, long double *)
-                 : (long double *)((long double *)argarray[num]);
-             else
-                {
-                  if (argarray == NULL)
-                    parameters[i].data.doublePointer =
-                      va_arg(arglist, double *);
-                 else
-                   {
-                     if (parameters[i].flags & FLAGS_SHORT)
-                       parameters[i].data.doublePointer =
-                         (double *)((float *)argarray[num]);
-                     else
-                       parameters[i].data.doublePointer =
-                         (double *)((double *)argarray[num]);
-                   }
-                }
-           }
-         else
-           {
-             if (parameters[i].flags & FLAGS_LONG)
-               parameters[i].data.longdoubleNumber = (argarray == NULL)
-                 ? va_arg(arglist, long double)
-                 : (long double)(*((long double *)argarray[num]));
-             else
-               {
-                 if (argarray == NULL)
-                   parameters[i].data.longdoubleNumber = (long double)va_arg(arglist, double);
-                 else
-                   {
-                     if (parameters[i].flags & FLAGS_SHORT)
-                       parameters[i].data.longdoubleNumber = (long double)(*((float *)argarray[num]));
-                     else
-                       parameters[i].data.longdoubleNumber = (long double)(long double)(*((double *)argarray[num]));
-                   }
-               }
-           }
-         break;
-
-#if defined(FORMAT_ERRNO)
-       case FORMAT_ERRNO:
-         parameters[i].data.errorNumber = errno;
-         break;
-#endif
-
-       default:
-         break;
-       }
-    } /* for all specifiers */
-  return num;
-}
-
-
-/*************************************************************************
- *
- * @FORMATTING
- *
- ************************************************************************/
-
-
-/*************************************************************************
- * TrioWriteNumber [private]
- *
- * Description:
- *  Output a number.
- *  The complexity of this function is a result of the complexity
- *  of the dependencies of the flags.
- */
-static void
-TrioWriteNumber(trio_T *self,
-               trio_uintmax_t number,
-               unsigned long flags,
-               int width,
-               int precision,
-               int base)
-{
-  BOOLEAN_T isNegative;
-  char buffer[MAX_CHARS_IN(trio_uintmax_t) * (1 + MAX_LOCALE_SEPARATOR_LENGTH) + 1];
-  char *bufferend;
-  char *pointer;
-  const char *digits;
-  int i;
-  int length;
-  char *p;
-  int charsPerThousand;
-  int groupingIndex;
-  int count;
-
-  assert(VALID(self));
-  assert(VALID(self->OutStream));
-  assert((base >= MIN_BASE && base <= MAX_BASE) || (base == NO_BASE));
-
-  digits = (flags & FLAGS_UPPER) ? internalDigitsUpper : internalDigitsLower;
-
-  isNegative = (flags & FLAGS_UNSIGNED)
-    ? FALSE
-    : ((trio_intmax_t)number < 0);
-  if (isNegative)
-    number = -number;
-
-  if (flags & FLAGS_QUAD)
-    number &= (trio_ulonglong_t)-1;
-  else if (flags & FLAGS_LONG)
-    number &= (unsigned long)-1;
-  else
-    number &= (unsigned int)-1;
-  
-  /* Build number */
-  pointer = bufferend = &buffer[sizeof(buffer) - 1];
-  *pointer-- = NIL;
-  charsPerThousand = (int)internalGrouping[0];
-  groupingIndex = 1;
-  for (i = 1; i < (int)sizeof(buffer); i++)
-    {
-      *pointer-- = digits[number % base];
-      number /= base;
-      if (number == 0)
-       break;
-
-      if ((flags & FLAGS_QUOTE)
-         && (charsPerThousand != NO_GROUPING)
-         && (i % charsPerThousand == 0))
-       {
-         /*
-          * We are building the number from the least significant
-          * to the most significant digit, so we have to copy the
-          * thousand separator backwards
-          */
-         length = StrLength(internalThousandSeparator);
-         if (((int)(pointer - buffer) - length) > 0)
-           {
-             p = &internalThousandSeparator[length - 1];
-             while (length-- > 0)
-               *pointer-- = *p--;
-           }
-
-         /* Advance to next grouping number */
-         switch (internalGrouping[groupingIndex])
-           {
-           case CHAR_MAX: /* Disable grouping */
-             charsPerThousand = NO_GROUPING;
-             break;
-           case 0: /* Repeat last group */
-             break;
-           default:
-             charsPerThousand = (int)internalGrouping[groupingIndex++];
-             break;
-           }
-       }
-    }
-
-  /* Adjust width */
-  width -= (bufferend - pointer) - 1;
-
-  /* Adjust precision */
-  if (NO_PRECISION != precision)
-    {
-      precision -= (bufferend - pointer) - 1;
-      if (precision < 0)
-       precision = 0;
-      flags |= FLAGS_NILPADDING;
-    }
-
-  /* Adjust width further */
-  if (isNegative || (flags & FLAGS_SHOWSIGN) || (flags & FLAGS_SPACE))
-    width--;
-  if (flags & FLAGS_ALTERNATIVE)
-    {
-      switch (base)
-       {
-       case BASE_BINARY:
-       case BASE_HEX:
-         width -= 2;
-         break;
-       case BASE_OCTAL:
-         width--;
-         break;
-       default:
-         break;
-       }
-    }
-
-  /* Output prefixes spaces if needed */
-  if (! ((flags & FLAGS_LEFTADJUST) ||
-        ((flags & FLAGS_NILPADDING) && (precision == NO_PRECISION))))
-    {
-      count = (precision == NO_PRECISION) ? 0 : precision;
-      while (width-- > count)
-       self->OutStream(self, CHAR_ADJUST);
-    }
-
-  /* width has been adjusted for signs and alternatives */
-  if (isNegative)
-    self->OutStream(self, '-');
-  else if (flags & FLAGS_SHOWSIGN)
-    self->OutStream(self, '+');
-  else if (flags & FLAGS_SPACE)
-    self->OutStream(self, ' ');
-
-  if (flags & FLAGS_ALTERNATIVE)
-    {
-      switch (base)
-       {
-       case BASE_BINARY:
-         self->OutStream(self, '0');
-         self->OutStream(self, (flags & FLAGS_UPPER) ? 'B' : 'b');
-         break;
-
-       case BASE_OCTAL:
-         self->OutStream(self, '0');
-         break;
-
-       case BASE_HEX:
-         self->OutStream(self, '0');
-         self->OutStream(self, (flags & FLAGS_UPPER) ? 'X' : 'x');
-         break;
-
-       default:
-         break;
-       } /* switch base */
-    }
-
-  /* Output prefixed zero padding if needed */
-  if (flags & FLAGS_NILPADDING)
-    {
-      if (precision == NO_PRECISION)
-       precision = width;
-      while (precision-- > 0)
-       {
-         self->OutStream(self, '0');
-         width--;
-       }
-    }
-
-  /* Output the number itself */
-  while (*(++pointer))
-    {
-      self->OutStream(self, *pointer);
-    }
-
-  /* Output trailing spaces if needed */
-  if (flags & FLAGS_LEFTADJUST)
-    {
-      while (width-- > 0)
-       self->OutStream(self, CHAR_ADJUST);
-    }
-}
-
-/*************************************************************************
- * TrioWriteStringCharacter [private]
- *
- * Description:
- *  Output a single character of a string
- */
-static void
-TrioWriteStringCharacter(trio_T *self,
-                        int ch,
-                        unsigned long flags)
-{
-  if (flags & FLAGS_ALTERNATIVE)
-    {
-      if (! (isprint(ch) || isspace(ch)))
-       {
-         /*
-          * Non-printable characters are converted to C escapes or
-          * \number, if no C escape exists.
-          */
-         self->OutStream(self, CHAR_BACKSLASH);
-         switch (ch)
-           {
-           case '\007': self->OutStream(self, 'a'); break;
-           case '\b': self->OutStream(self, 'b'); break;
-           case '\f': self->OutStream(self, 'f'); break;
-           case '\n': self->OutStream(self, 'n'); break;
-           case '\r': self->OutStream(self, 'r'); break;
-           case '\t': self->OutStream(self, 't'); break;
-           case '\v': self->OutStream(self, 'v'); break;
-           case '\\': self->OutStream(self, '\\'); break;
-           default:
-             self->OutStream(self, 'x');
-             TrioWriteNumber(self, (trio_intmax_t)ch,
-                             FLAGS_UNSIGNED | FLAGS_NILPADDING,
-                             2, 2, BASE_HEX);
-             break;
-           }
-       }
-      else if (ch == CHAR_BACKSLASH)
-       {
-         self->OutStream(self, CHAR_BACKSLASH);
-         self->OutStream(self, CHAR_BACKSLASH);
-       }
-      else
-       {
-         self->OutStream(self, ch);
-       }
-    }
-  else
-    {
-      self->OutStream(self, ch);
-    }
-}
-
-/*************************************************************************
- * TrioWriteString [private]
- *
- * Description:
- *  Output a string
- */
-static void
-TrioWriteString(trio_T *self,
-               const char *string,
-               unsigned long flags,
-               int width,
-               int precision)
-{
-  int length;
-  int ch;
-
-  assert(VALID(self));
-  assert(VALID(self->OutStream));
-
-  if (string == NULL)
-    {
-      string = null;
-      length = sizeof(null) - 1;
-      /* Disable quoting for the null pointer */
-      flags &= (~FLAGS_QUOTE);
-      width = 0;
-    }
-  else
-    {
-      length = StrLength(string);
-    }
-  if ((NO_PRECISION != precision) &&
-      (precision < length))
-    {
-      length = precision;
-    }
-  width -= length;
-
-  if (flags & FLAGS_QUOTE)
-    self->OutStream(self, CHAR_QUOTE);
-
-  if (! (flags & FLAGS_LEFTADJUST))
-    {
-      while (width-- > 0)
-       self->OutStream(self, CHAR_ADJUST);
-    }
-
-  while (length-- > 0)
-    {
-      /* The ctype parameters must be an unsigned char (or EOF) */
-      ch = (int)((unsigned char)(*string++));
-      TrioWriteStringCharacter(self, ch, flags);
-    }
-
-  if (flags & FLAGS_LEFTADJUST)
-    {
-      while (width-- > 0)
-       self->OutStream(self, CHAR_ADJUST);
-    }
-  if (flags & FLAGS_QUOTE)
-    self->OutStream(self, CHAR_QUOTE);
-}
-
-/*************************************************************************
- * TrioWriteWideStringCharacter [private]
- *
- * Description:
- *  Output a wide string as a multi-byte sequence
- */
-#if TRIO_WIDECHAR
-static int
-TrioWriteWideStringCharacter(trio_T *self,
-                            wchar_t wch,
-                            unsigned long flags,
-                            int width)
-{
-  int size;
-  int i;
-  int ch;
-  char *string;
-  char buffer[MB_LEN_MAX + 1];
-
-  if (width == NO_WIDTH)
-    width = sizeof(buffer);
-  
-  size = wctomb(buffer, wch);
-  if ((size <= 0) || (size > width) || (buffer[0] == NIL))
-    return 0;
-
-  string = buffer;
-  i = size;
-  while ((width >= i) && (width-- > 0) && (i-- > 0))
-    {
-      /* The ctype parameters must be an unsigned char (or EOF) */
-      ch = (int)((unsigned char)(*string++));
-      TrioWriteStringCharacter(self, ch, flags);
-    }
-  return size;
-}
-#endif /* TRIO_WIDECHAR */
-
-/*************************************************************************
- * TrioWriteString [private]
- *
- * Description:
- *  Output a wide character string as a multi-byte string
- */
-#if TRIO_WIDECHAR
-static void
-TrioWriteWideString(trio_T *self,
-                   const wchar_t *wstring,
-                   unsigned long flags,
-                   int width,
-                   int precision)
-{
-  int length;
-  int size;
-
-  assert(VALID(self));
-  assert(VALID(self->OutStream));
-
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  mblen(NULL, 0);
-#endif
-  
-  if (wstring == NULL)
-    {
-      TrioWriteString(self, NULL, flags, width, precision);
-      return;
-    }
-  
-  if (NO_PRECISION == precision)
-    {
-      length = INT_MAX;
-    }
-  else
-    {
-      length = precision;
-      width -= length;
-    }
-
-  if (flags & FLAGS_QUOTE)
-    self->OutStream(self, CHAR_QUOTE);
-
-  if (! (flags & FLAGS_LEFTADJUST))
-    {
-      while (width-- > 0)
-       self->OutStream(self, CHAR_ADJUST);
-    }
-
-  while (length > 0)
-    {
-      size = TrioWriteWideStringCharacter(self, *wstring++, flags, length);
-      if (size == 0)
-       break; /* while */
-      length -= size;
-    }
-
-  if (flags & FLAGS_LEFTADJUST)
-    {
-      while (width-- > 0)
-       self->OutStream(self, CHAR_ADJUST);
-    }
-  if (flags & FLAGS_QUOTE)
-    self->OutStream(self, CHAR_QUOTE);
-}
-#endif /* TRIO_WIDECHAR */
-
-/*************************************************************************
- * TrioWriteDouble [private]
- */
-static void
-TrioWriteDouble(trio_T *self,
-               long double longdoubleNumber,
-               unsigned long flags,
-               int width,
-               int precision,
-               int base)
-{
-  int charsPerThousand;
-  int length;
-  double number;
-  double workNumber;
-  int integerDigits;
-  int fractionDigits;
-  int exponentDigits;
-  int expectedWidth;
-  int exponent;
-  unsigned int uExponent = 0;
-  double dblBase;
-  BOOLEAN_T isNegative;
-  BOOLEAN_T isExponentNegative = FALSE;
-  BOOLEAN_T isHex;
-  const char *digits;
-  char numberBuffer[MAX_MANTISSA_DIGITS
-                  * (1 + MAX_LOCALE_SEPARATOR_LENGTH) + 1];
-  char *numberPointer;
-  char exponentBuffer[MAX_EXPONENT_DIGITS + 1];
-  char *exponentPointer = NULL;
-  int groupingIndex;
-  char *work;
-  int i;
-  BOOLEAN_T onlyzero;
-  int zeroes = 0;
-  
-  assert(VALID(self));
-  assert(VALID(self->OutStream));
-  assert(base == BASE_DECIMAL || base == BASE_HEX);
-
-  number = (double)longdoubleNumber;
-  
-  /* Look for infinite numbers and non-a-number first */
-  switch (TrioIsInfinite(number))
-    {
-    case 1:
-      /* Positive infinity */
-      TrioWriteString(self,
-                     (flags & FLAGS_UPPER)
-                     ? INFINITE_UPPER
-                     : INFINITE_LOWER,
-                     flags, width, precision);
-      return;
-
-    case -1:
-      /* Negative infinity */
-      TrioWriteString(self,
-                     (flags & FLAGS_UPPER)
-                     ? "-" INFINITE_UPPER
-                     : "-" INFINITE_LOWER,
-                     flags, width, precision);
-      return;
-
-    default:
-      /* Finitude */
-      break;
-    }
-  if (TrioIsNan(number))
-    {
-      TrioWriteString(self,
-                     (flags & FLAGS_UPPER)
-                     ? NAN_UPPER
-                     : NAN_LOWER,
-                     flags, width, precision);
-      return;
-    }
-
-  /* Normal numbers */
-  digits = (flags & FLAGS_UPPER) ? internalDigitsUpper : internalDigitsLower;
-  isHex = (base == BASE_HEX);
-  dblBase = (double)base;
-  
-  if (precision == NO_PRECISION)
-    precision = FLT_DIG;
-  
-  isNegative = (number < 0.0);
-  if (isNegative)
-    number = -number;
-
-  if ((flags & FLAGS_FLOAT_G) || isHex)
-    {
-      if (precision == 0)
-       precision = 1;
-
-      if ((number < 1.0e-4) || (number > pow(10.0, (double)precision)))
-       {
-         /* Use scientific notation */
-         flags |= FLAGS_FLOAT_E;
-       }
-      else if (number < 1.0)
-       {
-         /*
-          * Use normal notation. If the integer part of the number is
-          * zero, then adjust the precision to include leading fractional
-          * zeros.
-          */
-         workNumber = fabs(guarded_log10(number));
-         if (workNumber - floor(workNumber) < 0.001)
-           workNumber--;
-         zeroes = (int)floor(workNumber);
-       }
-    }
-
-  if (flags & FLAGS_FLOAT_E)
-    {
-      /* Scale the number */
-      workNumber = guarded_log10(number);
-      if (workNumber == -HUGE_VAL)
-       {
-         exponent = 0;
-         /* Undo setting */
-         if (flags & FLAGS_FLOAT_G)
-           flags &= ~FLAGS_FLOAT_E;
-       }
-      else
-       {
-         exponent = (int)floor(workNumber);
-         number /= pow(10.0, (double)exponent);
-         isExponentNegative = (exponent < 0);
-         uExponent = (isExponentNegative) ? -exponent : exponent;
-         /* No thousand separators */
-         flags &= ~FLAGS_QUOTE;
-       }
-    }
-
-  /*
-   * Truncated number.
-   *
-   * precision is number of significant digits for FLOAT_G
-   * and number of fractional digits for others
-   */
-  integerDigits = (floor(number) > DBL_EPSILON)
-    ? 1 + (int)guarded_log10(floor(number))
-    : 1;
-  fractionDigits = ((flags & FLAGS_FLOAT_G) && (zeroes == 0))
-    ? precision - integerDigits
-    : zeroes + precision;
-  
-  number = floor(0.5 + number * pow(dblBase, (double)fractionDigits));
-  workNumber = (isHex
-               ? guarded_log16(0.5 + number)
-               : guarded_log10(0.5 + number));
-  if ((int)workNumber + 1 > integerDigits + fractionDigits)
-    {
-      if (flags & FLAGS_FLOAT_E)
-       {
-         /* Adjust if number was rounded up one digit (ie. 0.99 to 1.00) */
-         exponent--;
-         uExponent -= (isExponentNegative) ? 1 : -1;
-         number /= dblBase;
-       }
-      else
-       {
-         /* Adjust if number was rounded up one digit (ie. 99 to 100) */
-         integerDigits++;
-       }
-    }
-  
-  /* Build the fraction part */
-  numberPointer = &numberBuffer[sizeof(numberBuffer) - 1];
-  *numberPointer = NIL;
-  onlyzero = TRUE;
-  for (i = 0; i < fractionDigits; i++)
-    {
-      *(--numberPointer) = digits[(int)fmod(number, dblBase)];
-      number = floor(number / dblBase);
-
-      if ((flags & FLAGS_FLOAT_G) && !(flags & FLAGS_ALTERNATIVE))
-        {
-          /* Prune trailing zeroes */
-          if (numberPointer[0] != digits[0])
-            onlyzero = FALSE;
-          else if (onlyzero && (numberPointer[0] == digits[0]))
-            numberPointer++;
-        }
-      else
-        onlyzero = FALSE;
-    }
-  
-  /* Insert decimal point */
-  if ((flags & FLAGS_ALTERNATIVE) || ((fractionDigits > 0) && !onlyzero))
-    {
-      i = StrLength(internalDecimalPoint);
-      while (i> 0)
-       {
-         *(--numberPointer) = internalDecimalPoint[--i];
-       }
-    }
-  /* Insert the integer part and thousand separators */
-  charsPerThousand = (int)internalGrouping[0];
-  groupingIndex = 1;
-  for (i = 1; i < integerDigits + 1; i++)
-    {
-      *(--numberPointer) = digits[(int)fmod(number, dblBase)];
-      number = floor(number / dblBase);
-      if (number < DBL_EPSILON)
-       break;
-
-      if ((i > 0)
-         && ((flags & (FLAGS_FLOAT_E | FLAGS_QUOTE)) == FLAGS_QUOTE)
-         && (charsPerThousand != NO_GROUPING)
-         && (i % charsPerThousand == 0))
-       {
-         /*
-          * We are building the number from the least significant
-          * to the most significant digit, so we have to copy the
-          * thousand separator backwards
-          */
-         length = StrLength(internalThousandSeparator);
-         integerDigits += length;
-         if (((int)(numberPointer - numberBuffer) - length) > 0)
-           {
-             work = &internalThousandSeparator[length - 1];
-             while (length-- > 0)
-               *(--numberPointer) = *work--;
-           }
-
-         /* Advance to next grouping number */
-         if (charsPerThousand != NO_GROUPING)
-           {
-             switch (internalGrouping[groupingIndex])
-               {
-               case CHAR_MAX: /* Disable grouping */
-                 charsPerThousand = NO_GROUPING;
-                 break;
-               case 0: /* Repeat last group */
-                 break;
-               default:
-                 charsPerThousand = (int)internalGrouping[groupingIndex++];
-                 break;
-               }
-           }
-       }
-    }
-  
-  /* Build the exponent */
-  exponentDigits = 0;
-  if (flags & FLAGS_FLOAT_E)
-    {
-      exponentPointer = &exponentBuffer[sizeof(exponentBuffer) - 1];
-      *exponentPointer-- = NIL;
-      do {
-       *exponentPointer-- = digits[uExponent % base];
-       uExponent /= base;
-       exponentDigits++;
-      } while (uExponent);
-    }
-
-  /*
-   * Calculate expected width.
-   *  sign + integer part + thousands separators + decimal point
-   *  + fraction + exponent
-   */
-  expectedWidth = StrLength(numberPointer);
-  if (isNegative || (flags & FLAGS_SHOWSIGN))
-    expectedWidth += sizeof("-") - 1;
-  if (exponentDigits > 0)
-    expectedWidth += exponentDigits +
-      ((exponentDigits > 1) ? sizeof("E+") : sizeof("E+0")) - 1;
-  if (isHex)
-    expectedWidth += sizeof("0X") - 1;
-  
-  /* Output prefixing */
-  if (flags & FLAGS_NILPADDING)
-    {
-      /* Leading zeros must be after sign */
-      if (isNegative)
-       self->OutStream(self, '-');
-      else if (flags & FLAGS_SHOWSIGN)
-       self->OutStream(self, '+');
-      if (isHex)
-       {
-         self->OutStream(self, '0');
-         self->OutStream(self, (flags & FLAGS_UPPER) ? 'X' : 'x');
-       }
-      if (!(flags & FLAGS_LEFTADJUST))
-       {
-         for (i = expectedWidth; i < width; i++)
-           {
-             self->OutStream(self, '0');
-           }
-       }
-    }
-  else
-    {
-      /* Leading spaces must be before sign */
-      if (!(flags & FLAGS_LEFTADJUST))
-       {
-         for (i = expectedWidth; i < width; i++)
-           {
-             self->OutStream(self, CHAR_ADJUST);
-           }
-       }
-      if (isNegative)
-       self->OutStream(self, '-');
-      else if (flags & FLAGS_SHOWSIGN)
-       self->OutStream(self, '+');
-      if (isHex)
-       {
-         self->OutStream(self, '0');
-         self->OutStream(self, (flags & FLAGS_UPPER) ? 'X' : 'x');
-       }
-    }
-  /* Output number */
-  for (i = 0; numberPointer[i]; i++)
-    {
-      self->OutStream(self, numberPointer[i]);
-    }
-  /* Output exponent */
-  if (exponentDigits > 0)
-    {
-      self->OutStream(self,
-                     isHex
-                     ? ((flags & FLAGS_UPPER) ? 'P' : 'p')
-                     : ((flags & FLAGS_UPPER) ? 'E' : 'e'));
-      self->OutStream(self, (isExponentNegative) ? '-' : '+');
-
-      /* The exponent must contain at least two digits */
-      if (exponentDigits == 1)
-        self->OutStream(self, '0');
-
-      for (i = 0; i < exponentDigits; i++)
-       {
-         self->OutStream(self, exponentPointer[i + 1]);
-       }
-    }
-  /* Output trailing spaces */
-  if (flags & FLAGS_LEFTADJUST)
-    {
-      for (i = expectedWidth; i < width; i++)
-       {
-         self->OutStream(self, CHAR_ADJUST);
-       }
-    }
-}
-
-/*************************************************************************
- * TrioFormatProcess [private]
- */
-static int
-TrioFormatProcess(trio_T *data,
-                 const char *format,
-                 parameter_T *parameters)
-
-{
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  int charlen;
-#endif
-  int i;
-  const char *string;
-  void *pointer;
-  unsigned long flags;
-  int width;
-  int precision;
-  int base;
-  int index;
-  
-  index = 0;
-  i = 0;
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  mblen(NULL, 0);
-#endif
-  
-  while (format[index])
-    {
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-      if (! isascii(format[index]))
-       {
-         charlen = mblen(&format[index], MB_LEN_MAX);
-         while (charlen-- > 0)
-           {
-             data->OutStream(data, format[index++]);
-           }
-         continue; /* while */
-       }
-#endif /* TRIO_COMPILER_SUPPORTS_MULTIBYTE */
-      if (CHAR_IDENTIFIER == format[index])
-       {
-         if (CHAR_IDENTIFIER == format[index + 1])
-           {
-             data->OutStream(data, CHAR_IDENTIFIER);
-             index += 2;
-           }
-         else
-           {
-             /* Skip the parameter entries */
-             while (parameters[i].type == FORMAT_PARAMETER)
-               i++;
-             
-             flags = parameters[i].flags;
-
-             /* Find width */
-             width = parameters[i].width;
-             if (flags & FLAGS_WIDTH_PARAMETER)
-               {
-                 /* Get width from parameter list */
-                 width = (int)parameters[width].data.number.as_signed;
-               }
-             
-             /* Find precision */
-             if (flags & FLAGS_PRECISION)
-               {
-                 precision = parameters[i].precision;
-                 if (flags & FLAGS_PRECISION_PARAMETER)
-                   {
-                     /* Get precision from parameter list */
-                     precision = (int)parameters[precision].data.number.as_signed;
-                   }
-               }
-             else
-               {
-                 precision = NO_PRECISION;
-               }
-
-             /* Find base */
-             base = parameters[i].base;
-             if (flags & FLAGS_BASE_PARAMETER)
-               {
-                 /* Get base from parameter list */
-                 base = (int)parameters[base].data.number.as_signed;
-               }
-             
-             switch (parameters[i].type)
-               {
-               case FORMAT_CHAR:
-                 if (flags & FLAGS_QUOTE)
-                   data->OutStream(data, CHAR_QUOTE);
-                 if (! (flags & FLAGS_LEFTADJUST))
-                   {
-                     while (--width > 0)
-                       data->OutStream(data, CHAR_ADJUST);
-                   }
-#if TRIO_WIDECHAR
-                 if (flags & FLAGS_WIDECHAR)
-                   {
-                     TrioWriteWideStringCharacter(data,
-                                                  (wchar_t)parameters[i].data.number.as_signed,
-                                                  flags,
-                                                  NO_WIDTH);
-                   }
-                 else
-#endif
-                   TrioWriteStringCharacter(data,
-                                            (int)parameters[i].data.number.as_signed,
-                                            flags);
-
-                 if (flags & FLAGS_LEFTADJUST)
-                   {
-                     while(--width > 0)
-                       data->OutStream(data, CHAR_ADJUST);
-                   }
-                 if (flags & FLAGS_QUOTE)
-                   data->OutStream(data, CHAR_QUOTE);
-
-                 break; /* FORMAT_CHAR */
-
-               case FORMAT_INT:
-                 if (base == NO_BASE)
-                   base = BASE_DECIMAL;
-
-                 TrioWriteNumber(data,
-                                 parameters[i].data.number.as_signed,
-                                 flags,
-                                 width,
-                                 precision,
-                                 base);
-
-                 break; /* FORMAT_INT */
-
-               case FORMAT_DOUBLE:
-                 TrioWriteDouble(data,
-                                 parameters[i].data.longdoubleNumber,
-                                 flags,
-                                 width,
-                                 precision,
-                                 base);
-                 break; /* FORMAT_DOUBLE */
-
-               case FORMAT_STRING:
-#if TRIO_WIDECHAR
-                 if (flags & FLAGS_WIDECHAR)
-                   {
-                     TrioWriteWideString(data,
-                                         parameters[i].data.wstring,
-                                         flags,
-                                         width,
-                                         precision);
-                   }
-                 else
-#endif
-#ifdef QUALIFIER_ESCAPE
-                 {
-                   char *s = NULL;
-                    static const char* empty = "(null)";
-                   switch (parameters[i].escape)
-                   {
-                       case ESCAPE_ULM:
-                               s = edg_wll_LogEscape(parameters[i].data.string);
-                               break;
-                       case ESCAPE_XML:
-                               s = edg_wll_EscapeXML(parameters[i].data.string);
-                               break;
-                       case ESCAPE_SQL:
-                               s = edg_wll_EscapeSQL(parameters[i].data.string);
-                               break;
-                       case ESCAPE_NONE:
-                               s = strdup(parameters[i].data.string ? parameters[i].data.string : empty);
-                               break;
-                   }
-                   TrioWriteString(data,s,flags,width,precision);
-                   free(s);
-                 }
-#else
-                 {
-                     TrioWriteString(data,
-                                     parameters[i].data.string,
-                                     flags,
-                                     width,
-                                     precision);
-                 }
-#endif
-                 break; /* FORMAT_STRING */
-
-               case FORMAT_POINTER:
-                 {
-                   reference_T reference;
-                   
-                   reference.data = data;
-                   reference.parameter = &parameters[i];
-                   trio_print_pointer(&reference, parameters[i].data.pointer);
-                 }
-                 break; /* FORMAT_POINTER */
-
-               case FORMAT_COUNT:
-                 pointer = parameters[i].data.pointer;
-                 if (NULL != pointer)
-                   {
-                     /*
-                      * C99 paragraph 7.19.6.1.8 says "the number of
-                      * characters written to the output stream so far by
-                      * this call", which is data->committed
-                      */
-#if defined(QUALIFIER_SIZE_T) || defined(QUALIFIER_SIZE_T_UPPER)
-                     if (flags & FLAGS_SIZE_T)
-                       *(size_t *)pointer = (size_t)data->committed;
-                     else
-#endif
-#if defined(QUALIFIER_PTRDIFF_T)
-                     if (flags & FLAGS_PTRDIFF_T)
-                       *(ptrdiff_t *)pointer = (ptrdiff_t)data->committed;
-                     else
-#endif
-#if defined(QUALIFIER_INTMAX_T)
-                     if (flags & FLAGS_INTMAX_T)
-                       *(trio_intmax_t *)pointer = (trio_intmax_t)data->committed;
-                     else
-#endif
-                     if (flags & FLAGS_QUAD)
-                       {
-                         *(trio_ulonglong_t *)pointer = (trio_ulonglong_t)data->committed;
-                       }
-                     else if (flags & FLAGS_LONG)
-                       {
-                         *(long int *)pointer = (long int)data->committed;
-                       }
-                     else if (flags & FLAGS_SHORT)
-                       {
-                         *(short int *)pointer = (short int)data->committed;
-                       }
-                     else
-                       {
-                         *(int *)pointer = (int)data->committed;
-                       }
-                   }
-                 break; /* FORMAT_COUNT */
-
-               case FORMAT_PARAMETER:
-                 break; /* FORMAT_PARAMETER */
-
-#if defined(FORMAT_ERRNO)
-               case FORMAT_ERRNO:
-                 string = StrError(parameters[i].data.errorNumber);
-                 if (string)
-                   {
-                     TrioWriteString(data,
-                                     string,
-                                     flags,
-                                     width,
-                                     precision);
-                   }
-                 else
-                   {
-                     data->OutStream(data, '#');
-                     TrioWriteNumber(data,
-                                     (trio_intmax_t)parameters[i].data.errorNumber,
-                                     flags,
-                                     width,
-                                     precision,
-                                     BASE_DECIMAL);
-                   }
-                 break; /* FORMAT_ERRNO */
-#endif /* defined(FORMAT_ERRNO) */
-
-#if defined(FORMAT_USER_DEFINED)
-               case FORMAT_USER_DEFINED:
-                 {
-                   reference_T reference;
-                   userdef_T *def = NULL;
-
-                   if (parameters[i].user_name[0] == NIL)
-                     {
-                       /* Use handle */
-                       if ((i > 0) ||
-                           (parameters[i - 1].type == FORMAT_PARAMETER))
-                         def = (userdef_T *)parameters[i - 1].data.pointer;
-                     }
-                   else
-                     {
-                       /* Look up namespace */
-                       def = TrioFindNamespace(parameters[i].user_name, NULL);
-                     }
-                   if (def) {
-                     reference.data = data;
-                     reference.parameter = &parameters[i];
-                     def->callback(&reference);
-                   }
-                 }
-                 break;
-#endif /* defined(FORMAT_USER_DEFINED) */
-                 
-               default:
-                 break;
-               } /* switch parameter type */
-
-             /* Prepare for next */
-             index = parameters[i].indexAfterSpecifier;
-             i++;
-           }
-       }
-      else /* not identifier */
-       {
-         data->OutStream(data, format[index++]);
-       }
-    }
-  return data->processed;
-}
-
-/*************************************************************************
- * TrioFormatRef [private]
- */
-static int
-TrioFormatRef(reference_T *reference,
-              const char *format,
-              va_list arglist,
-              void **argarray)
-{
-  int status;
-  parameter_T parameters[MAX_PARAMETERS];
-
-  status = TrioPreprocess(TYPE_PRINT, format, parameters, arglist, argarray);
-  if (status < 0)
-    return status;
-
-  return TrioFormatProcess(reference->data, format, parameters);
-}
-
-/*************************************************************************
- * TrioFormat [private]
- *
- * Description:
- *  This is the main engine for formatting output
- */
-static int
-TrioFormat(void *destination,
-          size_t destinationSize,
-          void (*OutStream)(trio_T *, int),
-          const char *format,
-          va_list arglist,
-          void **argarray)
-{
-  int status;
-  trio_T data;
-  parameter_T parameters[MAX_PARAMETERS];
-
-  assert(VALID(OutStream));
-  assert(VALID(format));
-
-  memset(&data, 0, sizeof(data));
-  data.OutStream = OutStream;
-  data.location = destination;
-  data.max = destinationSize;
-
-#if defined(USE_LOCALE)
-  if (NULL == internalLocaleValues)
-    {
-      TrioSetLocale();
-    }
-#endif
-
-  status = TrioPreprocess(TYPE_PRINT, format, parameters, arglist, argarray);
-  if (status < 0)
-    return status;
-
-  return TrioFormatProcess(&data, format, parameters);
-}
-
-/*************************************************************************
- * TrioOutStreamFile [private]
- */
-static void
-TrioOutStreamFile(trio_T *self,
-                 int output)
-{
-  FILE *file = (FILE *)self->location;
-
-  assert(VALID(self));
-  assert(VALID(file));
-
-  self->processed++;
-  self->committed++;
-  (void)fputc(output, file);
-}
-
-/*************************************************************************
- * TrioOutStreamFileDescriptor [private]
- */
-static void
-TrioOutStreamFileDescriptor(trio_T *self,
-                           int output)
-{
-  int fd = *((int *)self->location);
-  char ch;
-
-  assert(VALID(self));
-
-  ch = (char)output;
-  (void)write(fd, &ch, sizeof(char));
-  self->processed++;
-  self->committed++;
-}
-
-/*************************************************************************
- * TrioOutStreamString [private]
- */
-static void
-TrioOutStreamString(trio_T *self,
-                   int output)
-{
-  char **buffer = (char **)self->location;
-
-  assert(VALID(self));
-  assert(VALID(buffer));
-
-  **buffer = (char)output;
-  (*buffer)++;
-  self->processed++;
-  self->committed++;
-}
-
-/*************************************************************************
- * TrioOutStreamStringMax [private]
- */
-static void
-TrioOutStreamStringMax(trio_T *self,
-                      int output)
-{
-  char **buffer;
-
-  assert(VALID(self));
-  buffer = (char **)self->location;
-  assert(VALID(buffer));
-
-  if (self->processed < self->max)
-    {
-      **buffer = (char)output;
-      (*buffer)++;
-      self->committed++;
-    }
-  self->processed++;
-}
-
-/*************************************************************************
- * TrioOutStreamStringDynamic [private]
- */
-#define DYNAMIC_START_SIZE 32
-struct dynamicBuffer {
-  char *buffer;
-  size_t length;
-  size_t allocated;
-};
-
-static void
-TrioOutStreamStringDynamic(trio_T *self,
-                          int output)
-{
-  struct dynamicBuffer *infop;
-  
-  assert(VALID(self));
-  assert(VALID(self->location));
-
-  infop = (struct dynamicBuffer *)self->location;
-
-  if (infop->buffer == NULL)
-    {
-      /* Start with a reasonable size */
-      infop->buffer = (char *)TRIO_MALLOC(DYNAMIC_START_SIZE);
-      if (infop->buffer == NULL)
-       return; /* fail */
-      
-      infop->allocated = DYNAMIC_START_SIZE;
-      self->processed = 0;
-      self->committed = 0;
-    }
-  else if (self->committed + sizeof(NIL) >= infop->allocated)
-    {
-      char *newptr;
-      
-      /* Allocate increasing chunks */
-      newptr = (char *)TRIO_REALLOC(infop->buffer, infop->allocated * 2);
-      
-      if (newptr == NULL)
-       return;
-
-      infop->buffer = newptr;
-      infop->allocated *= 2;
-    }
-  
-  infop->buffer[self->committed] = (char)output;
-  self->committed++;
-  self->processed++;
-  
-  infop->length = self->committed;
-}
-
-/*************************************************************************
- * printf
- */
-int
-trio_printf(const char *format,
-           ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioFormat(stdout, 0, TrioOutStreamFile, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vprintf(const char *format,
-            va_list args)
-{
-  assert(VALID(format));
-
-  return TrioFormat(stdout, 0, TrioOutStreamFile, format, args, NULL);
-}
-
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-
-static void shutup_unitialized(va_list *dummy UNUSED_VAR) {
-}
-
-int
-trio_printfv(const char *format,
-            void ** args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(format));
-
-  return TrioFormat(stdout, 0, TrioOutStreamFile, format, dummy, args);
-}
-
-/*************************************************************************
- * fprintf
- */
-int
-trio_fprintf(FILE *file,
-            const char *format,
-            ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(file));
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioFormat(file, 0, TrioOutStreamFile, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vfprintf(FILE *file,
-             const char *format,
-             va_list args)
-{
-  assert(VALID(file));
-  assert(VALID(format));
-  
-  return TrioFormat(file, 0, TrioOutStreamFile, format, args, NULL);
-}
-
-int
-trio_fprintfv(FILE *file,
-             const char *format,
-             void ** args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(file));
-  assert(VALID(format));
-  
-  return TrioFormat(file, 0, TrioOutStreamFile, format, dummy, args);
-}
-
-/*************************************************************************
- * dprintf
- */
-int
-trio_dprintf(int fd,
-            const char *format,
-            ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vdprintf(int fd,
-             const char *format,
-             va_list args)
-{
-  assert(VALID(format));
-  
-  return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, args, NULL);
-}
-
-int
-trio_dprintfv(int fd,
-             const char *format,
-             void **args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(format));
-  
-  return TrioFormat(&fd, 0, TrioOutStreamFileDescriptor, format, dummy, args);
-}
-
-/*************************************************************************
- * sprintf
- */
-int
-trio_sprintf(char *buffer,
-            const char *format,
-            ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, args, NULL);
-  *buffer = NIL; /* Terminate with NIL character */
-  va_end(args);
-  return status;
-}
-
-int
-trio_vsprintf(char *buffer,
-             const char *format,
-             va_list args)
-{
-  int status;
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, args, NULL);
-  *buffer = NIL;
-  return status;
-}
-
-int
-trio_sprintfv(char *buffer,
-             const char *format,
-             void **args)
-{
-  int status;
-  va_list dummy;
-  shutup_unitialized(&dummy);
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  status = TrioFormat(&buffer, 0, TrioOutStreamString, format, dummy, args);
-  *buffer = NIL;
-  return status;
-}
-
-/*************************************************************************
- * snprintf
- */
-int
-trio_snprintf(char *buffer,
-             size_t bufferSize,
-             const char *format,
-             ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  va_start(args, format);
-  status = TrioFormat(&buffer, bufferSize > 0 ? bufferSize - 1 : 0,
-                     TrioOutStreamStringMax, format, args, NULL);
-  if (bufferSize > 0)
-    *buffer = NIL;
-  va_end(args);
-  return status;
-}
-
-int
-trio_vsnprintf(char *buffer,
-              size_t bufferSize,
-              const char *format,
-              va_list args)
-{
-  int status;
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  status = TrioFormat(&buffer, bufferSize > 0 ? bufferSize - 1 : 0,
-                     TrioOutStreamStringMax, format, args, NULL);
-  if (bufferSize > 0)
-    *buffer = NIL;
-  return status;
-}
-
-int
-trio_snprintfv(char *buffer,
-              size_t bufferSize,
-              const char *format,
-              void **args)
-{
-  int status;
-  va_list dummy;
-  shutup_unitialized(&dummy);
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  status = TrioFormat(&buffer, bufferSize > 0 ? bufferSize - 1 : 0,
-                     TrioOutStreamStringMax, format, dummy, args);
-  if (bufferSize > 0)
-    *buffer = NIL;
-  return status;
-}
-
-/*************************************************************************
- * snprintfcat
- * Appends the new string to the buffer string overwriting the '\0'
- * character at the end of buffer.
- */
-int
-trio_snprintfcat(char *buffer,
-                size_t bufferSize,
-                const char *format,
-                ...)
-{
-  int status;
-  va_list args;
-  size_t buf_len;
-
-  va_start(args, format);
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  buf_len = strlen(buffer);
-  buffer = &buffer[buf_len];
-
-  status = TrioFormat(&buffer, bufferSize - 1 - buf_len,
-                     TrioOutStreamStringMax, format, args, NULL);
-  va_end(args);
-  *buffer = NIL;
-  return status;
-}
-
-int
-trio_vsnprintfcat(char *buffer,
-                 size_t bufferSize,
-                 const char *format,
-                 va_list args)
-{
-  int status;
-  size_t buf_len;
-  assert(VALID(buffer));
-  assert(VALID(format));
-
-  buf_len = strlen(buffer);
-  buffer = &buffer[buf_len];
-  status = TrioFormat(&buffer, bufferSize - 1 - buf_len,
-                     TrioOutStreamStringMax, format, args, NULL);
-  *buffer = NIL;
-  return status;
-}
-
-/*************************************************************************
- * trio_aprintf
- */
-
-/* Deprecated */
-char *
-trio_aprintf(const char *format,
-            ...)
-{
-  va_list args;
-  struct dynamicBuffer info;
-
-  assert(VALID(format));
-  
-  info.buffer = NULL;
-  info.length = 0;
-  info.allocated = 0;
-
-  va_start(args, format);
-  (void)TrioFormat(&info, 0, TrioOutStreamStringDynamic, format, args, NULL);
-  va_end(args);
-  if (info.length) {
-    info.buffer[info.length] = NIL; /* we terminate this with a zero byte */
-    return info.buffer;
-  }
-  else
-    return NULL;
-}
-
-/* Deprecated */
-char *
-trio_vaprintf(const char *format,
-             va_list args)
-{
-  struct dynamicBuffer info;
-
-  assert(VALID(format));
-  
-  info.buffer = NULL;
-  info.length = 0;
-  info.allocated = 0;
-
-  (void)TrioFormat(&info, 0, TrioOutStreamStringDynamic, format, args, NULL);
-  if (info.length) {
-    info.buffer[info.length] = NIL; /* we terminate this with a zero byte */
-    return info.buffer;
-  }
-  else
-    return NULL;
-}
-
-int
-trio_asprintf(char **result,
-             const char *format,
-             ...)
-{
-  va_list args;
-  int status;
-  struct dynamicBuffer info;
-
-  assert(VALID(format));
-
-  info.buffer = NULL;
-  info.length = 0;
-  info.allocated = 0;
-
-  va_start(args, format);
-  status = TrioFormat(&info, 0, TrioOutStreamStringDynamic, format, args, NULL);
-  va_end(args);
-  if (status < 0) {
-     *result = NULL;
-     return status;
-  }
-  if (info.length == 0) {
-    /*
-     * If the length is zero, no characters have been written and therefore
-     * no memory has been allocated, but we must to allocate and return an
-     * empty string.
-     */
-    info.buffer = (char *)TRIO_MALLOC(sizeof(char));
-    if (info.buffer == NULL) {
-      *result = NULL;
-      return TRIO_ERROR_RETURN(TRIO_ENOMEM, 0);
-    }
-  }
-  info.buffer[info.length] = NIL; /* we terminate this with a zero byte */
-  *result = info.buffer;
-  
-  return status;
-}
-
-int
-trio_vasprintf(char **result,
-              const char *format,
-              va_list args)
-{
-  int status;
-  struct dynamicBuffer info;
-
-  assert(VALID(format));
-
-  info.buffer = NULL;
-  info.length = 0;
-  info.allocated = 0;
-
-  status = TrioFormat(&info, 0, TrioOutStreamStringDynamic, format, args, NULL);
-  if (status < 0) {
-     *result = NULL;
-     return status;
-  }
-  if (info.length == 0) {
-    info.buffer = (char *)TRIO_MALLOC(sizeof(char));
-    if (info.buffer == NULL) {
-      *result = NULL;
-      return TRIO_ERROR_RETURN(TRIO_ENOMEM, 0);
-    }
-  }
-  info.buffer[info.length] = NIL; /* we terminate this with a zero byte */
-  *result = info.buffer;
-  
-  return status;
-}
-
-
-/*************************************************************************
- *
- * @CALLBACK
- *
- ************************************************************************/
-
-
-/*************************************************************************
- * trio_register [public]
- */
-void *
-trio_register(trio_callback_t callback,
-             const char *name)
-{
-  userdef_T *def;
-  userdef_T *prev = NULL;
-
-  if (callback == NULL)
-    return NULL;
-
-  if (name)
-    {
-      /* Handle built-in namespaces */
-      if (name[0] == ':')
-       {
-         if (StrEqual(name, ":enter"))
-           {
-             internalEnterCriticalRegion = callback;
-           }
-         else if (StrEqual(name, ":leave"))
-           {
-             internalLeaveCriticalRegion = callback;
-           }
-         return NULL;
-       }
-      
-      /* Bail out if namespace is too long */
-      if (StrLength(name) >= MAX_USER_NAME)
-       return NULL;
-      
-      /* Bail out if namespace already is registered */
-      def = TrioFindNamespace(name, &prev);
-      if (def)
-       return NULL;
-    }
-  
-  def = (userdef_T *)TRIO_MALLOC(sizeof(userdef_T));
-  if (def)
-    {
-      if (internalEnterCriticalRegion)
-       (void)internalEnterCriticalRegion(NULL);
-      
-      if (name)
-       {
-         /* Link into internal list */
-         if (prev == NULL)
-           internalUserDef = def;
-         else
-           prev->next = def;
-       }
-      /* Initialize */
-      def->callback = callback;
-      def->name = (name == NULL)
-       ? NULL
-       : StrDuplicate(name);
-      def->next = NULL;
-
-      if (internalLeaveCriticalRegion)
-       (void)internalLeaveCriticalRegion(NULL);
-    }
-  return def;
-}
-
-/*************************************************************************
- * trio_unregister [public]
- */
-void
-trio_unregister(void *handle)
-{
-  userdef_T *self = (userdef_T *)handle;
-  userdef_T *def;
-  userdef_T *prev = NULL;
-
-  assert(VALID(self));
-
-  if (self->name)
-    {
-      def = TrioFindNamespace(self->name, &prev);
-      if (def)
-       {
-         if (internalEnterCriticalRegion)
-           (void)internalEnterCriticalRegion(NULL);
-         
-         if (prev == NULL)
-           internalUserDef = NULL;
-         else
-           prev->next = def->next;
-         
-         if (internalLeaveCriticalRegion)
-           (void)internalLeaveCriticalRegion(NULL);
-       }
-      StrFree(self->name);
-    }
-  TRIO_FREE(self);
-}
-
-/*************************************************************************
- * trio_get_format [public]
- */
-const char *
-trio_get_format(void *ref)
-{
-  assert(((reference_T *)ref)->parameter->type == FORMAT_USER_DEFINED);
-  
-  return (((reference_T *)ref)->parameter->user_data);
-}
-
-/*************************************************************************
- * trio_get_argument [public]
- */
-void *
-trio_get_argument(void *ref)
-{
-  assert(((reference_T *)ref)->parameter->type == FORMAT_USER_DEFINED);
-  
-  return ((reference_T *)ref)->parameter->data.pointer;
-}
-
-/*************************************************************************
- * trio_get_width / trio_set_width [public]
- */
-int
-trio_get_width(void *ref)
-{
-  return ((reference_T *)ref)->parameter->width;
-}
-
-void
-trio_set_width(void *ref,
-              int width)
-{
-  ((reference_T *)ref)->parameter->width = width;
-}
-
-/*************************************************************************
- * trio_get_precision / trio_set_precision [public]
- */
-int
-trio_get_precision(void *ref)
-{
-  return (((reference_T *)ref)->parameter->precision);
-}
-
-void
-trio_set_precision(void *ref,
-                  int precision)
-{
-  ((reference_T *)ref)->parameter->precision = precision;
-}
-
-/*************************************************************************
- * trio_get_base / trio_set_base [public]
- */
-int
-trio_get_base(void *ref)
-{
-  return (((reference_T *)ref)->parameter->base);
-}
-
-void
-trio_set_base(void *ref,
-             int base)
-{
-  ((reference_T *)ref)->parameter->base = base;
-}
-
-/*************************************************************************
- * trio_get_long / trio_set_long [public]
- */
-int
-trio_get_long(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_LONG);
-}
-
-void
-trio_set_long(void *ref,
-             int is_long)
-{
-  if (is_long)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_LONG;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_LONG;
-}
-
-/*************************************************************************
- * trio_get_longlong / trio_set_longlong [public]
- */
-int
-trio_get_longlong(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_QUAD);
-}
-
-void
-trio_set_longlong(void *ref,
-                 int is_longlong)
-{
-  if (is_longlong)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_QUAD;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_QUAD;
-}
-
-/*************************************************************************
- * trio_get_longdouble / trio_set_longdouble [public]
- */
-int
-trio_get_longdouble(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_LONGDOUBLE);
-}
-
-void
-trio_set_longdouble(void *ref,
-                   int is_longdouble)
-{
-  if (is_longdouble)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_LONGDOUBLE;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_LONGDOUBLE;
-}
-
-/*************************************************************************
- * trio_get_short / trio_set_short [public]
- */
-int
-trio_get_short(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_SHORT);
-}
-
-void
-trio_set_short(void *ref,
-              int is_short)
-{
-  if (is_short)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_SHORT;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_SHORT;
-}
-
-/*************************************************************************
- * trio_get_shortshort / trio_set_shortshort [public]
- */
-int
-trio_get_shortshort(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_SHORTSHORT);
-}
-
-void
-trio_set_shortshort(void *ref,
-              int is_shortshort)
-{
-  if (is_shortshort)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_SHORTSHORT;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_SHORTSHORT;
-}
-
-/*************************************************************************
- * trio_get_alternative / trio_set_alternative [public]
- */
-int
-trio_get_alternative(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_ALTERNATIVE);
-}
-
-void
-trio_set_alternative(void *ref,
-                    int is_alternative)
-{
-  if (is_alternative)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_ALTERNATIVE;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_ALTERNATIVE;
-}
-
-/*************************************************************************
- * trio_get_alignment / trio_set_alignment [public]
- */
-int
-trio_get_alignment(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_LEFTADJUST);
-}
-
-void
-trio_set_alignment(void *ref,
-                  int is_leftaligned)
-{
-  if (is_leftaligned)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_LEFTADJUST;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_LEFTADJUST;
-}
-
-/*************************************************************************
- * trio_get_spacing /trio_set_spacing [public]
- */
-int
-trio_get_spacing(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_SPACE);
-}
-
-void
-trio_set_spacing(void *ref,
-                int is_space)
-{
-  if (is_space)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_SPACE;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_SPACE;
-}
-
-/*************************************************************************
- * trio_get_sign / trio_set_sign [public]
- */
-int
-trio_get_sign(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_SHOWSIGN);
-}
-
-void
-trio_set_sign(void *ref,
-             int is_sign)
-{
-  if (is_sign)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_SHOWSIGN;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_SHOWSIGN;
-}
-
-/*************************************************************************
- * trio_get_padding / trio_set_padding [public]
- */
-int
-trio_get_padding(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_NILPADDING);
-}
-
-void
-trio_set_padding(void *ref,
-                int is_padding)
-{
-  if (is_padding)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_NILPADDING;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_NILPADDING;
-}
-
-/*************************************************************************
- * trio_get_quote / trio_set_quote [public]
- */
-int
-trio_get_quote(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_QUOTE);
-}
-
-void
-trio_set_quote(void *ref,
-              int is_quote)
-{
-  if (is_quote)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_QUOTE;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_QUOTE;
-}
-
-/*************************************************************************
- * trio_get_upper / trio_set_upper [public]
- */
-int
-trio_get_upper(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_UPPER);
-}
-
-void
-trio_set_upper(void *ref,
-              int is_upper)
-{
-  if (is_upper)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_UPPER;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_UPPER;
-}
-
-/*************************************************************************
- * trio_get_largest / trio_set_largest [public]
- */
-#if TRIO_C99
-int
-trio_get_largest(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_INTMAX_T);
-}
-
-void
-trio_set_largest(void *ref,
-                int is_largest)
-{
-  if (is_largest)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_INTMAX_T;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_INTMAX_T;
-}
-#endif
-
-/*************************************************************************
- * trio_get_ptrdiff / trio_set_ptrdiff [public]
- */
-int
-trio_get_ptrdiff(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_PTRDIFF_T);
-}
-
-void
-trio_set_ptrdiff(void *ref,
-                int is_ptrdiff)
-{
-  if (is_ptrdiff)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_PTRDIFF_T;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_PTRDIFF_T;
-}
-
-/*************************************************************************
- * trio_get_size / trio_set_size [public]
- */
-#if TRIO_C99
-int
-trio_get_size(void *ref)
-{
-  return (((reference_T *)ref)->parameter->flags & FLAGS_SIZE_T);
-}
-
-void
-trio_set_size(void *ref,
-             int is_size)
-{
-  if (is_size)
-    ((reference_T *)ref)->parameter->flags |= FLAGS_SIZE_T;
-  else
-    ((reference_T *)ref)->parameter->flags &= ~FLAGS_SIZE_T;
-}
-#endif
-
-/*************************************************************************
- * trio_print_int [public]
- */
-void
-trio_print_int(void *ref,
-              int number)
-{
-  reference_T *self = (reference_T *)ref;
-
-  TrioWriteNumber(self->data,
-                 (trio_intmax_t)number,
-                 self->parameter->flags,
-                 self->parameter->width,
-                 self->parameter->precision,
-                 self->parameter->base);
-}
-
-/*************************************************************************
- * trio_print_uint [public]
- */
-void
-trio_print_uint(void *ref,
-               unsigned int number)
-{
-  reference_T *self = (reference_T *)ref;
-
-  TrioWriteNumber(self->data,
-                 (trio_intmax_t)number,
-                 self->parameter->flags | FLAGS_UNSIGNED,
-                 self->parameter->width,
-                 self->parameter->precision,
-                 self->parameter->base);
-}
-
-/*************************************************************************
- * trio_print_double [public]
- */
-void
-trio_print_double(void *ref,
-                 double number)
-{
-  reference_T *self = (reference_T *)ref;
-
-  TrioWriteDouble(self->data,
-                 number,
-                 self->parameter->flags,
-                 self->parameter->width,
-                 self->parameter->precision,
-                 self->parameter->base);
-}
-
-/*************************************************************************
- * trio_print_string [public]
- */
-void
-trio_print_string(void *ref,
-                 char *string)
-{
-  reference_T *self = (reference_T *)ref;
-
-  TrioWriteString(self->data,
-                 string,
-                 self->parameter->flags,
-                 self->parameter->width,
-                 self->parameter->precision);
-}
-
-/*************************************************************************
- * trio_print_pointer [public]
- */
-void
-trio_print_pointer(void *ref,
-                  void *pointer)
-{
-  reference_T *self = (reference_T *)ref;
-  unsigned long flags;
-  trio_uintmax_t number;
-
-  if (NULL == pointer)
-    {
-      const char *string = null;
-      while (*string)
-       self->data->OutStream(self->data, *string++);
-    }
-  else
-    {
-      /*
-       * The subtraction of the null pointer is a workaround
-       * to avoid a compiler warning. The performance overhead
-       * is negligible (and likely to be removed by an
-       * optimising compiler). The (char *) casting is done
-       * to please ANSI C++.
-       */
-      number = (trio_uintmax_t)((char *)pointer - (char *)0);
-      /* Shrink to size of pointer */
-      number &= (trio_uintmax_t)-1;
-      flags = self->parameter->flags;
-      flags |= (FLAGS_UNSIGNED | FLAGS_ALTERNATIVE |
-               FLAGS_NILPADDING);
-      TrioWriteNumber(self->data,
-                     (trio_intmax_t)number,
-                     flags,
-                     POINTER_WIDTH,
-                     NO_PRECISION,
-                     BASE_HEX);
-    }
-}
-
-/*************************************************************************
- * trio_print_ref [public]
- */
-int
-trio_print_ref(void *ref,
-              const char *format,
-              ...)
-{
-  int status;
-  va_list arglist;
-
-  assert(VALID(format));
-  
-  va_start(arglist, format);
-  status = TrioFormatRef((reference_T *)ref, format, arglist, NULL);
-  va_end(arglist);
-  return status;
-}
-
-/*************************************************************************
- * trio_vprint_ref [public]
- */
-int
-trio_vprint_ref(void *ref,
-               const char *format,
-               va_list arglist)
-{
-  assert(VALID(format));
-  
-  return TrioFormatRef((reference_T *)ref, format, arglist, NULL);
-}
-
-/*************************************************************************
- * trio_printv_ref [public]
- */
-int
-trio_printv_ref(void *ref,
-               const char *format,
-               void **argarray)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(format));
-  
-  return TrioFormatRef((reference_T *)ref, format, dummy, argarray);
-}
-
-
-/*************************************************************************
- *
- * @SCANNING
- *
- ************************************************************************/
-
-
-/*************************************************************************
- * TrioSkipWhitespaces [private]
- */
-static int
-TrioSkipWhitespaces(trio_T *self)
-{
-  int ch;
-
-  ch = self->current;
-  while (isspace(ch))
-    {
-      self->InStream(self, &ch);
-    }
-  return ch;
-}
-
-/*************************************************************************
- * TrioGetCollation [private]
- */
-#if TRIO_EXTENSION
-static void
-TrioGetCollation()
-{
-  int i;
-  int j;
-  int k;
-  char first[2];
-  char second[2];
-
-  /* This is computational expensive */
-  first[1] = NIL;
-  second[1] = NIL;
-  for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-    {
-      k = 0;
-      first[0] = (char)i;
-      for (j = 0; j < MAX_CHARACTER_CLASS; j++)
-       {
-         second[0] = (char)j;
-         if (StrEqualLocale(first, second))
-           internalCollationArray[i][k++] = (char)j;
-       }
-      internalCollationArray[i][k] = NIL;
-    }
-}
-#endif
-
-/*************************************************************************
- * TrioGetCharacterClass [private]
- *
- * FIXME:
- *  multibyte
- */
-static int
-TrioGetCharacterClass(const char *format,
-                     int *indexPointer,
-                     unsigned long *flagsPointer,
-                     int *characterclass)
-{
-  int index = *indexPointer;
-  int i;
-  char ch;
-  char range_begin;
-  char range_end;
-
-  *flagsPointer &= ~FLAGS_EXCLUDE;
-
-  if (format[index] == QUALIFIER_CIRCUMFLEX)
-    {
-      *flagsPointer |= FLAGS_EXCLUDE;
-      index++;
-    }
-  /*
-   * If the ungroup character is at the beginning of the scanlist,
-   * it will be part of the class, and a second ungroup character
-   * must follow to end the group.
-   */
-  if (format[index] == SPECIFIER_UNGROUP)
-    {
-      characterclass[(int)SPECIFIER_UNGROUP]++;
-      index++;
-    }
-  /*
-   * Minus is used to specify ranges. To include minus in the class,
-   * it must be at the beginning of the list
-   */
-  if (format[index] == QUALIFIER_MINUS)
-    {
-      characterclass[(int)QUALIFIER_MINUS]++;
-      index++;
-    }
-  /* Collect characters */
-  for (ch = format[index];
-       (ch != SPECIFIER_UNGROUP) && (ch != NIL);
-       ch = format[++index])
-    {
-      switch (ch)
-       {
-       case QUALIFIER_MINUS: /* Scanlist ranges */
-         
-         /*
-          * Both C99 and UNIX98 describes ranges as implementation-
-          * defined.
-          *
-          * We support the following behaviour (although this may
-          * change as we become wiser)
-          * - only increasing ranges, ie. [a-b] but not [b-a]
-          * - transitive ranges, ie. [a-b-c] == [a-c]
-          * - trailing minus, ie. [a-] is interpreted as an 'a'
-          *   and a '-'
-          * - duplicates (although we can easily convert these
-          *   into errors)
-          */
-         range_begin = format[index - 1];
-         range_end = format[++index];
-         if (range_end == SPECIFIER_UNGROUP)
-           {
-             /* Trailing minus is included */
-             characterclass[(int)ch]++;
-             ch = range_end;
-             break; /* for */
-           }
-         if (range_end == NIL)
-           return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-         if (range_begin > range_end)
-           return TRIO_ERROR_RETURN(TRIO_ERANGE, index);
-           
-         for (i = (int)range_begin; i <= (int)range_end; i++)
-           characterclass[i]++;
-           
-         ch = range_end;
-         break;
-         
-#if TRIO_EXTENSION
-
-       case SPECIFIER_GROUP:
-         
-         switch (format[index + 1])
-           {
-           case QUALIFIER_DOT: /* Collating symbol */
-             /*
-              * FIXME: This will be easier to implement when multibyte
-              * characters have been implemented. Until now, we ignore
-              * this feature.
-              */
-             for (i = index + 2; ; i++)
-               {
-                 if (format[i] == NIL)
-                   /* Error in syntax */
-                   return -1;
-                 else if (format[i] == QUALIFIER_DOT)
-                   break; /* for */
-               }
-             if (format[++i] != SPECIFIER_UNGROUP)
-               return -1;
-             
-             index = i;
-             break;
-         
-           case QUALIFIER_EQUAL: /* Equivalence class expressions */
-             {
-               unsigned int j;
-               unsigned int k;
-           
-               if (internalCollationUnconverted)
-                 {
-                   /* Lazy evalutation of collation array */
-                   TrioGetCollation();
-                   internalCollationUnconverted = FALSE;
-                 }
-               for (i = index + 2; ; i++)
-                 {
-                   if (format[i] == NIL)
-                     /* Error in syntax */
-                     return -1;
-                   else if (format[i] == QUALIFIER_EQUAL)
-                     break; /* for */
-                   else
-                     {
-                       /* Mark any equivalent character */
-                       k = (unsigned int)format[i];
-                       for (j = 0; internalCollationArray[k][j] != NIL; j++)
-                         characterclass[(int)internalCollationArray[k][j]]++;
-                     }
-                 }
-               if (format[++i] != SPECIFIER_UNGROUP)
-                 return -1;
-               
-               index = i;
-             }
-             break;
-         
-           case QUALIFIER_COLON: /* Character class expressions */
-         
-             if (StrEqualMax(CLASS_ALNUM, sizeof(CLASS_ALNUM) - 1,
-                             &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isalnum(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_ALNUM) - 1;
-               }
-             else if (StrEqualMax(CLASS_ALPHA, sizeof(CLASS_ALPHA) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isalpha(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_ALPHA) - 1;
-               }
-             else if (StrEqualMax(CLASS_CNTRL, sizeof(CLASS_CNTRL) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (iscntrl(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_CNTRL) - 1;
-               }
-             else if (StrEqualMax(CLASS_DIGIT, sizeof(CLASS_DIGIT) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isdigit(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_DIGIT) - 1;
-               }
-             else if (StrEqualMax(CLASS_GRAPH, sizeof(CLASS_GRAPH) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isgraph(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_GRAPH) - 1;
-               }
-             else if (StrEqualMax(CLASS_LOWER, sizeof(CLASS_LOWER) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (islower(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_LOWER) - 1;
-               }
-             else if (StrEqualMax(CLASS_PRINT, sizeof(CLASS_PRINT) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isprint(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_PRINT) - 1;
-               }
-             else if (StrEqualMax(CLASS_PUNCT, sizeof(CLASS_PUNCT) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (ispunct(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_PUNCT) - 1;
-               }
-             else if (StrEqualMax(CLASS_SPACE, sizeof(CLASS_SPACE) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isspace(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_SPACE) - 1;
-               }
-             else if (StrEqualMax(CLASS_UPPER, sizeof(CLASS_UPPER) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isupper(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_UPPER) - 1;
-               }
-             else if (StrEqualMax(CLASS_XDIGIT, sizeof(CLASS_XDIGIT) - 1,
-                                  &format[index]))
-               {
-                 for (i = 0; i < MAX_CHARACTER_CLASS; i++)
-                   if (isxdigit(i))
-                     characterclass[i]++;
-                 index += sizeof(CLASS_XDIGIT) - 1;
-               }
-             else
-               {
-                 characterclass[(int)ch]++;
-               }
-             break;
-
-           default:
-             characterclass[(int)ch]++;
-             break;
-           }
-         break;
-         
-#endif /* TRIO_EXTENSION */
-         
-       default:
-         characterclass[(int)ch]++;
-         break;
-       }
-    }
-  return 0;
-}
-
-/*************************************************************************
- * TrioReadNumber [private]
- *
- * We implement our own number conversion in preference of strtol and
- * strtoul, because we must handle 'long long' and thousand separators.
- */
-static BOOLEAN_T
-TrioReadNumber(trio_T *self,
-              trio_uintmax_t *target,
-              unsigned long flags,
-              int width,
-              int base)
-{
-  trio_uintmax_t number = 0;
-  int digit;
-  int count;
-  BOOLEAN_T isNegative = FALSE;
-  int j;
-
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-  assert((base >= MIN_BASE && base <= MAX_BASE) || (base == NO_BASE));
-
-  if (internalDigitsUnconverted)
-    {
-      /* Lazy evaluation of digits array */
-      memset(internalDigitArray, -1, sizeof(internalDigitArray));
-      for (j = 0; j < (int)sizeof(internalDigitsLower) - 1; j++)
-       {
-         internalDigitArray[(int)internalDigitsLower[j]] = j;
-         internalDigitArray[(int)internalDigitsUpper[j]] = j;
-       }
-      internalDigitsUnconverted = FALSE;
-    }
-  
-  TrioSkipWhitespaces(self);
-  
-  if (!(flags & FLAGS_UNSIGNED))
-    {
-      /* Leading sign */
-      if (self->current == '+')
-       {
-         self->InStream(self, NULL);
-       }
-      else if (self->current == '-')
-       {
-         self->InStream(self, NULL);
-         isNegative = TRUE;
-       }
-    }
-  
-  count = self->processed;
-  
-  if (flags & FLAGS_ALTERNATIVE)
-    {
-      switch (base)
-       {
-       case NO_BASE:
-       case BASE_OCTAL:
-       case BASE_HEX:
-       case BASE_BINARY:
-         if (self->current == '0')
-           {
-             self->InStream(self, NULL);
-             if (self->current)
-               {
-                 if ((base == BASE_HEX) &&
-                     (toupper(self->current) == 'X'))
-                   {
-                     self->InStream(self, NULL);
-                   }
-                 else if ((base == BASE_BINARY) &&
-                          (toupper(self->current) == 'B'))
-                   {
-                     self->InStream(self, NULL);
-                   }
-               }
-           }
-         else
-           return FALSE;
-         break;
-       default:
-         break;
-       }
-    }
-
-  while (((width == NO_WIDTH) || (self->processed - count < width)) &&
-        (! ((self->current == EOF) || isspace(self->current))))
-    {
-      if (isascii(self->current))
-       {
-         digit = internalDigitArray[self->current];
-         /* Abort if digit is not allowed in the specified base */
-         if ((digit == -1) || (digit >= base))
-           break;
-       }
-      else if (flags & FLAGS_QUOTE)
-       {
-         /* Compare with thousands separator */
-         for (j = 0; internalThousandSeparator[j] && self->current; j++)
-           {
-             if (internalThousandSeparator[j] != self->current)
-               break;
-
-             self->InStream(self, NULL);
-           }
-         if (internalThousandSeparator[j])
-           break; /* Mismatch */
-         else
-           continue; /* Match */
-       }
-      else
-       break;
-            
-      number *= base;
-      number += digit;
-
-      self->InStream(self, NULL);
-    }
-
-  /* Was anything read at all? */
-  if (self->processed == count)
-    return FALSE;
-  
-  if (target)
-    *target = (isNegative) ? -number : number;
-  return TRUE;
-}
-
-/*************************************************************************
- * TrioReadChar [private]
- */
-static int
-TrioReadChar(trio_T *self,
-            char *target,
-            unsigned long flags,
-            int width)
-{
-  int i;
-  char ch;
-  trio_uintmax_t number;
-  
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-
-  for (i = 0;
-       (self->current != EOF) && (i < width);
-       i++)
-    {
-      ch = (char)self->current;
-      self->InStream(self, NULL);
-      if ((flags & FLAGS_ALTERNATIVE) && (ch == CHAR_BACKSLASH))
-       {
-         switch (self->current)
-           {
-           case '\\': ch = '\\'; break;
-           case 'a': ch = '\007'; break;
-           case 'b': ch = '\b'; break;
-           case 'f': ch = '\f'; break;
-           case 'n': ch = '\n'; break;
-           case 'r': ch = '\r'; break;
-           case 't': ch = '\t'; break;
-           case 'v': ch = '\v'; break;
-           default:
-             if (isdigit(self->current))
-               {
-                 /* Read octal number */
-                 if (!TrioReadNumber(self, &number, 0, 3, BASE_OCTAL))
-                   return 0;
-                 ch = (char)number;
-               }
-             else if (toupper(self->current) == 'X')
-               {
-                 /* Read hexadecimal number */
-                 self->InStream(self, NULL);
-                 if (!TrioReadNumber(self, &number, 0, 2, BASE_HEX))
-                   return 0;
-                 ch = (char)number;
-               }
-             else
-               {
-                 ch = (char)self->current;
-               }
-             break;
-           }
-       }
-      
-      if (target)
-       target[i] = ch;
-    }
-  return i + 1;
-}
-
-/*************************************************************************
- * TrioReadString [private]
- */
-static BOOLEAN_T
-TrioReadString(trio_T *self,
-              char *target,
-              unsigned long flags,
-              int width)
-{
-  int i;
-  
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-
-  TrioSkipWhitespaces(self);
-    
-  /*
-   * Continue until end of string is reached, a whitespace is encountered,
-   * or width is exceeded
-   */
-  for (i = 0;
-       ((width == NO_WIDTH) || (i < width)) &&
-       (! ((self->current == EOF) || isspace(self->current)));
-       i++)
-    {
-      if (TrioReadChar(self, &target[i], flags, 1) == 0)
-       break; /* for */
-    }
-  if (target)
-    target[i] = NIL;
-  return TRUE;
-}
-
-/*************************************************************************
- * TrioReadWideChar [private]
- */
-#if TRIO_WIDECHAR
-static int
-TrioReadWideChar(trio_T *self,
-                wchar_t *target,
-                unsigned long flags,
-                int width)
-{
-  int i;
-  int j;
-  int size;
-  int amount = 0;
-  wchar_t wch;
-  char buffer[MB_LEN_MAX + 1];
-  
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-
-  for (i = 0;
-       (self->current != EOF) && (i < width);
-       i++)
-    {
-      if (isascii(self->current))
-       {
-         if (TrioReadChar(self, buffer, flags, 1) == 0)
-           return 0;
-         buffer[1] = NIL;
-       }
-      else
-       {
-         /*
-          * Collect a multibyte character, by enlarging buffer until
-          * it contains a fully legal multibyte character, or the
-          * buffer is full.
-          */
-         j = 0;
-         do
-           {
-             buffer[j++] = (char)self->current;
-             buffer[j] = NIL;
-             self->InStream(self, NULL);
-           }
-         while ((j < (int)sizeof(buffer)) && (mblen(buffer, (size_t)j) != j));
-       }
-      if (target)
-       {
-         size = mbtowc(&wch, buffer, sizeof(buffer));
-         if (size > 0)
-           target[i] = wch;
-       }
-      amount += size;
-      self->InStream(self, NULL);
-    }
-  return amount;
-}
-#endif /* TRIO_WIDECHAR */
-
-/*************************************************************************
- * TrioReadWideString [private]
- */
-#if TRIO_WIDECHAR
-static BOOLEAN_T
-TrioReadWideString(trio_T *self,
-                  wchar_t *target,
-                  unsigned long flags,
-                  int width)
-{
-  int i;
-  int size;
-  
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-
-  TrioSkipWhitespaces(self);
-
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  mblen(NULL, 0);
-#endif
-  
-  /*
-   * Continue until end of string is reached, a whitespace is encountered,
-   * or width is exceeded
-   */
-  for (i = 0;
-       ((width == NO_WIDTH) || (i < width)) &&
-       (! ((self->current == EOF) || isspace(self->current)));
-       )
-    {
-      size = TrioReadWideChar(self, &target[i], flags, 1);
-      if (size == 0)
-       break; /* for */
-
-      i += size;
-    }
-  if (target)
-    target[i] = L'\0';
-  return TRUE;
-}
-#endif /* TRIO_WIDECHAR */
-
-/*************************************************************************
- * TrioReadGroup [private]
- *
- * FIXME: characterclass does not work with multibyte characters
- */
-static BOOLEAN_T
-TrioReadGroup(trio_T *self,
-             char *target,
-             int *characterclass,
-             unsigned long flags,
-             int width)
-{
-  int ch;
-  int i;
-  
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-
-  ch = self->current;
-  for (i = 0;
-       ((width == NO_WIDTH) || (i < width)) &&
-       (! ((ch == EOF) ||
-          (((flags & FLAGS_EXCLUDE) != 0) ^ (characterclass[ch] == 0))));
-       i++)
-    {
-      if (target)
-       target[i] = (char)ch;
-      self->InStream(self, &ch);
-    }
-  
-  if (target)
-    target[i] = NIL;
-  return TRUE;
-}
-
-/*************************************************************************
- * TrioReadDouble [private]
- *
- * FIXME:
- *  add long double
- */
-static BOOLEAN_T
-TrioReadDouble(trio_T *self,
-              double *target,
-              unsigned long flags,
-              int width)
-{
-  int ch;
-  char doubleString[512] = "";
-  int index = 0;
-  int start;
-  int j;
-  BOOLEAN_T isHex = FALSE;
-
-  if ((width == NO_WIDTH) || (width > (int)sizeof(doubleString) - 1))
-    width = sizeof(doubleString) - 1;
-  
-  TrioSkipWhitespaces(self);
-  
-  /*
-   * Read entire double number from stream. StrToDouble requires a
-   * string as input, but InStream can be anything, so we have to
-   * collect all characters.
-   */
-  ch = self->current;
-  if ((ch == '+') || (ch == '-'))
-    {
-      doubleString[index++] = (char)ch;
-      self->InStream(self, &ch);
-      width--;
-    }
-
-  start = index;
-  switch (ch)
-    {
-    case 'n':
-    case 'N':
-      /* Not-a-number */
-      if (index != 0)
-       break;
-      /* FALLTHROUGH */
-    case 'i':
-    case 'I':
-      /* Infinity */
-      while (isalpha(ch) && (index - start < width))
-       {
-         doubleString[index++] = (char)ch;
-         self->InStream(self, &ch);
-       }
-      doubleString[index] = NIL;
-
-      /* Case insensitive string comparison */
-      if (StrEqual(&doubleString[start], INFINITE_UPPER) ||
-         StrEqual(&doubleString[start], LONG_INFINITE_UPPER))
-       {
-         *target = ((start == 1 && doubleString[0] == '-'))
-           ? -HUGE_VAL
-           : HUGE_VAL;
-         return TRUE;
-       }
-      if (StrEqual(doubleString, NAN_LOWER))
-       {
-         /* NaN must not have a preceeding + nor - */
-         *target = TrioGenerateNaN();
-         return TRUE;
-       }
-      return FALSE;
-      
-    default:
-      break;
-    }
-  
-  if (ch == '0')
-    {
-      doubleString[index++] = (char)ch;
-      self->InStream(self, &ch);
-      if (toupper(ch) == 'X')
-       {
-         isHex = TRUE;
-         doubleString[index++] = (char)ch;
-         self->InStream(self, &ch);
-       }
-    }
-  while ((ch != EOF) && (index - start < width))
-    {
-      /* Integer part */
-      if (isHex ? isxdigit(ch) : isdigit(ch))
-       {
-         doubleString[index++] = (char)ch;
-         self->InStream(self, &ch);
-       }
-      else if (flags & FLAGS_QUOTE)
-       {
-         /* Compare with thousands separator */
-         for (j = 0; internalThousandSeparator[j] && self->current; j++)
-           {
-             if (internalThousandSeparator[j] != self->current)
-               break;
-
-             self->InStream(self, &ch);
-           }
-         if (internalThousandSeparator[j])
-           break; /* Mismatch */
-         else
-           continue; /* Match */
-       }
-      else
-       break; /* while */
-    }
-  if (ch == '.')
-    {
-      /* Decimal part */
-      doubleString[index++] = (char)ch;
-      self->InStream(self, &ch);
-      while ((isHex ? isxdigit(ch) : isdigit(ch)) &&
-            (index - start < width))
-       {
-         doubleString[index++] = (char)ch;
-         self->InStream(self, &ch);
-       }
-      if (isHex ? (toupper(ch) == 'P') : (toupper(ch) == 'E'))
-       {
-         /* Exponent */
-         doubleString[index++] = (char)ch;
-         self->InStream(self, &ch);
-         if ((ch == '+') || (ch == '-'))
-           {
-             doubleString[index++] = (char)ch;
-             self->InStream(self, &ch);
-           }
-         while ((isHex ? isxdigit(ch) : isdigit(ch)) &&
-                (index - start < width))
-           {
-             doubleString[index++] = (char)ch;
-             self->InStream(self, &ch);
-           }
-       }
-    }
-
-  if ((index == start) || (*doubleString == NIL))
-    return FALSE;
-  
-  if (flags & FLAGS_LONGDOUBLE)
-/*     *longdoublePointer = StrToLongDouble()*/
-    return FALSE; /* FIXME: Remove when long double is implemented */
-  else
-    {
-      *target = StrToDouble(doubleString, NULL);
-    }
-  return TRUE;
-}
-
-/*************************************************************************
- * TrioReadPointer [private]
- */
-static BOOLEAN_T
-TrioReadPointer(trio_T *self,
-               void **target,
-               unsigned long flags)
-{
-  trio_uintmax_t number;
-  char buffer[sizeof(null)];
-
-  flags |= (FLAGS_UNSIGNED | FLAGS_ALTERNATIVE | FLAGS_NILPADDING);
-  
-  if (TrioReadNumber(self,
-                    &number,
-                    flags,
-                    POINTER_WIDTH,
-                    BASE_HEX))
-    {
-      /*
-       * The strange assignment of number is a workaround for a compiler
-       * warning
-       */
-      if (target)
-       *target = (char *)0 + number;
-      return TRUE;
-    }
-  else if (TrioReadString(self,
-                         (flags & FLAGS_IGNORE)
-                         ? NULL
-                         : buffer,
-                         0,
-                         sizeof(null) - 1))
-    {  
-      if (StrEqualCase(buffer, null))
-       {
-         if (target)
-           *target = NULL;
-         return TRUE;
-       }
-    }
-  return FALSE;
-}
-
-/*************************************************************************
- * TrioScan [private]
- */
-static int
-TrioScan(const void *source,
-        size_t sourceSize,
-        void (*InStream)(trio_T *, int *),
-        const char *format,
-        va_list arglist,
-        void **argarray)
-{
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  int charlen;
-#endif
-  int status;
-  int assignment;
-  parameter_T parameters[MAX_PARAMETERS];
-  trio_T internalData;
-  trio_T *data;
-  int ch;
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  int cnt;
-#endif
-  int index; /* Index of format string */
-  int i; /* Index of current parameter */
-  unsigned long flags;
-  int width;
-  int base;
-  void *pointer;
-
-  assert(VALID(InStream));
-  assert(VALID(format));
-
-  memset(&internalData, 0, sizeof(internalData));
-  data = &internalData;
-  data->InStream = InStream;
-  data->location = (void *)source;
-  data->max = sourceSize;
-
-#if defined(USE_LOCALE)
-  if (NULL == internalLocaleValues)
-    {
-      TrioSetLocale();
-    }
-#endif
-  
-  status = TrioPreprocess(TYPE_SCAN, format, parameters, arglist, argarray);
-  if (status < 0)
-    return status;
-
-  assignment = 0;
-  i = 0;
-  index = 0;
-  data->InStream(data, &ch);
-
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-  mblen(NULL, 0);
-#endif
-
-  while (format[index])
-    {
-#if defined(TRIO_COMPILER_SUPPORTS_MULTIBYTE)
-      if (! isascii(format[index]))
-       {
-         charlen = mblen(&format[index], MB_LEN_MAX);
-         /* Compare multibyte characters in format string */
-         for (cnt = 0; cnt < charlen - 1; cnt++)
-           {
-             if (ch != format[index + cnt])
-               {
-                 return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-               }
-             data->InStream(data, &ch);
-           }
-         continue; /* while */
-       }
-#endif /* TRIO_COMPILER_SUPPORTS_MULTIBYTE */
-      if (EOF == ch)
-       return EOF;
-      
-      if (CHAR_IDENTIFIER == format[index])
-       {
-         if (CHAR_IDENTIFIER == format[index + 1])
-           {
-             /* Two % in format matches one % in input stream */
-             if (CHAR_IDENTIFIER == ch)
-               {
-                 data->InStream(data, &ch);
-                 index += 2;
-                 continue; /* while format chars left */
-               }
-             else
-               return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-           }
-
-         /* Skip the parameter entries */
-         while (parameters[i].type == FORMAT_PARAMETER)
-           i++;
-         
-         flags = parameters[i].flags;
-         /* Find width */
-         width = parameters[i].width;
-         if (flags & FLAGS_WIDTH_PARAMETER)
-           {
-             /* Get width from parameter list */
-             width = (int)parameters[width].data.number.as_signed;
-           }
-         /* Find base */
-         base = parameters[i].base;
-         if (flags & FLAGS_BASE_PARAMETER)
-           {
-             /* Get base from parameter list */
-             base = (int)parameters[base].data.number.as_signed;
-           }
-         
-         switch (parameters[i].type)
-           {
-           case FORMAT_INT:
-             {
-               trio_uintmax_t number;
-
-               if (0 == base)
-                 base = BASE_DECIMAL;
-
-               if (!TrioReadNumber(data,
-                                   &number,
-                                   flags,
-                                   width,
-                                   base))
-                 return assignment;
-               assignment++;
-               
-               if (!(flags & FLAGS_IGNORE))
-                 {
-                   pointer = parameters[i].data.pointer;
-#if defined(QUALIFIER_SIZE_T) || defined(QUALIFIER_SIZE_T_UPPER)
-                   if (flags & FLAGS_SIZE_T)
-                     *(size_t *)pointer = (size_t)number;
-                   else
-#endif
-#if defined(QUALIFIER_PTRDIFF_T)
-                   if (flags & FLAGS_PTRDIFF_T)
-                     *(ptrdiff_t *)pointer = (ptrdiff_t)number;
-                   else
-#endif
-#if defined(QUALIFIER_INTMAX_T)
-                   if (flags & FLAGS_INTMAX_T)
-                     *(trio_intmax_t *)pointer = (trio_intmax_t)number;
-                   else
-#endif
-                   if (flags & FLAGS_QUAD)
-                     *(trio_ulonglong_t *)pointer = (trio_ulonglong_t)number;
-                   else if (flags & FLAGS_LONG)
-                     *(long int *)pointer = (long int)number;
-                   else if (flags & FLAGS_SHORT)
-                     *(short int *)pointer = (short int)number;
-                   else
-                     *(int *)pointer = (int)number;
-                 }
-             }
-             break; /* FORMAT_INT */
-             
-           case FORMAT_STRING:
-#if TRIO_WIDECHAR
-             if (flags & FLAGS_WIDECHAR)
-               {
-                 if (!TrioReadWideString(data,
-                                         (flags & FLAGS_IGNORE)
-                                         ? NULL
-                                         : parameters[i].data.wstring,
-                                         flags,
-                                         width))
-                   return assignment;
-               }
-             else
-#endif
-               {
-                 if (!TrioReadString(data,
-                                     (flags & FLAGS_IGNORE)
-                                     ? NULL
-                                     : parameters[i].data.string,
-                                     flags,
-                                     width))
-                   return assignment;
-               }
-             assignment++;
-             break; /* FORMAT_STRING */
-             
-           case FORMAT_DOUBLE:
-             if (!TrioReadDouble(data,
-                                 (flags & FLAGS_IGNORE)
-                                 ? NULL
-                                 : parameters[i].data.doublePointer,
-                                 flags,
-                                 width))
-               return assignment;
-             assignment++;
-             break; /* FORMAT_DOUBLE */
-
-           case FORMAT_GROUP:
-             {
-               int characterclass[MAX_CHARACTER_CLASS + 1];
-               int rc;
-
-               /* Skip over modifiers */
-               while (format[index] != SPECIFIER_GROUP)
-                 {
-                   index++;
-                 }
-               /* Skip over group specifier */
-               index++;
-               
-               memset(characterclass, 0, sizeof(characterclass));
-               rc = TrioGetCharacterClass(format,
-                                          &index,
-                                          &flags,
-                                          characterclass);
-               if (rc < 0)
-                 return rc;
-
-               if (!TrioReadGroup(data,
-                                  (flags & FLAGS_IGNORE)
-                                  ? NULL
-                                  : parameters[i].data.string,
-                                  characterclass,
-                                  flags,
-                                  parameters[i].width))
-                 return assignment;
-               assignment++;
-             }
-             break; /* FORMAT_GROUP */
-             
-           case FORMAT_COUNT:
-             pointer = parameters[i].data.pointer;
-             if (NULL != pointer)
-               {
-#if defined(QUALIFIER_SIZE_T) || defined(QUALIFIER_SIZE_T_UPPER)
-                 if (flags & FLAGS_SIZE_T)
-                   *(size_t *)pointer = (size_t)data->committed;
-                 else
-#endif
-#if defined(QUALIFIER_PTRDIFF_T)
-                 if (flags & FLAGS_PTRDIFF_T)
-                   *(ptrdiff_t *)pointer = (ptrdiff_t)data->committed;
-                 else
-#endif
-#if defined(QUALIFIER_INTMAX_T)
-                 if (flags & FLAGS_INTMAX_T)
-                   *(trio_intmax_t *)pointer = (trio_intmax_t)data->committed;
-                 else
-#endif
-                 if (flags & FLAGS_QUAD)
-                   {
-                     *(trio_ulonglong_t *)pointer = (trio_ulonglong_t)data->committed;
-                   }
-                 else if (flags & FLAGS_LONG)
-                   {
-                     *(long int *)pointer = (long int)data->committed;
-                   }
-                 else if (flags & FLAGS_SHORT)
-                   {
-                     *(short int *)pointer = (short int)data->committed;
-                   }
-                 else
-                   {
-                     *(int *)pointer = (int)data->committed;
-                   }
-               }
-             break; /* FORMAT_COUNT */
-             
-           case FORMAT_CHAR:
-#if TRIO_WIDECHAR
-             if (flags & FLAGS_WIDECHAR)
-               {
-                 if (TrioReadWideChar(data,
-                                      (flags & FLAGS_IGNORE)
-                                      ? NULL
-                                      : parameters[i].data.wstring,
-                                      flags,
-                                      (width == NO_WIDTH) ? 1 : width) > 0)
-                   return assignment;
-               }
-             else
-#endif
-               {
-                 if (TrioReadChar(data,
-                                  (flags & FLAGS_IGNORE)
-                                  ? NULL
-                                  : parameters[i].data.string,
-                                  flags,
-                                  (width == NO_WIDTH) ? 1 : width) > 0)
-                   return assignment;
-               }
-             assignment++;
-             break; /* FORMAT_CHAR */
-             
-           case FORMAT_POINTER:
-             if (!TrioReadPointer(data,
-                                  (flags & FLAGS_IGNORE)
-                                  ? NULL
-                                  : (void **)parameters[i].data.pointer,
-                                  flags))
-               return assignment;
-             assignment++;
-             break; /* FORMAT_POINTER */
-             
-           case FORMAT_PARAMETER:
-             break; /* FORMAT_PARAMETER */
-             
-           default:
-             return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-           }
-         ch = data->current;
-         index = parameters[i].indexAfterSpecifier;
-         i++;
-       }
-      else /* Not an % identifier */
-       {
-         if (isspace((int)format[index]))
-           {
-             /* Whitespaces may match any amount of whitespaces */
-             ch = TrioSkipWhitespaces(data);
-           }
-         else if (ch == format[index])
-           {
-             data->InStream(data, &ch);
-           }
-         else
-           return TRIO_ERROR_RETURN(TRIO_EINVAL, index);
-         
-         index++;
-       }
-    }
-  return assignment;
-}
-
-/*************************************************************************
- * TrioInStreamFile [private]
- */
-static void
-TrioInStreamFile(trio_T *self,
-                int *intPointer)
-{
-  FILE *file = (FILE *)self->location;
-
-  assert(VALID(self));
-  assert(VALID(file));
-
-  self->current = fgetc(file);
-  self->processed++;
-  self->committed++;
-  
-  if (VALID(intPointer))
-    {
-      *intPointer = self->current;
-    }
-}
-
-/*************************************************************************
- * TrioInStreamFileDescriptor [private]
- */
-static void
-TrioInStreamFileDescriptor(trio_T *self,
-                          int *intPointer)
-{
-  int fd = *((int *)self->location);
-  int size;
-  unsigned char input;
-
-  assert(VALID(self));
-
-  size = read(fd, &input, sizeof(char));
-  self->current = (size == 0) ? EOF : input;
-  self->processed++;
-  self->committed++;
-  
-  if (VALID(intPointer))
-    {
-      *intPointer = self->current;
-    }
-}
-
-/*************************************************************************
- * TrioInStreamString [private]
- */
-static void
-TrioInStreamString(trio_T *self,
-                  int *intPointer)
-{
-  unsigned char **buffer;
-
-  assert(VALID(self));
-  assert(VALID(self->InStream));
-  assert(VALID(self->location));
-
-  buffer = (unsigned char **)self->location;
-  self->current = (*buffer)[0];
-  if (self->current == NIL)
-    self->current = EOF;
-  (*buffer)++;
-  self->processed++;
-  self->committed++;
-  
-  if (VALID(intPointer))
-    {
-      *intPointer = self->current;
-    }
-}
-
-/*************************************************************************
- * scanf
- */
-int
-trio_scanf(const char *format,
-          ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioScan(stdin, 0, TrioInStreamFile, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vscanf(const char *format,
-           va_list args)
-{
-  assert(VALID(format));
-  
-  return TrioScan(stdin, 0, TrioInStreamFile, format, args, NULL);
-}
-
-int
-trio_scanfv(const char *format,
-           void **args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(format));
-  
-  return TrioScan(stdin, 0, TrioInStreamFile, format, dummy, args);
-}
-
-/*************************************************************************
- * fscanf
- */
-int
-trio_fscanf(FILE *file,
-           const char *format,
-           ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(file));
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioScan(file, 0, TrioInStreamFile, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vfscanf(FILE *file,
-            const char *format,
-            va_list args)
-{
-  assert(VALID(file));
-  assert(VALID(format));
-  
-  return TrioScan(file, 0, TrioInStreamFile, format, args, NULL);
-}
-
-int
-trio_fscanfv(FILE *file,
-            const char *format,
-            void **args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(file));
-  assert(VALID(format));
-  
-  return TrioScan(file, 0, TrioInStreamFile, format, dummy, args);
-}
-
-/*************************************************************************
- * dscanf
- */
-int
-trio_dscanf(int fd,
-           const char *format,
-           ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioScan(&fd, 0, TrioInStreamFileDescriptor, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vdscanf(int fd,
-            const char *format,
-            va_list args)
-{
-  assert(VALID(format));
-  
-  return TrioScan(&fd, 0, TrioInStreamFileDescriptor, format, args, NULL);
-}
-
-int
-trio_dscanfv(int fd,
-             const char *format,
-             void **args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(format));
-  
-  return TrioScan(&fd, 0, TrioInStreamFileDescriptor, format, dummy, args);
-}
-
-/*************************************************************************
- * sscanf
- */
-int
-trio_sscanf(const char *buffer,
-           const char *format,
-           ...)
-{
-  int status;
-  va_list args;
-
-  assert(VALID(buffer));
-  assert(VALID(format));
-  
-  va_start(args, format);
-  status = TrioScan(&buffer, 0, TrioInStreamString, format, args, NULL);
-  va_end(args);
-  return status;
-}
-
-int
-trio_vsscanf(const char *buffer,
-            const char *format,
-            va_list args)
-{
-  assert(VALID(buffer));
-  assert(VALID(format));
-  
-  return TrioScan(&buffer, 0, TrioInStreamString, format, args, NULL);
-}
-
-int
-trio_sscanfv(const char *buffer,
-            const char *format,
-            void **args)
-{
-  va_list dummy;
-  shutup_unitialized(&dummy);
-  
-  assert(VALID(buffer));
-  assert(VALID(format));
-  
-  return TrioScan(&buffer, 0, TrioInStreamString, format, dummy, args);
-}
-
diff --git a/org.glite.lb.common/src/triop.h b/org.glite.lb.common/src/triop.h

deleted file mode 100644 (file)

index ca49fab..0000000
--- a/org.glite.lb.common/src/triop.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (C) 2000 Bjorn Reese and Daniel Stenberg.
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************
- *
- * Private functions, types, etc. used for callback functions.
- *
- * The ref pointer is an opaque type and should remain as such.
- * Private data must only be accessible through the getter and
- * setter functions.
- *
- ************************************************************************/
-
-#ifndef TRIO_TRIOP_H
-#define TRIO_TRIOP_H
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef TRIO_C99
-# define TRIO_C99 1
-#endif
-#ifndef TRIO_BSD
-# define TRIO_BSD 1
-#endif
-#ifndef TRIO_GNU
-# define TRIO_GNU 1
-#endif
-#ifndef TRIO_MISC
-# define TRIO_MISC 1
-#endif
-#ifndef TRIO_UNIX98
-# define TRIO_UNIX98 1
-#endif
-#ifndef TRIO_MICROSOFT
-# define TRIO_MICROSOFT 1
-#endif
-#ifndef TRIO_EXTENSION
-# define TRIO_EXTENSION 1
-#endif
-#ifndef TRIO_WIDECHAR
-# define TRIO_WIDECHAR 0
-#endif
-#ifndef TRIO_ERRORS
-# define TRIO_ERRORS 1
-#endif
-
-#ifndef TRIO_MALLOC
-# define TRIO_MALLOC(n) malloc(n)
-#endif
-#ifndef TRIO_REALLOC
-# define TRIO_REALLOC(x,n) realloc((x),(n))
-#endif
-#ifndef TRIO_FREE
-# define TRIO_FREE(x) free(x)
-#endif
-
-typedef int (*trio_callback_t)(void *ref);
-
-void *trio_register(trio_callback_t callback, const char *name);
-void trio_unregister(void *handle);
-
-const char *trio_get_format(void *ref);
-void *trio_get_argument(void *ref);
-
-/* Modifiers */
-int  trio_get_width(void *ref);
-void trio_set_width(void *ref, int width);
-int  trio_get_precision(void *ref);
-void trio_set_precision(void *ref, int precision);
-int  trio_get_base(void *ref);
-void trio_set_base(void *ref, int base);
-int  trio_get_padding(void *ref);
-void trio_set_padding(void *ref, int is_padding);
-int  trio_get_short(void *ref); /* h */
-void trio_set_shortshort(void *ref, int is_shortshort);
-int  trio_get_shortshort(void *ref); /* hh */
-void trio_set_short(void *ref, int is_short);
-int  trio_get_long(void *ref); /* l */
-void trio_set_long(void *ref, int is_long);
-int  trio_get_longlong(void *ref); /* ll */
-void trio_set_longlong(void *ref, int is_longlong);
-int  trio_get_longdouble(void *ref); /* L */
-void trio_set_longdouble(void *ref, int is_longdouble);
-int  trio_get_alternative(void *ref); /* # */
-void trio_set_alternative(void *ref, int is_alternative);
-int  trio_get_alignment(void *ref); /* - */
-void trio_set_alignment(void *ref, int is_leftaligned);
-int  trio_get_spacing(void *ref); /* (space) */
-void trio_set_spacing(void *ref, int is_space);
-int  trio_get_sign(void *ref); /* + */
-void trio_set_sign(void *ref, int is_showsign);
-int  trio_get_quote(void *ref); /* ' */
-void trio_set_quote(void *ref, int is_quote);
-int  trio_get_upper(void *ref);
-void trio_set_upper(void *ref, int is_upper);
-#if TRIO_C99
-int  trio_get_largest(void *ref); /* j */
-void trio_set_largest(void *ref, int is_largest);
-int  trio_get_ptrdiff(void *ref); /* t */
-void trio_set_ptrdiff(void *ref, int is_ptrdiff);
-int  trio_get_size(void *ref); /* z / Z */
-void trio_set_size(void *ref, int is_size);
-#endif
-
-/* Printing */
-int trio_print_ref(void *ref, const char *format, ...);
-int trio_vprint_ref(void *ref, const char *format, va_list args);
-int trio_printv_ref(void *ref, const char *format, void **args);
-
-void trio_print_int(void *ref, int number);
-void trio_print_uint(void *ref, unsigned int number);
-/*  void trio_print_long(void *ref, long number); */
-/*  void trio_print_ulong(void *ref, unsigned long number); */
-void trio_print_double(void *ref, double number);
-void trio_print_string(void *ref, char *string);
-void trio_print_pointer(void *ref, void *pointer);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
-
-#endif /* TRIO_TRIOP_H */
diff --git a/org.glite.lb.common/src/ulm_parse.c b/org.glite.lb.common/src/ulm_parse.c

deleted file mode 100644 (file)

index 1a40d57..0000000
--- a/org.glite.lb.common/src/ulm_parse.c
+++ /dev/null
@@ -1,410 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-/*========= DATA =====================================================*/
-
-#include "ulm_parse.h"
-
-/*========= FUNCTIONS ================================================*/
-
-/* -- Internal function prototype -- */
-void edg_wll_ULMSplitDate( const char *s,
-                      unsigned int *year,
-                      unsigned int *mon,
-                      unsigned int *day,
-                      unsigned int *hour,
-                      unsigned int *min,
-                      unsigned int *sec,
-                      unsigned long *usec );
-int edg_wll_ULMisalphaext( int c);
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ULMNewParseTable -- Allocate memory for new parse table
- *
- * Calls: malloc, strdup
- *
- * Algorithm:
- *
- *----------------------------------------------------------------------
- */
-p_edg_wll_ULMFields edg_wll_ULMNewParseTable(LogLine logline)
-{
-  p_edg_wll_ULMFields this = (p_edg_wll_ULMFields) calloc(1,sizeof(edg_wll_ULMFields));
-  LogLine ln = logline;
-
-  /* Strip leading spaces */
-  for ( ; *ln && isblank(*ln); ln++ );
-
-  this->names = NULL;
-  this->vals = NULL;
-  this->num = 0;
-  this->raw = strdup(ln);
-
-  return this;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ULMFreeParseTable -- Free memory allocated for parse table
- *
- * Calls: free
- *
- * Algorithm:
- *
- *----------------------------------------------------------------------
- */
-void edg_wll_ULMFreeParseTable(p_edg_wll_ULMFields this)
-{   
-   EDG_WLL_ULM_CLEAR_FIELDS(this);
-   if (this->raw) free(this->raw);
-   if (this) free(this);
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ULMProcessParseTable -- Break UML message into fields.
- *
- * Calls: strchr, strrchr
- *
- * Algorithm: 
- *     LogLine is of the ULM form as described in draft-abela-ulm-05.
- *     - the ULM_EQ symbol separates name,value pairs 
- *     - quote marks must be taken into account 
- *     1. count ULM_EQ and ULM_SP symbols,
- *     2. allocate the integer arrays 'names' and 'vals' which hold 
- *        the indices of subsequent name and value strings,
- *     3. the original raw data will be peppered with \0's so that raw[index] 
- *        will give the proper string if index is in names[] or vals[]
- * 
- *      The actual algorithm to get these indices is a simple array lookup.
- *
- *     The following illegal formats are caught:
- *             1. no name=value pairs
- *             2. space or tab next to delimiter
- *             3. logline starts or ends with delimiter
- *             4. no spaces between successive delimiters
- *             5. illegal character after ending ULM_QM
- *
- *----------------------------------------------------------------------
- */
-int edg_wll_ULMProcessParseTable(p_edg_wll_ULMFields this)
-{
-  char *func = "edg_wll_ULMProcessParseTable";
-  char *eq;
-  int  i,j;
-  int  eqCnt,qmCnt,spCnt;
-  int  iArrayEQ[ULM_FIELDS_MAX];
-  int  iArraySP[ULM_FIELDS_MAX];
-  size_t size;
-
-  if ( (this == NULL) || (this->raw == NULL) || (*this->raw == '\0')) {
-    fprintf(stderr,"%s: PARSE ERROR: Nothing to parse.\n",func);
-    return ULM_PARSE_ERROR;                                     
-  }
-
-  /* Init data */
-  EDG_WLL_ULM_CLEAR_FIELDS(this);
-
-  for (i=0; i<ULM_FIELDS_MAX; i++) { 
-    iArrayEQ[i] = 0;
-    iArraySP[i] = 0;
-  }
-
-  i = j = 0;
-  qmCnt = eqCnt = spCnt = 0;
-
-  size = strlen(this->raw);
-
-  /* Count number of ULM_EQ and ULM_SP 
-   * and replace all ULM_LF by nul characters */
-  for (i=0; i< (int)size; i++) {
-    switch (this->raw[i]) {
-      case ULM_SP :
-      case ULM_TB :
-         if (qmCnt == 0) { iArraySP[spCnt] = i; spCnt++; }
-         break;
-      case ULM_EQ :
-        if (i==0) {
-               fprintf(stderr,"%s: PARSE ERROR: '%c' at the beginning of log line.\n", func, ULM_EQ);
-               return ULM_PARSE_ERROR;
-        }
-         if (qmCnt == 0) { 
-           if (isblank(this->raw[i-1]) || (!edg_wll_ULMisalphaext(this->raw[i-1]))) {
-             fprintf(stderr,"%s: PARSE ERROR: Disallowed character ('%c') or space before delimiter '%c'.\n",
-                     func,this->raw[i-1],ULM_EQ);
-             return ULM_PARSE_ERROR;
-           }
-           if (isblank(this->raw[i+1]) || ((!edg_wll_ULMisalphaext(this->raw[i-1])) && (this->raw[i+1] != ULM_QM ))) {
-             fprintf(stderr,"%s: PARSE ERROR: Disallowed character ('%c') or space after delimiter '%c'.\n",
-                     func,this->raw[i+1],ULM_EQ);
-             return ULM_PARSE_ERROR;
-           }
-           iArrayEQ[eqCnt] = i; 
-           eqCnt++; 
-         }
-         break;
-      case ULM_LF :
-         if (qmCnt == 0) { this->raw[i] = '\0'; }
-        break;
-      case ULM_QM :
-         if (this->raw[i-1] != ULM_BS) {
-           if (qmCnt == 0) qmCnt++;
-           else qmCnt--;
-         }              
-         if ((qmCnt == 0) && (!isspace(this->raw[i+1]) && (this->raw[i+1] != '\0'))) {
-             fprintf(stderr,"%s: PARSE ERROR: Disallowed character ('%c') after ending '%c'at i=%d size=%d char=%d.\n",
-                     func,this->raw[i+1],ULM_QM,i,size,this->raw[i+1]);
-             for (j=0; j<=i; j++) fputc(this->raw[j],stderr);
-             fputc(ULM_LF,stderr);
-             return ULM_PARSE_ERROR;
-         }
-         break;
-      default :
-         break;
-    } /* switch */
-  } /* for */
-
-  if (eqCnt == 0) {
-    fprintf(stderr,"%s: PARSE ERROR: No '%c' in line \"%s\"\n",func,ULM_EQ,this->raw);
-    return ULM_PARSE_ERROR;                    
-  }
-
-  if (this->raw[0] == ULM_EQ) {
-    fprintf(stderr,"%s: PARSE ERROR: Need at least 1 letter for the first field name.\n",func);
-    return ULM_PARSE_ERROR;                    
-  }
-
-  if (qmCnt != 0) {
-    fprintf(stderr,"%s: PARSE ERROR: Last quoted value did not finish.\n",func);
-    return ULM_PARSE_ERROR;                    
-  }
-
-  /* Allocate names, vals arrays */
-  this->names = (int *) malloc(eqCnt*sizeof(int));
-  this->vals =  (int *) malloc(eqCnt*sizeof(int));
-
-  this->names[0] = (int)(0);
-  this->vals[0]  = (int)(iArrayEQ[0] + 1);
-
-  /* 
-   * Main loop 
-   */
-  for (i=1; i<eqCnt; i++) {
-    eq = &this->raw[iArrayEQ[i]]; 
-    j = 1;
-    while (edg_wll_ULMisalphaext(*(eq-j))) {
-      j++;
-    }
-    if (isblank(*(eq-j))) {
-       this->names[i] = (int)(iArrayEQ[i] - j + 1);
-       this->vals[i]  = (int)(iArrayEQ[i] + 1);
-    }
-    else {
-       fprintf(stderr,"%s: PARSE ERROR: Disallowed character '%c' for field name \
-(e.g. no space between successive delimiters).\n",func,*(eq-j));
-       return ULM_PARSE_ERROR; 
-    }
-  } /* for */
-
-  /* Replace delimiters and intervening whitespace by nul characters */
-  for (i=0; i<eqCnt; i++) this->raw[iArrayEQ[i]] = '\0';   
-  for (i=0; i<spCnt; i++) this->raw[iArraySP[i]] = '\0';
-
-  this->num = eqCnt;
-
-  /* Debug dump of parsed fields */
-//  for( i=0; i<eqCnt; i++ ) fprintf(stdout,"field[%d]: %s=%s\n",i,this->raw+this->names[i],this->raw+this->vals[i]);
-
-  return ULM_PARSE_OK;
-}
-
-/*
- *---------------------------------------------------------------------------
- * edg_wll_ULMisalphaext - test if the character is an ALPHAEXT as described in 
- *              draft-abela-ulm-05
- *---------------------------------------------------------------------------
- */
-int edg_wll_ULMisalphaext( int c) {
-
-  return (isalnum(c) || (c == '.') || (c == '-') || c == '_');
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ULMGetNameAt -- Get name at index.
- *
- * Calls: 
- *
- * Algorithm: array lookup
- *
- *----------------------------------------------------------------------
- */
-char *edg_wll_ULMGetNameAt( p_edg_wll_ULMFields this, int index )
-{
-  if ( index < 0 || index > this->num )
-    return NULL;
-  return (char *)&(this->raw[this->names[index]]);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ULMGetValueAt -- Get value at index
- *
- * Calls: 
- *
- * Algorithm: array lookup
- *
- *----------------------------------------------------------------------
- */
-char *edg_wll_ULMGetValueAt( p_edg_wll_ULMFields this, int index ) 
-{
-  if ( index < 0 || index > this->num )
-    return NULL;
-  return (char *)&(this->raw[this->vals[index]]);
-}
-
-/*
- *---------------------------------------------------------------------------
- * edg_wll_ULMDateToDouble -- Calculate date in sec. since 1/1/1970 from string.
- *                Algorithm borrowed from linux kernel source code,
- *                i.e. Linus Torvalds, who in turn credits it to Gauss.
- *
- * PRE: Input is properly formatted, non-null, need _not_ be null-terminated.
- * IN : String in format YYYYMMDDHHmmss.uuuuuu
- *        YYYY  = 4 digit year
- *        MM    = 2 digit month (1..12)
- *        DD    = 2 digit day of month (1..31)
- *        HH    = 2 digit hour of day ( 0..23 )
- *        mm    = 2 digit minute of hour ( 0..59 )
- *        ss    = 2 digit second of minute ( 0..59 )
- *        uuuuuu= 1..6 digit microsecond of second ( 0..999999 )
- * OUT: Number of seconds, and fraction accurate to at most microseconds,
- *      elapsed since 1/1/1970 (GMT).
- *
- * edg_wll_ULMDateToTimeval -- the same, except it returns timeval
- *---------------------------------------------------------------------------
- */
-double edg_wll_ULMDateToDouble( const char *s )
-{
-  unsigned int year, mon, day, hour, min, sec=0;
-  unsigned long usec=0L;
-
-  edg_wll_ULMSplitDate( s, &year, &mon, &day, &hour, &min, &sec, &usec );
-
-  if (0 >= (int) (mon -= 2)) {    /* 1..12 -> 11,12,1..10 */
-    mon += 12;      /* Puts Feb last since it has leap day */
-    year -= 1;
-  }
-  return (double)
-    ( ( ( (
-           (unsigned long)(year/4 - year/100 + year/400 + 367*mon/12 + day) +
-           year*365 - 719499
-           )*24 + hour /* now have hours */
-          )*60 + min /* now have minutes */
-        )*60 + sec /* seconds */
-      ) + (double)( usec / 1E6 ); /* microseconds */
-}
-
-void edg_wll_ULMDateToTimeval( const char *s, struct timeval *tv )
-{
-  unsigned int year, mon, day, hour, min, sec=0;
-  unsigned long usec=0L;
-
-  edg_wll_ULMSplitDate( s, &year, &mon, &day, &hour, &min, &sec, &usec );
-
-  if (0 >= (int) (mon -= 2)) {    /* 1..12 -> 11,12,1..10 */
-    mon += 12;      /* Puts Feb last since it has leap day */
-    year -= 1;
-  }
-  tv->tv_sec = (long)
-    ( ( ( (
-           (unsigned long)(year/4 - year/100 + year/400 + 367*mon/12 + day) +
-           year*365 - 719499
-           )*24 + hour /* now have hours */
-          )*60 + min /* now have minutes */
-        )*60 + sec /* seconds */
-      );
-  tv->tv_usec = usec; /* microseconds */
-}
-
-/*
- *---------------------------------------------------------------------------
- * edg_wll_ULMSplitDate -- Efficiently break date into parsed component parts.
- *---------------------------------------------------------------------------
- */
-#define DIG(x) ((int)((x)-'0'))
-void edg_wll_ULMSplitDate( const char *s,
-                      unsigned int *year,
-                      unsigned int *mon,
-                      unsigned int *day,
-                      unsigned int *hour,
-                      unsigned int *min,
-                      unsigned int *sec,
-                      unsigned long *usec )
-{
-   *year = DIG(s[0]) * 1000 + DIG(s[1]) * 100 + DIG(s[2]) * 10 + DIG(s[3]);
-   *mon  = DIG(s[4]) * 10 + DIG(s[5]);
-   *day  = DIG(s[6]) * 10 + DIG(s[7]);
-   *hour = DIG(s[8]) * 10 + DIG(s[9]);
-   *min  = DIG(s[10]) * 10 + DIG(s[11]);
-   *sec  = DIG(s[12]) * 10 + DIG(s[13]);
-   if ( s[14] == '.' ) *usec = atol(s+15);
-}
-#undef DIG
-
-/*
- *---------------------------------------------------------------------------
- * edg_wll_ULMTimevalToDate -- Take a seconds, microseconds argument and convert it
- *                   to a date string that edg_wll_ULMDateToDouble could parse.
- *
- * CALL: gmtime, strftime
- *
- * PRE : seconds, usec >= 0 , usec < 1000000 (checked)
- *       date string has DATE_STRING_LENGTH+1 bytes allocated (not checked)
- * IN  : seconds, useconds
- * OUT : date string 'dstr'.
- * RTRN: 0=OK, other=FAILURE
- * POST: This is the inverse of edg_wll_ULMDateToDouble, i.e.
- *         edg_wll_ULMDateToDouble( edg_wll_ULMTimevalToDate( sec, usec ) ) = sec.usec
- *---------------------------------------------------------------------------
- */
-int edg_wll_ULMTimevalToDate( long sec, long usec, char *dstr )
-{
-  char *func = "edg_wll_ULMTimevalToDate";
-  struct tm *tp;
-  int        len;
-
-  if ( sec < 0 || usec < 0 || usec > 999999 )
-    return 1;
-
-  tp = gmtime( (const time_t *) &sec );
-  if ( tp == NULL )
-    return 1;
-
-  len = strftime( dstr,
-                  ULM_DATE_STRING_LENGTH+1-7,
-                  "%Y%m%d%H%M%S",
-                  tp );
-  if ( len != ULM_DATE_STRING_LENGTH-7 ) {
-    fprintf(stderr,"%s: bad strftime() return value: %d\n",func, len);
-    return 1;
-  }
-
-  sprintf( dstr + ULM_DATE_STRING_LENGTH-7, ".%06ld", usec );
-
-  return 0;
-}
-
diff --git a/org.glite.lb.common/src/xml_conversions.c b/org.glite.lb.common/src/xml_conversions.c

deleted file mode 100644 (file)

index d9a6dce..0000000
--- a/org.glite.lb.common/src/xml_conversions.c
+++ /dev/null
@@ -1,836 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <expat.h>
-
-#include "trio.h"
-
-#include "xml_conversions.h"
-
-
-
-static const struct timeval null_timeval = {0,0};
-
-
-/************************************************************************/
-/* Context manipulation functions                                      */      
-
-
-void edg_wll_initXMLCtx(edg_wll_XML_ctx *c) {
-       c->ctx = NULL;
-        c->p = NULL;
-       c->message_body = NULL;
-        c->eventCode = EDG_WLL_EVENT_UNDEF;
-        c->position = 0;
-        c->position2 = 0;
-       c->max_index = -1;
-       c->row = 0;
-       c->row2 = 0;
-        c->level = 0;
-        memset(&(c->element), 0, sizeof(c->element));
-        c->char_buf = NULL;
-        c->char_buf_len = 0;
-        c->XML_tag = NULL;
-        c->XML_tag2 = NULL;
-       c->job_conditions = NULL;
-       c->event_conditions = NULL;
-       c->type = EDG_WLL_QUERY_TYPE_UNDEF;
-       c->conditions = NULL;
-       c->flags = 0;
-        c->jobsOutGlobal = NULL;
-        c->eventsOutGlobal = NULL;
-        c->jobStatGlobal = NULL;
-       memset(&(c->jobStatSingleGlobal),0,sizeof(c->jobStatSingleGlobal));
-       c->strListGlobal = NULL;
-       c->intListGlobal = NULL;
-       c->indexToTag    = NULL;
-       c->tagToIndex    = NULL;
-       c->tagListGlobal = NULL;
-       c->stsListGlobal = NULL;
-       memset(&(c->purgeRequestGlobal),0,sizeof(c->purgeRequestGlobal));
-       memset(&(c->purgeResultGlobal),0,sizeof(c->purgeResultGlobal));
-       memset(&(c->dumpRequestGlobal),0,sizeof(c->dumpRequestGlobal));
-       memset(&(c->dumpResultGlobal),0,sizeof(c->dumpResultGlobal));
-       memset(&(c->loadRequestGlobal),0,sizeof(c->loadRequestGlobal));
-       memset(&(c->loadResultGlobal),0,sizeof(c->loadResultGlobal));
-       c->notifFunction = NULL;
-       c->notifClientAddress = NULL;
-       c->notifId = NULL;
-       c->notifChangeOp = EDG_WLL_NOTIF_NOOP;
-       c->notifValidity = -1;
-       c->attrsGlobal  = NULL;
-       c->errCode = 0;
-       c->bound = 0;
-       c->errDesc = NULL;
-       c->stat_begin = 0;
-       c->jobQueryRec_begin = 0;
-        c->errtxt = NULL;
-       c->warntxt = NULL;
-}
-
-
-void edg_wll_freeXMLCtx(edg_wll_XML_ctx *c) {
-        if (c->char_buf) free(c->char_buf);
-        if (c->errtxt) free(c->errtxt);
-        if (c->warntxt) free(c->warntxt);
-       if (c->XML_tag) free(c->XML_tag);
-       if (c->XML_tag2) free(c->XML_tag2);
-}
-
-
-void edg_wll_freeBuf(edg_wll_XML_ctx *c) {
-        free(c->char_buf);
-        c->char_buf = NULL;
-        c->char_buf_len = 0;
-}
-
-
-
-/************************************************************************/
-/* type to XML conversion functions                                    */
-
-
-/* edg_wll_add_string_to_XMLBody(&body, eventsOut[i].jobMatch.destination, "destination", NULL) */
-
-void edg_wll_add_string_to_XMLBody(char **body, const char *toAdd, const char *tag, const char *null)
-{
-       if ( toAdd != null ) {
-               char *newBody;
-               
-               trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xs</%s>\r\n", *body, tag, toAdd, tag);
-
-               free(*body);
-               *body = newBody;
-       }
-}
-
-void edg_wll_add_tagged_string_to_XMLBody(char **body, const char *toAdd, const char *tag, 
-                                         const char *name, const char *tag2, const char *null)
-{
-       if ( toAdd != null ) {
-               char *newBody;
-               
-               trio_asprintf(&newBody,"%s\t\t\t<%s %s=\"%|Xs\">%|Xs</%s>\r\n", 
-                       *body, tag, tag2, name, toAdd, tag);
-
-               free(*body);
-               *body = newBody;
-       }
-}
-
-/* edg_wll_add_int_to_XMLBody(&body, eventsOut[i].jobMatch.code, "code", 0) */
-
-void edg_wll_add_int_to_XMLBody(char **body, const int toAdd, const char *tag, const int null)
-{
-       if (toAdd != null) {
-                char *newBody;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xd</%s>\r\n", *body, tag, toAdd, tag);
-
-                free(*body);
-                *body = newBody;
-       }
-}
-
-
-/* edg_wll_add_timeval_to_XMLBody(&body, eventsOut[i].any.tv, "timestamp", -1) */
-
-void edg_wll_add_timeval_to_XMLBody(char **body, struct timeval toAdd, const char *tag, const struct timeval null)
-{
-
-       if (toAdd.tv_sec != null.tv_sec || toAdd.tv_usec != null.tv_usec) {
-                char *newBody;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%ld.%06ld</%s>\r\n", 
-               *body, tag, toAdd.tv_sec, toAdd.tv_usec, tag);
-
-                free(*body);
-                *body = newBody;
-       }
-}
-
-
-/* edg_wll_add_jobid_to_XMLBody(&body, eventsOut[i].any.jobId, "jobId", NULL) */
-
-void edg_wll_add_jobid_to_XMLBody(char **body, edg_wlc_JobId toAdd, const char *tag, const void *null)
-{
-       if (toAdd != (edg_wlc_JobId) null) {
-                char *newBody, *pom;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xs</%s>\r\n",
-                *body, tag, pom = edg_wlc_JobIdUnparse(toAdd), tag);
-
-                free(*body);
-               free(pom);
-                *body = newBody;
-       }
-}
-
-
-void edg_wll_add_notifid_to_XMLBody(char **body, edg_wll_NotifId toAdd, const char *tag, const void *null)
-{
-       if (toAdd != (edg_wll_NotifId) null) {
-                char *newBody, *pom;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xs</%s>\r\n",
-                *body, tag, pom = edg_wll_NotifIdUnparse(toAdd), tag);
-
-                free(*body);
-               free(pom);
-                *body = newBody;
-       }
-}
-
-
-/* edg_wll_add_edg_wll_JobStatCode_to_XMLBody(&body, eventsOut[i].any.jobId, "jobId", EDG_WLL_JOB_UNDEF) */
-
-void edg_wll_add_edg_wll_JobStatCode_to_XMLBody(char **body, edg_wll_JobStatCode toAdd, const char *tag, const edg_wll_JobStatCode null)
-{
-       if (toAdd != null) {
-                char *newBody, *pom;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xs</%s>\r\n",
-                       *body, tag, pom = edg_wll_StatToString(toAdd), tag);
-
-                free(*body);
-               free(pom);
-                *body = newBody;
-       }
-}
-
-void edg_wll_add_edg_wll_EventCode_to_XMLBody(char **body, edg_wll_EventCode toAdd, const char *tag, const edg_wll_EventCode null)
-{
-       char *newBody, *pom;
-       
-       if (toAdd != null) {
-               trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xs</%s>\r\n",
-                       *body, tag, pom = edg_wll_EventToString(toAdd), tag);   
-
-               free(*body);
-               free(pom);
-               *body = newBody;
-       }
-}
-
-
-void edg_wll_add_time_t_to_XMLBody(char **body, const time_t toAdd, const char *tag, const time_t null)
-{
-       if (toAdd != null) {
-                char *newBody;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xld</%s>\r\n", *body, tag, toAdd, tag);
-
-                free(*body);
-                *body = newBody;
-       }
-}
-
-
-void edg_wll_add_tagged_time_t_to_XMLBody(char **body, const time_t toAdd, const char *tag,
-                                          const char *name, const char *tag2, const time_t null)
-{
-        if ( toAdd != null ) {
-                char *newBody;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s %s=\"%|Xs\">%|Xld</%s>\r\n",
-                        *body, tag, tag2, name, toAdd, tag);
-
-                free(*body);
-                *body = newBody;
-        }
-}
-
-
-void edg_wll_add_uint16_t_to_XMLBody(char **body, const uint16_t toAdd, const char *tag, const uint16_t null)
-{
-       if (toAdd != null) {
-                char *newBody;
-
-                trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xu</%s>\r\n", *body, tag, toAdd, tag);
-
-                free(*body);
-                *body = newBody;
-       }
-}
-
-
-void edg_wll_add_logsrc_to_XMLBody(char **body, const edg_wll_Source toAdd, const char *tag, const edg_wll_Source null)
-{
-        if (toAdd != null) {
-               char *newBody, *pom;
-
-               trio_asprintf(&newBody,"%s\t\t\t<%s>%|Xs</%s>\r\n",
-                        *body, tag, pom = edg_wll_SourceToString(toAdd), tag);
-               
-               free(*body);
-               free(pom);
-               *body = newBody;
-       }
-}
-
-void edg_wll_add_strlist_to_XMLBody(char **body, char * const *toAdd, const char *tag,  const char *subTag, const char *indent,  const  char *null)
-{
-        char *pomA, *pomB, *newBody;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0;
-        int *len_list = NULL;
-
-       
-       if (!toAdd) return;
-               
-        while (toAdd[i] != null) {
-                len = trio_asprintf(&pomA,"%s\t<%s>%|Xs</%s>\r\n",
-                        indent,subTag,toAdd[i],subTag);
-
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) + 1);
-       pomB = pomA;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-       *pomB = '\0';
-        free(list);
-        free(len_list);
-
-       asprintf(&newBody,"%s%s<%s>\r\n%s%s</%s>\r\n", *body, indent, tag, pomA, indent, tag);
-       free(*body);
-       free(pomA);
-       *body = newBody;        
-}
-
-void edg_wll_add_intlist_to_XMLBody(char **body, const int *toAdd, const char *tag, char *(*indexToTag)(), const char *indent, const int from, const int to)
-{
-        char *pomA, *pomB, *newBody;
-        char **list = NULL;
-        int i, len, tot_len = 0;
-        int *len_list = NULL;
-
-       
-       i = from;
-        while (i <= to) {
-                len = trio_asprintf(&pomA,"%s\t<%s>%|Xd</%s>\r\n",
-                        indent, indexToTag(i-1),toAdd[i],indexToTag(i-1));
-
-               i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) + 1);
-       pomB = pomA;
-
-        i = from;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-       *pomB = '\0';
-        free(list);
-        free(len_list);
-
-       asprintf(&newBody,"%s%s<%s>\r\n%s%s</%s>\r\n", *body, indent, tag, pomA, indent, tag);
-        free(*body);
-        free(pomA);
-        *body = newBody;
-}
-
-
-void edg_wll_add_taglist_to_XMLBody(char **body,  const edg_wll_TagValue *toAdd, const char *tag,  const char *subTag, const char *subTag2, const char *indent, const  char *null)
-{
-        char *pomA, *pomB, *newBody;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0;
-        int *len_list = NULL;
-
-
-        while (toAdd && (toAdd[i].tag != null) ) {
-                len = trio_asprintf(&pomA,"%s\t<%s %s=\"%|Xs\">%|Xs</%s>\r\n",
-                        indent,subTag,subTag2,toAdd[i].tag,toAdd[i].value,subTag);
-
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) + 1);
-       pomB = pomA;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-       *pomB = '\0';
-        free(list);
-        free(len_list);
-
-       asprintf(&newBody,"%s%s<%s>\r\n%s%s</%s>\r\n", *body, indent, tag, pomA, indent, tag);
-       free(*body);
-       free(pomA);
-       *body = newBody;        
-}
-
-
-void edg_wll_add_time_t_list_to_XMLBody(char **body, const time_t *toAdd, const char *tag, char *(*indexToTag)(), const char *indent, const int from, const int to)
-{
-        char *pomA, *pomB, *newBody;
-        char **list = NULL;
-        int i, len, tot_len = 0;
-        int *len_list = NULL;
-
-       
-       i = from;
-        while (i < to) {
-                len = trio_asprintf(&pomA,"%s\t<%s>%|Xld</%s>\r\n",
-                        indent, indexToTag(i),toAdd[i],indexToTag(i));
-
-               i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) + 1);
-       pomB = pomA;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-       *pomB = '\0';
-        free(list);
-        free(len_list);
-
-       asprintf(&newBody,"%s%s<%s>\r\n%s%s</%s>\r\n", *body, indent, tag, pomA, indent, tag);
-        free(*body);
-        free(pomA);
-        *body = newBody;
-}
-
-
-// void edg_wll_add_stslist_to_XMLBody(char **body, const edg_wll_JobStat *toAdd, const char *tag, const char *UNUSED_subTag, const int null)
-// in lbserver/lb_xml_parse.c.T
-
-/************************************************************************/
-/* string to type conversion functions                                 */
-
-
-/* XMLCtx->eventsOutGlobal[XMLCtx->position].any.prog = edg_wll_from_string_to_string(XMLCtx); */
-char *edg_wll_from_string_to_string(edg_wll_XML_ctx *XMLCtx)
-{
-       return(XMLCtx->char_buf);
-} 
-
-
-/* XMLCtx->eventsOutGlobal[XMLCtx->position].any.jobId = edg_wll_from_string_to_dgJobId(XMLCtx); */
-edg_wlc_JobId edg_wll_from_string_to_jobid(edg_wll_XML_ctx *XMLCtx)
-{
-       edg_wlc_JobId out;
-
-       edg_wlc_JobIdParse(XMLCtx->char_buf, &out);
-       edg_wll_freeBuf(XMLCtx); 
-
-       return(out);
-}
-
-
-
-edg_wll_NotifId edg_wll_from_string_to_notifid(edg_wll_XML_ctx *XMLCtx)
-{
-       edg_wll_NotifId out;
-
-       edg_wll_NotifIdParse(XMLCtx->char_buf, &out);
-       edg_wll_freeBuf(XMLCtx); 
-
-       return(out);
-}
-
-
-
-edg_wll_JobStatCode edg_wll_from_string_to_edg_wll_JobStatCode(edg_wll_XML_ctx *XMLCtx)
-{
-       edg_wll_JobStatCode out;
-       
-       out = edg_wll_StringToStat(XMLCtx->char_buf);
-       edg_wll_freeBuf(XMLCtx); 
-
-       return(out);
-}
-
-
-
-
-/* XMLCtx->eventsOutGlobal[XMLCtx->position].jobClear.clearReason = 
-       edg_wll_from_string_to_int(XMLCtx);                             */
-int edg_wll_from_string_to_int(edg_wll_XML_ctx *XMLCtx)
-{
-        int out;
-
-        out = atoi(XMLCtx->char_buf);
-        edg_wll_freeBuf(XMLCtx);
-
-        return(out);
-}
-
-
-long edg_wll_from_string_to_long(edg_wll_XML_ctx *XMLCtx)
-{
-        long out;
-
-        out = atol(XMLCtx->char_buf);
-        edg_wll_freeBuf(XMLCtx);
-
-        return(out);
-}
-
-
-uint16_t edg_wll_from_string_to_uint16_t(edg_wll_XML_ctx *XMLCtx)
-{
-        return( (uint16_t) edg_wll_from_string_to_int(XMLCtx) );
-}
-
-
-struct timeval edg_wll_from_string_to_timeval(edg_wll_XML_ctx *XMLCtx)
-{
-       struct timeval out;
-       char *needle, *nil;
-
-       out.tv_sec  = strtol(XMLCtx->char_buf, &needle, 10);
-       out.tv_usec = strtol(needle+1, &nil, 10);
-       edg_wll_freeBuf(XMLCtx);
-
-       return(out);
-}
-
-
-time_t edg_wll_from_string_to_time_t(edg_wll_XML_ctx *XMLCtx)
-{
-        return( (time_t) edg_wll_from_string_to_long(XMLCtx) );
-}
-
-
-edg_wll_Source edg_wll_from_string_to_logsrc(edg_wll_XML_ctx *XMLCtx)
-{
-       edg_wll_Source  out = edg_wll_StringToSource(XMLCtx->char_buf);
-       
-       edg_wll_freeBuf(XMLCtx);
-       return(out);
-}
-
-
-
-/************************************************************************/
-/* various conversion functions                                        */
-
-
-char *edg_wll_stat_flags_to_string(int flags)
-{
-        char *cflags = NULL, *temp_cflags = NULL;
-
-
-        if (flags & EDG_WLL_STAT_CLASSADS) asprintf(&cflags,"%s","classadd");
-        if (flags & EDG_WLL_STAT_CHILDREN) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"children");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","children");
-        }
-        if (flags & EDG_WLL_STAT_CHILDSTAT) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"childstat");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","childstat");
-        }
-        if (flags & EDG_WLL_STAT_NO_JOBS) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"no_jobs");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","no_jobs");
-        }
-        if (flags & EDG_WLL_STAT_NO_STATES) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"no_states");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","no_states");
-        }
-
-        if (!cflags) cflags = strdup("");
-
-        return(cflags);
-}
-
-
-int edg_wll_string_to_stat_flags(char *cflags)
-{
-       int flags = 0;
-       char *sflag, *last;
-
-       if (cflags == NULL) return 0;
-
-       sflag = strtok_r(cflags, "+", &last);
-       while (sflag != NULL) {
-               if (!strcmp(sflag,"classadd")) flags = flags | EDG_WLL_STAT_CLASSADS;
-               if (!strcmp(sflag,"children")) flags = flags | EDG_WLL_STAT_CHILDREN;
-               if (!strcmp(sflag,"childstat")) flags = flags | EDG_WLL_STAT_CHILDSTAT;
-               if (!strcmp(sflag,"no_jobs")) flags = flags | EDG_WLL_STAT_NO_JOBS;
-               if (!strcmp(sflag,"no_states")) flags = flags | EDG_WLL_STAT_NO_STATES;
-               sflag = strtok_r(NULL, "+", &last);
-       } 
-
-       return(flags);
-}
-
-
-char *edg_wll_purge_flags_to_string(int flags)
-{
-        char *cflags = NULL, *temp_cflags = NULL;
-
-
-        if (flags & EDG_WLL_PURGE_REALLY_PURGE) asprintf(&cflags,"%s","really_purge");
-        if (flags & EDG_WLL_PURGE_LIST_JOBS) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"list_jobs");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","list_jobs");
-        }
-        if (flags & EDG_WLL_PURGE_SERVER_DUMP) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"server_dump");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","server_dump");
-        }
-        if (flags & EDG_WLL_PURGE_CLIENT_DUMP) {
-                if (cflags) {
-                        asprintf(&temp_cflags,"%s+%s",cflags,"client_dump");
-                        free(cflags);
-                        cflags=temp_cflags;
-                }
-                else asprintf(&cflags,"%s","client_dump");
-        }
-
-        if (!cflags) cflags = strdup("");
-
-        return(cflags);
-}
-
-
-int edg_wll_string_to_purge_flags(char *cflags)
-{
-       int flags = 0;
-       char *sflag, *last;
-
-       if (cflags == NULL) return 0;
-
-       sflag = strtok_r(cflags, "+", &last);
-       while (sflag != NULL) {
-               if (!strcmp(sflag,"really_purge")) flags = flags | EDG_WLL_PURGE_REALLY_PURGE;
-               if (!strcmp(sflag,"list_jobs")) flags = flags | EDG_WLL_PURGE_LIST_JOBS;
-               if (!strcmp(sflag,"server_dump")) flags = flags | EDG_WLL_PURGE_SERVER_DUMP;
-               if (!strcmp(sflag,"client_dump")) flags = flags | EDG_WLL_PURGE_CLIENT_DUMP;
-               sflag = strtok_r(NULL, "+", &last);
-       } 
-
-       return(flags);
-}
-
-
-/* Functions for conversion of DUMP constants */
-
-static const char * const dumpConsts[] = {
-       "EDG_WLL_DUMP_NOW",
-       "EDG_WLL_DUMP_LAST_START",
-       "EDG_WLL_DUMP_LAST_END",
-};
-
-int edg_wll_StringToDumpConst(const char *name)
-
-{
-        int     i;
-
-        for (i=0; i<sizeof(dumpConsts)/sizeof(dumpConsts[0]); i++)
-                if (strcasecmp(dumpConsts[i],name) == 0) return -(i+1);
-        return 1;
-}
-
-char *edg_wll_DumpConstToString(int dumpConst)
-{
-        if (dumpConst >= 0 || -(dumpConst) > sizeof(dumpConsts)/sizeof(dumpConsts[0])) return (char *) NULL;
-        return strdup(dumpConsts[-(dumpConst+1)]);
-}
-
-
-
-/* Functions for conversion of DONE CODE */ 
-
-static const char * const done_codeConsts[] = {
-       "DONE_CODE_OK",
-       "DONE_CODE_FAILED",
-       "DONE_CODE_CANCELLED",
-};
-
-int edg_wll_StringTodone_code(const char *name)
-
-{
-        int     i;
-
-        for (i=0; i<sizeof(done_codeConsts)/sizeof(done_codeConsts[0]); i++)
-                if (strcasecmp(done_codeConsts[i],name) == 0) return i;
-        return 1;
-}
-
-char *edg_wll_done_codeToString(int done_codeConst)
-{
-        if (done_codeConst < 0 || (done_codeConst) > sizeof(done_codeConsts)/sizeof(done_codeConsts[0])) return (char *) NULL;
-        return strdup(done_codeConsts[done_codeConst]);
-}
-
-
-
-/* Functions for conversion of QUERY ATTRIBUTES */ 
-
-static const char * const query_attrConsts[] = {
-        "EDG_WLL_QUERY_ATTR_UNDEF",
-        "EDG_WLL_QUERY_ATTR_JOBID",
-        "EDG_WLL_QUERY_ATTR_OWNER",
-        "EDG_WLL_QUERY_ATTR_STATUS",
-        "EDG_WLL_QUERY_ATTR_LOCATION",
-        "EDG_WLL_QUERY_ATTR_DESTINATION",
-        "EDG_WLL_QUERY_ATTR_DONECODE",
-        "EDG_WLL_QUERY_ATTR_USERTAG",
-        "EDG_WLL_QUERY_ATTR_TIME",
-        "EDG_WLL_QUERY_ATTR_LEVEL",
-        "EDG_WLL_QUERY_ATTR_HOST",
-        "EDG_WLL_QUERY_ATTR_SOURCE",
-        "EDG_WLL_QUERY_ATTR_INSTANCE",
-        "EDG_WLL_QUERY_ATTR_EVENT_TYPE",
-        "EDG_WLL_QUERY_ATTR_CHKPT_TAG",
-        "EDG_WLL_QUERY_ATTR_RESUBMITTED",
-        "EDG_WLL_QUERY_ATTR_PARENT",
-        "EDG_WLL_QUERY_ATTR_EXITCODE",
-        "EDG_WLL_QUERY_ATTR__LAST",
-};
-
-edg_wll_QueryAttr edg_wll_StringToquery_attr(const char *name)
-
-{
-        int     i;
-
-        for (i=0; i<sizeof(query_attrConsts)/sizeof(query_attrConsts[0]); i++)
-                if (strcasecmp(query_attrConsts[i],name) == 0) return (edg_wll_QueryAttr) i;
-        return EDG_WLL_QUERY_ATTR_UNDEF;
-}
-
-char *edg_wll_query_attrToString(edg_wll_QueryAttr query_attrConst)
-{
-        if (query_attrConst < 0 || (query_attrConst) > sizeof(query_attrConsts)/sizeof(query_attrConsts[0])) return (char *) NULL;
-        return strdup(query_attrConsts[(int) query_attrConst]);
-}
-
-
-
-/* Functions for conversion of NOTIFICATION CHANGE OPERATORS */ 
-
-static const char * const notifChangeOpConsts[] = {
-       "EDG_WLL_NOTIF_NOOP"
-       "EDG_WLL_NOTIF_REPLACE",
-       "EDG_WLL_NOTIF_ADD",
-       "EDG_WLL_NOTIF_REMOVE",
-};
-
-
-
-edg_wll_NotifChangeOp edg_wll_StringToNotifChangeOp(const char *name)
-{
-        int     i;
-
-        for (i=0; i<sizeof(notifChangeOpConsts)/sizeof(notifChangeOpConsts[0]); i++)
-                if (strcasecmp(notifChangeOpConsts[i],name) == 0) return (edg_wll_NotifChangeOp) i;
-        return EDG_WLL_NOTIF_NOOP;
-}
-
-
-
-char *edg_wll_NotifChangeOpToString(edg_wll_NotifChangeOp notifChangeOpConst)
-{
-        if (notifChangeOpConst < 0 || (notifChangeOpConst) > sizeof(notifChangeOpConsts)/sizeof(notifChangeOpConsts[0])) return (char *) NULL;
-        return strdup(notifChangeOpConsts[(int) notifChangeOpConst]);
-}
diff --git a/org.glite.lb.common/src/xml_parse.c.T b/org.glite.lb.common/src/xml_parse.c.T

deleted file mode 100644 (file)

index fec866d..0000000
--- a/org.glite.lb.common/src/xml_parse.c.T
+++ /dev/null
@@ -1,2612 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <assert.h>
-
-#include <expat.h>     // Expat header file
-
-#include "globus_config.h"
-
-#include "trio.h"
-#include "glite/lb/producer.h"
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "escape.h"
-#include "context-int.h"
-#include "xml_parse.h"
-#include "xml_conversions.h"    
-
-
-#ifdef __GNUC__ 
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR 
-#endif
-
-#define QUERY_EVENTS_REQUEST_BEGIN     "<edg_wll_QueryEventsRequest"
-#define QUERY_EVENTS_REQUEST_END       "\t</and>\r\n</edg_wll_QueryEventsRequest>"
-#define QUERY_EVENTS_OREC_BEGIN                "\t\t<orEventConditions>\r\n"
-#define QUERY_EVENTS_OREC_END          "\t\t</orEventConditions>\r\n"
-#define QUERY_EVENTS_ORJC_BEGIN                "\t\t<orJobConditions>\r\n"
-#define QUERY_EVENTS_ORJC_END          "\t\t</orJobConditions>\r\n"
-#define QUERY_JOBS_REQUEST_BEGIN       "<edg_wll_QueryJobsRequest"
-#define QUERY_JOBS_REQUEST_END         "\t</and>\r\n</edg_wll_QueryJobsRequest>"
-#define QUERY_JOBS_OR_BEGIN            "\t\t<orJobConditions>\r\n"
-#define QUERY_JOBS_OR_END              "\t\t</orJobConditions>\r\n"
-#define PURGE_REQUEST_BEGIN            "<edg_wll_PurgeRequest>\r\n"
-#define PURGE_REQUEST_END              "</edg_wll_PurgeRequest>\r\n"
-#define DUMP_REQUEST_BEGIN             "<edg_wll_DumpRequest>\r\n"
-#define DUMP_REQUEST_END               "</edg_wll_DumpRequest>\r\n"
-#define LOAD_REQUEST_BEGIN             "<edg_wll_LoadRequest>\r\n"
-#define LOAD_REQUEST_END               "</edg_wll_LoadRequest>\r\n"
-#define INDEXED_ATTRS_REQUEST_BEGIN    "<edg_wll_IndexedAttrsReguest>\r\n"
-#define INDEXED_ATTRS_REQUEST_END      "</edg_wll_IndexedAttrsReguest>\r\n"
-#define NOTIF_REQUEST_BEGIN            "<edg_wll_NotifRequest"
-#define NOTIF_REQUEST_END              "</edg_wll_NotifRequest>\r\n"
-
-
-/* lists of accepted tags */
-static const char * const jobStatTags[] = {
-@@@{
-       selectType $status '_common_';
-        for (getFieldsOrdered $status) {
-                gen "\t\"$_\",\n";
-        }
-@@@}
-        NULL
-};
-
-
-@@@{
-                gen "static const char * const eventJobCommon\[] = {";
-                selectType $event '_common_';
-                for (getFieldsOrdered $event) {
-                        my $f = selectField $event $_;
-                        my $fn = $f->{name};
-                        gen "\"$fn\",  ";
-                }
-                gen "NULL };\n";
-@@@}
-@@@{
-        for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-                        $event->getTypes) {
-                gen "static const char * const event$t\[] = {";
-                selectType $event $t;
-                for (getFieldsOrdered $event) {
-                        my $f = selectField $event $_;
-                        my $fn = $f->{name};
-                        gen "\"$fn\",  "
-                }
-                gen "NULL };\n";
-        }
-@@@}
-
-
-
-static const char * const * const eventTags[] = {
-        eventJobCommon,
-@@@{
-        for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-                        $event->getTypes) {
-                gen "\tevent$t,\n";
-        }
-        gen "\tNULL\n};\n";
-@@@}
-
-
-
-/* used when error unrecoverable*/
-#define unexpError() {\
-        char    *e;\
-\
-        if (XMLCtx->errtxt) {\
-                asprintf(&e,"%s\nunexpected <%s> at line %d",XMLCtx->errtxt,\
-                        XMLCtx->element,XML_GetCurrentLineNumber(XMLCtx->p));\
-                free(XMLCtx->errtxt);\
-        } else asprintf(&e,"unexpected <%s> at line %d",\
-                XMLCtx->element,XML_GetCurrentLineNumber(XMLCtx->p));\
-        XMLCtx->errtxt = e;\
-}
-
-
-
-static void emptyCall(void){
-}
-
-/* used when error recoverable */
-// XXX quadratic complexity - problematic when lots of errors in long outputs (10.000's)
-#define unexpWarning() {\
-        char    *e;\
-\
-emptyCall(); \
-        if (XMLCtx->warntxt) {\
-                asprintf(&e,"%s\nunexpected <%s> at line %d",XMLCtx->warntxt,\
-                        XMLCtx->element,XML_GetCurrentLineNumber(XMLCtx->p));\
-                free(XMLCtx->warntxt);\
-        } else asprintf(&e,"unexpected <%s> at line %d",\
-                XMLCtx->element,XML_GetCurrentLineNumber(XMLCtx->p));\
-        XMLCtx->warntxt = e;\
-}
-
-
-
-
-static void startQueryJobs(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-        
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp("edg_wll_QueryJobsResult", el)) { unexpError() break;}
-                        if (attr[0] && attr[1] && attr[2] && attr[3]) {
-                               if (strcmp(attr[0],"code")) { unexpError() break;}
-                                else XMLCtx->errCode = atoi(attr[1]);
-
-                                if (strcmp(attr[2],"desc")) { unexpError() break;}
-                                else XMLCtx->errDesc = strdup(attr[3]);
-                         }
-                        break;  
-
-               case 1 : if (strcmp("edg_wll_Job", el)) unexpError()
-                        break;
-
-               case 2 : if (!strcmp("jobId", el)) {
-                               /* allocates space only for pointers to structures edg_wlc_jobid_t */
-                               /* space for structures allocate characterUserJobs         */
-                               XMLCtx->jobsOutGlobal = realloc(XMLCtx->jobsOutGlobal,
-                                                        (XMLCtx->position+1)*sizeof(*XMLCtx->jobsOutGlobal));
-                               if (!XMLCtx->jobsOutGlobal) { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                               XMLCtx->jobsOutGlobal[XMLCtx->position] = NULL;
-                        }
-                        else if (!strcmp("jobStat", el)) {
-                               XMLCtx->stat_begin = XML_GetCurrentByteIndex(XMLCtx->p);
-                               XMLCtx->jobStatGlobal = (edg_wll_JobStat *) realloc(XMLCtx->jobStatGlobal,
-                                                               (XMLCtx->position2+1)*sizeof(*XMLCtx->jobStatGlobal));
-
-                        }
-                        else unexpWarning()
-                        break;
-
-               // XXX ?? this may be usefull with status
-               case 3 : /* fall through */
-               case 4 : /* do not check xml tags, try to be faul-tolerant              */
-                        /* if tag not found during unparsing, xmlMalformed flag is set */
-                        break;
-
-               default: if (!XMLCtx->stat_begin) unexpWarning()
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-
-static void startQueryEvents(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-        
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp("edg_wll_QueryEventsResult", el)) { unexpError() break;}
-                         if (attr[0] && attr[1] && attr[2] && attr[3]) {
-                                if (strcmp(attr[0],"code")) { unexpError() break;}
-                                else XMLCtx->errCode = atoi(attr[1]);
-
-                                if (strcmp(attr[2],"desc")) { unexpError() break;}
-                                else XMLCtx->errDesc = strdup(attr[3]);
-                         }
-
-                        break;  
-
-               case 1 : if (strcmp("edg_wll_Event", el)) unexpError()
-                         else {
-                               XMLCtx->position++;
-                               
-                               if (!attr[0] || !attr[1]) { unexpError() break;}
-                               if (strcmp(attr[0],"name")) { unexpError() break;}
-                                if ( (XMLCtx->eventCode = edg_wll_StringToEvent((char *) attr[1])) 
-                                       == EDG_WLL_EVENT_UNDEF ) { unexpError() break;}
-                                XMLCtx->eventsOutGlobal = realloc(XMLCtx->eventsOutGlobal,
-                                                         (XMLCtx->position+1)*sizeof(*XMLCtx->eventsOutGlobal));
-                                       if (!XMLCtx->eventsOutGlobal) { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                                       memset(&(XMLCtx->eventsOutGlobal)[XMLCtx->position],0,sizeof(*XMLCtx->eventsOutGlobal));
-                                XMLCtx->eventsOutGlobal[XMLCtx->position].any.type  = XMLCtx->eventCode;
-                               }
-                        break;
-
-               case 2 : /* do not check xml tags, try to be faul-tolerant              */
-                        /* if tag not found during unparsing, xmlMalformed flag is set */
-                        break;
-
-               default: unexpWarning()
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-
-
-static void startUserJobs(void *data, const char *el, const char **attr UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp("edg_wll_UserJobs", el)) { unexpError() break;}
-                         if (attr[0] && attr[1] && attr[2] && attr[3]) {
-                                if (strcmp(attr[0],"code")) { unexpError() break;}
-                                else XMLCtx->errCode = atoi(attr[1]);
-
-                                if (strcmp(attr[2],"desc")) { unexpError() break;}
-                               else XMLCtx->errDesc = strdup(attr[3]);
-                         }
-                        break;  
-
-               case 1 : if (strcmp("jobId", el)) unexpError()
-                        else {
-                               /* allocates space only for pointers to structures edg_wlc_jobid_t */
-                               /* space for structures allocate endUserJobs                       */
-                               XMLCtx->jobsOutGlobal = realloc(XMLCtx->jobsOutGlobal,
-                                                        (XMLCtx->position+1)*sizeof(XMLCtx->jobsOutGlobal));
-                               if (!XMLCtx->jobsOutGlobal) { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                               XMLCtx->jobsOutGlobal[XMLCtx->position] = NULL;
-                        }
-                        break;
-
-
-               default: unexpWarning()
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-
-static void startJobStatus(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       edg_wll_JobStatCode     statusCode;             /* code of status in process */
-
-
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp("jobStat", el)) { unexpError() break;}
-                        if (!attr[0] || !attr[1]) { unexpError() break;}
-                        if (strcmp(attr[0],"name")) { unexpError() break;}
-
-                        if ( (statusCode = edg_wll_StringToStat(attr[1])) 
-                               == (edg_wll_JobStatCode)-1 ) 
-                               /* status unknown, but try to get as much as possible */
-                               unexpWarning()
-                        else {
-                               if (edg_wll_InitStatus(&XMLCtx->jobStatSingleGlobal)) 
-                                       { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                               XMLCtx->jobStatSingleGlobal.state = statusCode;
-                        }
-
-                         if (attr[2] && attr[3] && attr[4] && attr[5]) {
-                                if (strcmp(attr[2],"code")) { unexpError() break;}
-                                else XMLCtx->errCode = atoi(attr[3]);
-
-                                if (strcmp(attr[4],"desc")) { unexpError() break;}
-                                else XMLCtx->errDesc = strdup(attr[5]);
-                         }
-                         break;
-
-               case 1 : if (!strcmp("user_tags", el) || !strcmp("user_values", el) 
-                               || !strcmp("children_hist", el) ||  !strcmp("stateEnterTimes", el)
-                               || !strcmp("children_states", el) || !strcmp("children", el)) {
-                               XMLCtx->stat_begin = XML_GetCurrentByteIndex(XMLCtx->p);
-                        }
-                        break;
-
-               case 2 : /* fall through */
-               case 3 : /* fall through */
-               case 4 : /* do not check xml tags, try to be faul-tolerant              */
-                        /* if tag not found during unparsing, xmlMalformed flag is set */
-                        break;
-
-
-               default: unexpWarning() 
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-static void startStrList(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp(XMLCtx->XML_tag, el)) unexpError()
-                        break;  
-
-               case 1 : if (!strcmp(XMLCtx->XML_tag2, el)) {
-                               XMLCtx->strListGlobal = realloc(XMLCtx->strListGlobal,
-                                                        (XMLCtx->position+1)*sizeof(*XMLCtx->strListGlobal));
-                                if (!XMLCtx->strListGlobal) { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                                XMLCtx->strListGlobal[XMLCtx->position] = NULL;
-
-                        }
-                        break;
-
-               default: unexpWarning() 
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-
-static void startIntList(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       int index = 0;
-
-
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp(XMLCtx->XML_tag, el)) unexpError()
-                        break;  
-
-               case 1 : if ( (index = XMLCtx->tagToIndex(el)) >= 0 ) {
-                               if (index > XMLCtx->max_index) {
-                                       XMLCtx->max_index = index;
-                                       /* leave zeros' possition for array length */
-                                       XMLCtx->intListGlobal = realloc(XMLCtx->intListGlobal,
-                                                        (XMLCtx->max_index+2)*sizeof(*XMLCtx->intListGlobal));
-                                      if (!XMLCtx->intListGlobal) {edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                                       XMLCtx->intListGlobal[XMLCtx->max_index+1] = 0;
-                               }
-
-                        }
-                        break;
-
-               default: unexpWarning() 
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-static void startTagList(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp(XMLCtx->XML_tag, el)) unexpError()
-                        break;  
-
-               case 1 : if (!attr[0] || !attr[1]) { unexpError() break;}
-                        if (strcmp(attr[0],"name")) { unexpError() break;}
-
-                        if (!strcmp(XMLCtx->XML_tag2, el)) {
-                               XMLCtx->tagListGlobal = realloc(XMLCtx->tagListGlobal,
-                                                        (XMLCtx->position+1)*sizeof(*XMLCtx->tagListGlobal));
-                                if (!XMLCtx->tagListGlobal) { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                               XMLCtx->tagListGlobal[XMLCtx->position].tag = strdup(attr[1]);
-                               XMLCtx->stat_begin = XML_GetCurrentByteIndex(XMLCtx->p);
-                        }
-                        break;
-
-               default: unexpWarning() 
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-static void startStsList(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       if (XMLCtx->char_buf) edg_wll_freeBuf(XMLCtx);
-
-        strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-                case 0 : if (strcmp(XMLCtx->XML_tag, el)) unexpError()
-                        break;  
-
-               case 1 : if (!strcmp(XMLCtx->XML_tag2, el)) {
-                               XMLCtx->stsListGlobal = realloc(XMLCtx->stsListGlobal,
-                                                        (XMLCtx->position+1)*sizeof(*XMLCtx->stsListGlobal));
-                                if (!XMLCtx->stsListGlobal) { edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); unexpError() return; }
-                                // edg_wll_InitStatus(&XMLCtx->stsListGlobal[XMLCtx->position]);
-                               // initialized in startJobStatus();
-
-                               XMLCtx->stat_begin = XML_GetCurrentByteIndex(XMLCtx->p);
-                        }
-                        break;
-
-               case 2 : /* fall through */
-               case 3 : /* fall through */
-               case 4 : /* fall through */
-               case 5 : /* do not check xml tags ut to depth 5 */
-                        /* will be checked later               */
-                        break;
-
-               default: unexpWarning() 
-                        break;
-       }
-
-       XMLCtx->level++;
-}
-
-
-
-static void startPurgeResult(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       int     i;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_PurgeResult")) { unexpError() break;}
-                       for ( i = 0; attr[i] && attr[i+1]; i += 2 ) {
-                               if (!strcmp(attr[i],"code"))
-                                       XMLCtx->errCode = atoi(attr[i+1]);
-                               else if (!strcmp(attr[i],"desc"))
-                                       XMLCtx->errDesc = strdup(attr[i+1]);
-                               else { unexpError() }
-                       }
-                       break;
-               case 1: if (strcasecmp(el,"jobs") && strcasecmp(el,"server_file")) unexpWarning()
-                       break;
-               case 2: if (!strcasecmp(el,"jobId")) {
-                               XMLCtx->purgeResultGlobal.jobs = realloc(XMLCtx->purgeResultGlobal.jobs,
-                                               (XMLCtx->position+2) * sizeof(XMLCtx->purgeResultGlobal.jobs));
-
-                                if (!XMLCtx->purgeResultGlobal.jobs) { 
-                                       edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); 
-                                       unexpError() return;
-                               }
-                                XMLCtx->purgeResultGlobal.jobs[XMLCtx->position+1] = NULL;
-                       }
-                       else 
-                               unexpWarning()
-                       break;
-               default: unexpWarning() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startDumpResult(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       int     i;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_DumpResult")) { unexpError() break;}
-                       for ( i = 0; attr[i] && attr[i+1]; i += 2 ) {
-                               if (!strcmp(attr[i],"code"))
-                                       XMLCtx->errCode = atoi(attr[i+1]);
-                               else if (!strcmp(attr[i],"desc"))
-                                       XMLCtx->errDesc = strdup(attr[i+1]);
-                               else { unexpError() }
-                       }
-                       break;
-               case 1: if (strcasecmp(el,"from") && strcasecmp(el,"to") 
-                               && strcasecmp(el,"server_file")) unexpWarning()
-                       break;
-               default: unexpWarning() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startLoadResult(void *data, const char *el, const char **attr)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        int     i;
-
-        
-        strcpy(XMLCtx->element, el);
-        
-        switch (XMLCtx->level) {
-                case 0: if (strcasecmp(el,"edg_wll_LoadResult")) { unexpError() break;}
-                        for ( i = 0; attr[i] && attr[i+1]; i += 2 ) {
-                                if (!strcmp(attr[i],"code"))
-                                        XMLCtx->errCode = atoi(attr[i+1]);
-                                else if (!strcmp(attr[i],"desc"))
-                                        XMLCtx->errDesc = strdup(attr[i+1]);
-                                else { unexpError() }
-                        }       
-                        break;          
-                case 1: if (strcasecmp(el,"from") && strcasecmp(el,"to")
-                                && strcasecmp(el,"server_file")) unexpWarning()
-                        break;  
-                default: unexpWarning()
-                         break;
-        }       
-        XMLCtx->level++;
-}
-
-
-
-static void startIndexedAttrs(void *data, const char *el, const char **attr)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        int     i;
-
-        
-        strcpy(XMLCtx->element, el);
-        
-        switch (XMLCtx->level) {
-                case 0: if (strcasecmp(el,"edg_wll_GetIndexedAttributesResult")) { unexpError() break;}
-                        for ( i = 0; attr[i] && attr[i+1]; i += 2 ) {
-                                if (!strcmp(attr[i],"code"))
-                                        XMLCtx->errCode = atoi(attr[i+1]);
-                                else if (!strcmp(attr[i],"desc"))
-                                        XMLCtx->errDesc = strdup(attr[i+1]);
-                                else { unexpError() }
-                        }       
-                        break;          
-                case 1: if (!strcasecmp(el,"index")) {
-                               XMLCtx->attrsGlobal = realloc(XMLCtx->attrsGlobal,
-                                                        (XMLCtx->position+2)*sizeof(*XMLCtx->attrsGlobal));
-                               if (!XMLCtx->attrsGlobal) { 
-                                       edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); 
-                                       unexpError() 
-                                       return;
-                               }
-                               XMLCtx->attrsGlobal[XMLCtx->position] = NULL;
-                               XMLCtx->attrsGlobal[XMLCtx->position+1] = NULL;
-                       }
-                       else
-                                unexpWarning()
-                        break;  
-                case 2: if (!strcasecmp(el,"QueryRec")) {
-                               XMLCtx->attrsGlobal[XMLCtx->position] = 
-                                       realloc(XMLCtx->attrsGlobal[XMLCtx->position],
-                                               (XMLCtx->position2+2)*sizeof(**XMLCtx->attrsGlobal));
-                               if (!XMLCtx->attrsGlobal[XMLCtx->position]) { 
-                                       edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL);
-                                       unexpError()
-                                       return;
-                               }
-                               memset(&(XMLCtx->attrsGlobal[XMLCtx->position][XMLCtx->position2]), 0, 
-                                       2*sizeof(**XMLCtx->attrsGlobal));
-                       }
-                       else
-                                unexpWarning()
-                        break;  
-               case 3: if (strcasecmp(el,"attribute") && strcasecmp(el,"state") &&
-                               strcasecmp(el,"name")) unexpWarning()
-                       break;  
-                default: unexpWarning()
-                         break;
-        }       
-        XMLCtx->level++;
-}
-
-
-
-static void startNotifResult(void *data, const char *el, const char **attr)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        int     i;
-
-        
-        strcpy(XMLCtx->element, el);
-        
-        switch (XMLCtx->level) {
-                case 0: if (strcasecmp(el,"edg_wll_NotifResult")) { unexpError() break;}
-                        for ( i = 0; attr[i] && attr[i+1]; i += 2 ) {
-                                if (!strcmp(attr[i],"code"))
-                                        XMLCtx->errCode = atoi(attr[i+1]);
-                                else if (!strcmp(attr[i],"desc"))
-                                        XMLCtx->errDesc = strdup(attr[i+1]);
-                                else { unexpError() }
-                        }       
-                        break;          
-                case 1: if (strcasecmp(el,"validity")) unexpWarning()
-                        break;  
-                default: unexpWarning()
-                         break;
-        }       
-        XMLCtx->level++;
-}               
-
-
-
-static void char_handler(void *data, const char *s, int len)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-        int i, found = -1, temp_len1;
-        char *temp_s, *temp_s1;
-
-
-        /* if date are only spaces, t\, \r, \n ... don't bother with them */
-        for (i=0; i<len; i++)
-                        if (!isspace(s[i])) { found = i; break; }
-        if (found == -1) return;
-
-        temp_s = malloc((len+1) * sizeof(char));
-
-        /* otherwise use them */
-        memcpy(temp_s,s,len);
-        temp_s[len] = 0;
-        temp_s1 = edg_wll_UnescapeXML((const char *) temp_s);
-        temp_len1 = strlen(temp_s1);
-
-        if (XMLCtx->char_buf_len) 
-               XMLCtx->char_buf = realloc(XMLCtx->char_buf,XMLCtx->char_buf_len+temp_len1 + 1);
-        else  
-               XMLCtx->char_buf = (char *) malloc(temp_len1 + 1);
-
-       memcpy(XMLCtx->char_buf+XMLCtx->char_buf_len,temp_s1,temp_len1 + 1);
-               XMLCtx->char_buf_len += temp_len1;
-        free(temp_s1);
-        free(temp_s);
-}
-
-
-
-static void endQueryJobs(void *data, const char *el)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       switch (XMLCtx->level) {
-               case 3 :
-                       if (!strcmp(XMLCtx->element,"jobId")) {
-                               XMLCtx->jobsOutGlobal[XMLCtx->position] =
-                                       edg_wll_from_string_to_jobid(XMLCtx);
-                               XMLCtx->position++;
-                       }
-                       else if (!strcmp(el,"jobStat")) {
-                               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                                                -  XMLCtx->stat_begin;
-
-                               edg_wll_ParseJobStat(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len, 
-                                                       &XMLCtx->jobStatGlobal[XMLCtx->position2]);
-                               XMLCtx->position2++;
-                               XMLCtx->stat_begin = 0;
-                       }
-                       else {
-                               /* tag was not found -> either missing in previous code or unknown      */
-                               unexpWarning()
-                               edg_wll_freeBuf(XMLCtx);
-                       }
-                       break;
-               default:
-                       if (XMLCtx->char_buf) {
-//                             unexpWarning()
-                               edg_wll_freeBuf(XMLCtx);
-                       }
-                       break;
-       }
-
-        XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-        XMLCtx->level--;
-}
-
-
-static void endQueryEvents(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       
-
-       switch (XMLCtx->level) {
-         case 3: 
-@@@{
-        my $i = 1;
-       my $bi = "\t   ";
-        for my $t (sort {$a cmp $b} getAllFields $event) {
-                if ($i == 1)
-                        { gen "$bi if (!strcmp(XMLCtx->element,\"$t\"))\n"; }
-                else
-                        { gen "$bi else if (!strcmp(XMLCtx->element,\"$t\"))\n"; }
-                $i++;
-                my @fo = sort $event->getFieldOccurence($t);
-                if ($#fo == 0) {
-                        selectType $event $fo[0];
-                        my $f = selectField $event $t;
-                        my $ft = $f->{type};
-                       $fo[0] = $fo[0] eq '_common_' ? 'any' : lcfirst $fo[0];
-                        gen "$bi   XMLCtx->eventsOutGlobal[XMLCtx->position].$fo[0].$t =\n";
-                        gen "$bi \tedg_wll_from_string_to_$ft(XMLCtx);\n";
-                }
-                else {
-                        gen "\t      switch (XMLCtx->eventsOutGlobal[XMLCtx->position].any.type) {\n";
-                       for (@fo) {
-                               selectType $event $_;
-                               my $f = selectField $event $t;
-                               my $ft = $f->{type};
-                               $t = 'any' if $_ eq '_common_';
-                               my $u = uc $_;
-                               $_ = lcfirst $_;
-                               gen "$bi     case EDG_WLL_EVENT_$u :\n";
-                               gen "$bi \t  XMLCtx->eventsOutGlobal[XMLCtx->position].$_.$t =\n";
-                               gen "$bi \t    edg_wll_from_string_to_$ft(XMLCtx);\n";
-                               gen "$bi \t  break;\n";
-
-                       }
-                       gen "$bi       default : { unexpWarning() edg_wll_freeBuf(XMLCtx); } \n";
-                       gen "$bi     }\n";
-                }
-        }
-@@@}
-
-           else {
-               /* tag was not found -> either missing in previous code or unknown      */
-               unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-         default:
-           if (XMLCtx->char_buf) {
-               unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break; 
-       }
-
-        XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-        XMLCtx->level--;
-
-}
-
-
-
-// XXX: endUserJobs should be unusable soon, delete it
-static void endUserJobs(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       int i;
-
-
-       switch (XMLCtx->level) {
-               case 2 :
-                       if (!strcmp(XMLCtx->element,"jobId")) {
-                               XMLCtx->jobsOutGlobal[XMLCtx->position] =
-                                       edg_wll_from_string_to_jobid(XMLCtx);
-                               XMLCtx->position++;
-                       }
-                       else {
-                               /* tag was not found -> either missing in previous code or unknown      */
-                               unexpWarning()
-                               edg_wll_freeBuf(XMLCtx);
-                       }
-                       break;
-               default:
-                       /* only level 2 tags should contain  text fields    */
-                       for (i=0; i < XMLCtx->char_buf_len; i++) 
-                               if (!isspace(XMLCtx->char_buf[i])) unexpWarning()
-                       edg_wll_freeBuf(XMLCtx);
-                       break;
-       }
-
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-       // if ( !strcmp(XMLCtx->element,"jobId") ) XMLCtx->position++;
-       // uncomment this if you want to remove XMLCtx->position++; 5 lines above
-       // it should be useful in case of automatic generation
-        XMLCtx->level--;
-}
-
-
-
-static void endJobStat(void *data, const char *el)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       switch (XMLCtx->level) {
-         case 2 :
-
-@@@{
-        my $i = 1;
-       my $bi = "\t   ";
-       selectType $status '_common_';
-        for my $t (getFieldsOrdered $status) {
-               my $f = selectField $status $t;
-               my $ft = $f->{type};
-               next if defined($f->{special}) && $f->{special} eq 'XMLstructured';
-                if ($i == 1)
-                        { gen "$bi if (!strcmp(XMLCtx->element,\"$t\"))\n"; }
-                else
-                        { gen "$bi else if (!strcmp(XMLCtx->element,\"$t\"))\n"; }
-                $i++;
-               gen "$bi   XMLCtx->jobStatSingleGlobal.$t =\n";
-               gen "$bi     edg_wll_from_string_to_$ft(XMLCtx);\n";
-        }
-@@@}
-           else if (!strcmp(el,"children_hist")) {
-               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                               -  XMLCtx->stat_begin;
-
-               edg_wll_ParseIntList(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len,
-                       "children_hist",(int (*)()) edg_wll_StringToStat, &XMLCtx->jobStatSingleGlobal.children_hist);
-               XMLCtx->stat_begin = 0;
-           }
-                   else if (!strcmp(el,"children")) {
-               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                               -  XMLCtx->stat_begin;
-
-               edg_wll_ParseStrList(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len,
-                       "children", "jobId", &XMLCtx->jobStatSingleGlobal.children);
-               XMLCtx->stat_begin = 0;
-            }
-           else if (!strcmp(el,"children_states")) {
-               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                               -  XMLCtx->stat_begin;
-
-               edg_wll_ParseStsList(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len,
-                       "children_states", "jobStat", &XMLCtx->jobStatSingleGlobal.children_states);
-               XMLCtx->stat_begin = 0;
-            }
-           else if (!strcmp(el,"user_tags")) {
-               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                               -  XMLCtx->stat_begin;
-
-               edg_wll_ParseTagList(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len,
-                       "user_tags", "tag", &XMLCtx->jobStatSingleGlobal.user_tags);
-               XMLCtx->stat_begin = 0;
-            }
-           else if (!strcmp(el,"stateEnterTimes")) {
-               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                               -  XMLCtx->stat_begin;
-
-               edg_wll_ParseIntList(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len,
-                       "stateEnterTimes",(int (*)()) edg_wll_StringToStat, &XMLCtx->jobStatSingleGlobal.stateEnterTimes);
-               XMLCtx->stat_begin = 0;
-            }
-           else {
-             /* tag was not found -> either missing in previous code or unknown        */
-             unexpWarning()
-             edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-         default:
-           if (XMLCtx->char_buf) {
-//             unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-       }
-
-       XMLCtx->char_buf = NULL;
-       XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-       XMLCtx->level--;
-}
-
-
-
-static void endStrList(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       switch (XMLCtx->level) {
-         case 2 :
-           if (!strcmp(XMLCtx->element,XMLCtx->XML_tag2)) {
-             XMLCtx->strListGlobal[XMLCtx->position] =
-               edg_wll_from_string_to_string(XMLCtx);
-             XMLCtx->position++;
-           }
-           else {
-             /* tag was not found -> either missing in previous code or unknown        */
-             unexpWarning()
-             edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-         default:
-           if (XMLCtx->char_buf) {
-//             unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-       }
-
-       XMLCtx->char_buf = NULL;
-       XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-       XMLCtx->level--;
-}
-
-
-
-static void endIntList(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       int index;
-
-       
-       switch (XMLCtx->level) {
-         case 2 :
-           if ((index = XMLCtx->tagToIndex(XMLCtx->element)) >= 0 ) {
-             XMLCtx->intListGlobal[index+1] =
-               edg_wll_from_string_to_int(XMLCtx);
-           }
-           else {
-             /* tag was not found -> either missing in previous code or unknown        */
-             unexpWarning()
-             edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-         default:
-           if (XMLCtx->char_buf) {
-//             unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-       }
-
-       XMLCtx->char_buf = NULL;
-       XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-       XMLCtx->level--;
-}
-
-
-static void endTagList(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       switch (XMLCtx->level) {
-         case 2 :
-           if (!strcmp(XMLCtx->element,XMLCtx->XML_tag2)) {
-             XMLCtx->tagListGlobal[XMLCtx->position].value =
-               edg_wll_from_string_to_string(XMLCtx);
-             XMLCtx->position++;
-           }
-           else {
-             /* tag was not found -> either missing in previous code or unknown        */
-             unexpWarning()
-             edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-         default:
-           if (XMLCtx->char_buf) {
-//             unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-       }
-
-       XMLCtx->char_buf = NULL;
-       XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-       XMLCtx->level--;
-}
-
-
-static void endStsList(void *data, const char *el)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       switch (XMLCtx->level) {
-         case 2 :
-           if (!strcmp(el,XMLCtx->XML_tag2)) {
-               long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                                -  XMLCtx->stat_begin;
-
-               edg_wll_ParseJobStat(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->stat_begin, len, 
-                               &XMLCtx->stsListGlobal[XMLCtx->position]);
-               XMLCtx->stat_begin = 0;
-               XMLCtx->position++;
-           }
-           else {
-             /* tag was not found -> either missing in previous code or unknown        */
-             unexpWarning()
-             edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-         default:
-           if (XMLCtx->char_buf) {
-//             unexpWarning()
-               edg_wll_freeBuf(XMLCtx);
-           }
-           break;
-       }
-
-       XMLCtx->char_buf = NULL;
-       XMLCtx->char_buf_len = 0;
-       memset(&(XMLCtx->element), 0, sizeof(XMLCtx->element));
-       XMLCtx->level--;
-}
-
-
-
-
-static void endPurgeResult(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        char *e;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"server_file")) 
-                       XMLCtx->purgeResultGlobal.server_file = edg_wll_from_string_to_string(XMLCtx);
-       }
-       else if (XMLCtx->level == 3) {
-               if (!strcmp(XMLCtx->element,"jobId")) {
-                       if ( (XMLCtx->purgeResultGlobal.jobs[XMLCtx->position++] = 
-                               edg_wll_from_string_to_string(XMLCtx)) == NULL )
-                       {
-                               if (XMLCtx->errtxt) {
-                                       asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                       free(XMLCtx->errtxt);
-                               } else asprintf(&e,"%s: invalid JobId at line %d",
-                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                               XMLCtx->errtxt = e;
-                       }
-               }
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-static void endDumpResult(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"server_file")) 
-                       XMLCtx->dumpResultGlobal.server_file = edg_wll_from_string_to_string(XMLCtx);
-               else if (!strcmp(XMLCtx->element,"from")) {
-                       if (isdigit(XMLCtx->char_buf[0]))
-                       XMLCtx->dumpResultGlobal.from = edg_wll_from_string_to_time_t(XMLCtx);
-                       else
-                               XMLCtx->dumpResultGlobal.from = edg_wll_StringToDumpConst(XMLCtx->char_buf);
-               }
-               else if (!strcmp(XMLCtx->element,"to")) {
-                       if (isdigit(XMLCtx->char_buf[0]))
-                       XMLCtx->dumpResultGlobal.to = edg_wll_from_string_to_time_t(XMLCtx);
-                       else
-                               XMLCtx->dumpResultGlobal.to = edg_wll_StringToDumpConst(XMLCtx->char_buf);
-               }
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-static void endLoadResult(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"server_file"))
-                        XMLCtx->loadResultGlobal.server_file = edg_wll_from_string_to_string(XMLCtx);
-                else if (!strcmp(XMLCtx->element,"from"))
-                        XMLCtx->loadResultGlobal.from = edg_wll_from_string_to_time_t(XMLCtx);
-                else if (!strcmp(XMLCtx->element,"to"))
-                        XMLCtx->loadResultGlobal.to = edg_wll_from_string_to_time_t(XMLCtx);
-               
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-static void endIndexedAttrs(void *data, const char *el)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-        if (XMLCtx->level == 2) {
-               if (!strcmp(el,"index"))
-                       XMLCtx->position++;
-                       XMLCtx->position2 = 0;
-       }
-        if (XMLCtx->level == 3) {
-               if (!strcmp(el,"QueryRec"))
-                       XMLCtx->position2++;
-       }
-       if (XMLCtx->level == 4) {
-                if (!strcmp(XMLCtx->element,"attribute")) {
-                        XMLCtx->attrsGlobal[XMLCtx->position][XMLCtx->position2].attr = 
-                               edg_wll_StringToquery_attr(edg_wll_from_string_to_string(XMLCtx));
-               }
-               else if (!strcmp(XMLCtx->element,"state")) {
-                       XMLCtx->attrsGlobal[XMLCtx->position][XMLCtx->position2].attr_id.state =
-                               edg_wll_StringToStat(edg_wll_from_string_to_string(XMLCtx));
-               }
-               else if (!strcmp(XMLCtx->element,"name")) {
-                       XMLCtx->attrsGlobal[XMLCtx->position][XMLCtx->position2].attr_id.tag =
-                               edg_wll_from_string_to_string(XMLCtx);
-               }       
-        }
-
-        XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-        XMLCtx->level--;
-}
-
-
-static void endNotifResult(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"validity"))
-                        XMLCtx->notifValidity = edg_wll_from_string_to_time_t(XMLCtx);
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-#undef unexpError
-#undef unexpWarning
-
-
-
-edg_wll_ErrorCode edg_wll_ParseQueryJobs(edg_wll_Context ctx, char *messageBody, edg_wlc_JobId **jobsOut, edg_wll_JobStat **statesOut)
-{
-       int i;
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode = 0;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-
-       /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-       XML_SetElementHandler(XMLCtx.p, startQueryJobs, endQueryJobs);
-       XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-       /* parse messageBody */
-       if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-               char *errorMessage;
-
-               asprintf(&errorMessage, "XML parse error at line %d:\n%s\n",
-                       XML_GetCurrentLineNumber(XMLCtx.p),
-                       XML_ErrorString(XML_GetErrorCode(XMLCtx.p))); 
-
-               edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);            
-       }  else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               for (i=0; i<XMLCtx.position; i++)  edg_wlc_JobIdFree( (XMLCtx.jobsOutGlobal)[i] );
-               free(XMLCtx.jobsOutGlobal);
-               XMLCtx.jobsOutGlobal = NULL;
-               XMLCtx.position = 0;
-               if (jobsOut) *jobsOut = NULL;   
-
-               for (i=0; i<XMLCtx.position2; i++) edg_wll_FreeStatus( &(XMLCtx.jobStatGlobal[i]) );
-               free(XMLCtx.jobStatGlobal);
-               XMLCtx.jobStatGlobal = NULL;
-               XMLCtx.position2 = 0;
-               if (statesOut) *statesOut = NULL;
-
-                if (XMLCtx.errDesc) {
-                        free(XMLCtx.errDesc);
-                        XMLCtx.errDesc = NULL;
-                        XMLCtx.errCode = 0;
-                }
-        }
-
-       /* malloc-ate one more row for NULL list termination */
-        XMLCtx.jobsOutGlobal = realloc(XMLCtx.jobsOutGlobal,
-                               (XMLCtx.position+1)*sizeof(*XMLCtx.jobsOutGlobal));
-
-        if (!XMLCtx.jobsOutGlobal) { 
-               errorCode = (edg_wll_ErrorCode) ENOMEM;
-               if (jobsOut) *jobsOut = NULL;   
-       }
-       else {
-               /* add NULL to end of list */
-               XMLCtx.jobsOutGlobal[XMLCtx.position] = NULL;           
-
-               /* return results */
-               // XXX : may be should not be transfered; need to change protocol and 
-               // XXX   then return only non-NULL jobsOut or statesOut
-               if (jobsOut) 
-                       *jobsOut = XMLCtx.jobsOutGlobal;
-               else {
-                       for (i=0; i<XMLCtx.position; i++)  edg_wlc_JobIdFree( (XMLCtx.jobsOutGlobal)[i] );
-                       free(XMLCtx.jobsOutGlobal); 
-               }
-               XMLCtx.jobsOutGlobal = NULL; 
-       }
-       
-       XMLCtx.jobStatGlobal = realloc(XMLCtx.jobStatGlobal,
-                               (XMLCtx.position2+1)*sizeof(*XMLCtx.jobStatGlobal));
-
-       if (!XMLCtx.jobStatGlobal) { 
-               errorCode = (edg_wll_ErrorCode) ENOMEM;
-               if (statesOut) *statesOut = NULL;
-       }
-       else {
-               /* add NULL to end of list */
-               edg_wll_InitStatus(&XMLCtx.jobStatGlobal[XMLCtx.position2]);            
-
-               /* return results */
-               if (statesOut)
-                       *statesOut = XMLCtx.jobStatGlobal;
-               else {
-                       for (i=0; i<XMLCtx.position2; i++) edg_wll_FreeStatus( &(XMLCtx.jobStatGlobal[i]) );
-                       free(XMLCtx.jobStatGlobal);
-               }
-       
-               XMLCtx.jobStatGlobal = NULL; 
-       }
-       
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-               ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-       }
-
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-       /* free parser */
-       XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return errorCode;
-}
-
-
-
-edg_wll_ErrorCode edg_wll_ParseQueryEvents(edg_wll_Context ctx, char *messageBody, edg_wll_Event **eventsOut)
-{
-       int i;
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode = 0;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.position = -1;
-       edg_wll_ResetError(ctx);        
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startQueryEvents, endQueryEvents);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "XML parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-               edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-               free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               *eventsOut = NULL;
-               for (i=0; i<= XMLCtx.position; i++) edg_wll_FreeEvent( &((XMLCtx.eventsOutGlobal)[i]) );
-                       free(XMLCtx.eventsOutGlobal); 
-               XMLCtx.eventsOutGlobal = NULL;
-
-                if (XMLCtx.errDesc) {
-                        free(XMLCtx.errDesc);
-                        XMLCtx.errDesc = NULL;
-                        XMLCtx.errCode = 0;
-                }
-       }
-        else {
-               /* malloc-ate one more row for NULL list termination */
-                XMLCtx.eventsOutGlobal = realloc(XMLCtx.eventsOutGlobal,
-                                          (++XMLCtx.position+1)*sizeof(*XMLCtx.eventsOutGlobal));
-                if (!XMLCtx.eventsOutGlobal) { 
-                       errorCode = (edg_wll_ErrorCode) ENOMEM; 
-                       *eventsOut = NULL;
-               }
-               else {
-                       /* last event in list is EDG_WLL_EVENT_UNDEF for end-of-list detection */
-                       memset(&XMLCtx.eventsOutGlobal[XMLCtx.position],0,sizeof(*XMLCtx.eventsOutGlobal));
-                       XMLCtx.eventsOutGlobal[XMLCtx.position].any.type = EDG_WLL_EVENT_UNDEF;
-
-                       /* return results */
-                       *eventsOut = XMLCtx.eventsOutGlobal;
-                       XMLCtx.eventsOutGlobal = NULL; 
-               }
-        }
-       
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-                ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-        }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"------------------------edg_wll_ParseQueryEvents----------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);
-        return errorCode;
-}
-
-
-
-
-edg_wll_ErrorCode edg_wll_ParseUserJobs(edg_wll_Context ctx, char *messageBody, edg_wlc_JobId **jobsOut)
-{
-       int i;
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode = 0;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-
-       /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-       XML_SetElementHandler(XMLCtx.p, startUserJobs, endUserJobs);
-       XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-       /* parse messageBody */
-       if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-               char *errorMessage;
-
-
-               asprintf(&errorMessage, "XML parse error at line %d:\n%s\n",
-                       XML_GetCurrentLineNumber(XMLCtx.p),
-                       XML_ErrorString(XML_GetErrorCode(XMLCtx.p))); 
-               *jobsOut = NULL;        
-
-               edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);            
-       }  else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-                *jobsOut = NULL;
-               for (i=0; i<XMLCtx.position; i++)  edg_wlc_JobIdFree( (XMLCtx.jobsOutGlobal)[i] );
-               free(XMLCtx.jobsOutGlobal);
-               XMLCtx.jobsOutGlobal = NULL;
-        } else {
-               /* malloc-ate one more row for NULL list termination */
-                XMLCtx.jobsOutGlobal = realloc(XMLCtx.jobsOutGlobal,
-                                        (XMLCtx.position+1)*sizeof(*XMLCtx.jobsOutGlobal));
-                if (!XMLCtx.jobsOutGlobal) { 
-                       errorCode = (edg_wll_ErrorCode) ENOMEM;
-                       *jobsOut = NULL;
-               }
-               else {
-                       /* add NULL to end of list */
-                       XMLCtx.jobsOutGlobal[XMLCtx.position] = NULL;           
-
-                       /* return results */
-                       *jobsOut = XMLCtx.jobsOutGlobal;
-                       XMLCtx.jobsOutGlobal = NULL; 
-               }
-        }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-       /* free parser */
-       XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return errorCode;
-}
-
-
-
-edg_wll_ErrorCode edg_wll_ParseJobStat(edg_wll_Context ctx, char *messageBody, long len, edg_wll_JobStat *stat)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startJobStatus, endJobStat);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, len, 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               edg_wll_FreeStatus( &XMLCtx.jobStatSingleGlobal );
-               memset(stat,0,sizeof(*stat));
-               XMLCtx.position = 0;
-        }
-       else {
-               /* return results */
-               memcpy(stat, &XMLCtx.jobStatSingleGlobal, sizeof(XMLCtx.jobStatSingleGlobal));
-       }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-edg_wll_ErrorCode edg_wll_ParseStrList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2,  char ***strListOut)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-       asprintf(&XMLCtx.XML_tag,"%s",tag);
-       asprintf(&XMLCtx.XML_tag2,"%s",tag2);
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startStrList, endStrList);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, len, 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               if (XMLCtx.strListGlobal) {
-                       int i;
-
-                       for (i=0; XMLCtx.strListGlobal[i]; i++)
-                               free(XMLCtx.strListGlobal[i]);
-                       free(XMLCtx.strListGlobal);
-                       XMLCtx.strListGlobal = NULL;
-               }
-               *strListOut = NULL;
-               XMLCtx.position = 0;
-        }
-       else {
-               XMLCtx.strListGlobal = realloc(XMLCtx.strListGlobal,
-                               (XMLCtx.position+1)*sizeof(*XMLCtx.strListGlobal));
-
-               if (!XMLCtx.strListGlobal) {
-                       errorCode = (edg_wll_ErrorCode) ENOMEM;
-                       if (strListOut) *strListOut = NULL;
-               }
-                       else {
-                       /* add NULL to end of list */
-                       XMLCtx.strListGlobal[XMLCtx.position] = NULL;
-
-                       /* return results */
-                       *strListOut = XMLCtx.strListGlobal;
-               }
-       }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-edg_wll_ErrorCode edg_wll_ParseIntList(edg_wll_Context ctx, char *messageBody, long len, char *tag, int (*tagToIndex)(),  int **intListOut)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-       asprintf(&XMLCtx.XML_tag,"%s",tag);
-       XMLCtx.tagToIndex = tagToIndex;
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startIntList, endIntList);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, len, 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               if (XMLCtx.intListGlobal) free(XMLCtx.intListGlobal);
-               *intListOut = NULL;
-               XMLCtx.max_index = 0;
-        }
-       else {
-                       /* add array length to zeros' position */
-                       if (XMLCtx.intListGlobal) 
-                       XMLCtx.intListGlobal[0] = XMLCtx.max_index + 1;
-
-               /* return results */
-               *intListOut = XMLCtx.intListGlobal;
-       }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-edg_wll_ErrorCode edg_wll_ParseTagList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2,  edg_wll_TagValue **tagListOut)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-       asprintf(&XMLCtx.XML_tag,"%s",tag);
-       asprintf(&XMLCtx.XML_tag2,"%s",tag2);
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startTagList, endTagList);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, len, 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               if (XMLCtx.tagListGlobal) {
-                       int i;
-
-                       for (i=0; XMLCtx.tagListGlobal[i].tag; i++) {
-                               free(XMLCtx.tagListGlobal[i].tag);
-                               free(XMLCtx.tagListGlobal[i].value);
-                       }
-                       free(XMLCtx.tagListGlobal);
-                       XMLCtx.tagListGlobal = NULL;
-               }
-               *tagListOut = NULL;
-               XMLCtx.position = 0;
-        }
-       else {
-               XMLCtx.tagListGlobal = realloc(XMLCtx.tagListGlobal,
-                               (XMLCtx.position+1)*sizeof(*XMLCtx.tagListGlobal));
-
-               if (!XMLCtx.tagListGlobal) {
-                       errorCode = (edg_wll_ErrorCode) ENOMEM;
-                       if (tagListOut) *tagListOut = NULL;
-               }
-                       else {
-                       /* add NULL to end of list */
-                       XMLCtx.tagListGlobal[XMLCtx.position].tag = NULL;
-
-                       /* return results */
-                       *tagListOut = XMLCtx.tagListGlobal;
-               }
-       }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-edg_wll_ErrorCode edg_wll_ParseStsList(edg_wll_Context ctx, char *messageBody, long len, char *tag, char *tag2,  edg_wll_JobStat **stsListOut)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-       asprintf(&XMLCtx.XML_tag,"%s",tag);
-       asprintf(&XMLCtx.XML_tag2,"%s",tag2);
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startStsList, endStsList);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, len, 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               if (XMLCtx.stsListGlobal) {
-                       int i;
-
-                       for (i=0; XMLCtx.position; i++)
-                               edg_wll_FreeStatus(&XMLCtx.stsListGlobal[i]);
-                       free(XMLCtx.stsListGlobal);
-                       XMLCtx.stsListGlobal = NULL;
-               }
-               *stsListOut = NULL;
-               XMLCtx.position = 0;
-        }
-       else {
-               XMLCtx.stsListGlobal = realloc(XMLCtx.stsListGlobal,
-                               (XMLCtx.position+1)*sizeof(*XMLCtx.stsListGlobal));
-
-               if (!XMLCtx.stsListGlobal) {
-                       errorCode = (edg_wll_ErrorCode) ENOMEM;
-                       if (stsListOut) *stsListOut = NULL;
-               }
-                       else {
-                       /* add NULL to end of list */
-                       edg_wll_InitStatus(&XMLCtx.stsListGlobal[XMLCtx.position]);
-
-                       /* return results */
-                       *stsListOut = XMLCtx.stsListGlobal;
-               }
-       }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-/* parse purge result from client */
-edg_wll_ErrorCode edg_wll_ParsePurgeResult(edg_wll_Context ctx, char *messageBody, edg_wll_PurgeResult *result)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_ResetError(ctx);
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startPurgeResult, endPurgeResult);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               int i;
-
-               if (XMLCtx.purgeResultGlobal.jobs) {
-                       for (i=0; XMLCtx.purgeResultGlobal.jobs[i]; i++) 
-                               free(XMLCtx.purgeResultGlobal.jobs[i]);
-                       free(XMLCtx.purgeResultGlobal.jobs);
-               }
-               memset(result,0,sizeof(*result));
-               free(XMLCtx.purgeResultGlobal.server_file);
-               
-       } else {
-               memcpy(result, &XMLCtx.purgeResultGlobal, sizeof(XMLCtx.purgeResultGlobal));
-       }
-
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-               ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-       }
-       
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-/* parse dump result from client */
-edg_wll_ErrorCode edg_wll_ParseDumpResult(edg_wll_Context ctx, char *messageBody, edg_wll_DumpResult *result)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_ResetError(ctx);
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startDumpResult, endDumpResult);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               free(XMLCtx.dumpResultGlobal.server_file);
-               memset(result,0,sizeof(*result));
-       } else {
-               memcpy(result, &XMLCtx.dumpResultGlobal, sizeof(XMLCtx.dumpResultGlobal));
-       }
-
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-               ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-       }
-       
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-/* parse load result from client */
-edg_wll_ErrorCode edg_wll_ParseLoadResult(edg_wll_Context ctx, char *messageBody, edg_wll_LoadResult *result)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_ResetError(ctx);
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startLoadResult, endLoadResult);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               free(XMLCtx.loadResultGlobal.server_file);
-               memset(result,0,sizeof(*result));
-       } else {
-               memcpy(result, &XMLCtx.loadResultGlobal, sizeof(XMLCtx.loadResultGlobal));
-       }
-
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-               ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-       }
-       
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-edg_wll_ErrorCode edg_wll_ParseIndexedAttrs(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***attrs)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-
-       edg_wll_initXMLCtx(&XMLCtx);
-       edg_wll_ResetError(ctx);        
-       XMLCtx.message_body = messageBody;
-       XMLCtx.ctx = ctx;
-
-        /* initialize parser */
-       XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startIndexedAttrs, endIndexedAttrs);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-       XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-        /* parse messageBody */
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-        if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               if (XMLCtx.attrsGlobal) {
-                       int i,j;
-
-                       for (i=0; XMLCtx.attrsGlobal[i]; i++) {
-                               for (j=0; XMLCtx.attrsGlobal[i][j].attr != EDG_WLL_QUERY_ATTR_UNDEF; j++) {
-                                       if (XMLCtx.attrsGlobal[i][j].attr == EDG_WLL_QUERY_ATTR_USERTAG) 
-                                               free(XMLCtx.attrsGlobal[i][j].attr_id.tag);
-                               }               
-                               free(XMLCtx.attrsGlobal[i]);
-                       }
-                       free(XMLCtx.attrsGlobal);
-                       XMLCtx.attrsGlobal = NULL;
-               }
-               XMLCtx.position = 0;
-               XMLCtx.position2 = 0;
-        }
-
-       /* return results */
-       *attrs = XMLCtx.attrsGlobal;
-
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-               ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-       }
-
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-/* parse notification result from client */
-edg_wll_ErrorCode edg_wll_ParseNotifResult(edg_wll_Context ctx, char *messageBody, time_t *validity)
-{
-       edg_wll_XML_ctx XMLCtx;
-       edg_wll_ErrorCode errorCode;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_ResetError(ctx);
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startNotifResult, endNotifResult);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((errorCode = edg_wll_Error(ctx,NULL,NULL))) {
-               *validity = -1;
-       } else {
-               *validity = XMLCtx.notifValidity;
-       }
-
-       if (XMLCtx.errDesc || XMLCtx.errCode) {
-               ctx->errDesc = XMLCtx.errDesc;
-                ctx->errCode = XMLCtx.errCode;
-       }
-       
-       /* print all warning if corresponding env variable is set       */
-       if (XMLCtx.warntxt && getenv("EDG_WLL_XML_WARNINGS")) { 
-               fprintf(stderr,"----------------------------------------------------\n");
-               fprintf(stderr,"%s\n\n",XMLCtx.warntxt);
-               fprintf(stderr,"%s\n",messageBody);
-               fprintf(stderr,"----------------------------------------------------\n");
-       }
-
-        /* free parser */
-        XML_ParserFree(XMLCtx.p);
-
-       edg_wll_freeXMLCtx(&XMLCtx);    
-       return errorCode;
-}
-
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_QueryJobs */
-int edg_wll_JobQueryRecToXML(
-               edg_wll_Context ctx,
-               edg_wll_QueryRec const * const *conditions,
-                char **message)
-{
-        char *pomA, *pomB, *pomC;
-        int i = 0, len, tot_len = 0, nconditions, row = 0;
-        int *len_list;
-        char **list;
-
-       
-       pomC = strdup("");
-
-       while (conditions && conditions[row]) {
-
-               pomA = pomB = NULL;
-       
-               for (i=0; conditions[row][i].attr != EDG_WLL_QUERY_ATTR_UNDEF ; i++);
-               nconditions = i;
-       
-               list = (char **) malloc ((nconditions) * sizeof(*list));
-               len_list = (int *) malloc ((nconditions) * sizeof(*len_list));
-       
-               i=0;
-               while (i < nconditions) {
-                       const char *pomOp;
-                       char       *pomValue;
-       
-                       asprintf(&pomValue,"%s","");
-       
-                       switch (conditions[row][i].attr) {
-                                       /* job specific conditions */
-                                       case EDG_WLL_QUERY_ATTR_JOBID:
-                                               edg_wll_add_jobid_to_XMLBody(&pomValue, conditions[row][i].value.j, "jobId", NULL);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_TIME:
-                                               if (conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN) {
-                                                       edg_wll_add_tagged_time_t_to_XMLBody(&pomValue, conditions[row][i].value.t.tv_sec, "time", edg_wll_StatToString(conditions[row][i].attr_id.state), "state", -1);
-                                                       edg_wll_add_tagged_time_t_to_XMLBody(&pomValue, conditions[row][i].value2.t.tv_sec, "time", edg_wll_StatToString(conditions[row][i].attr_id.state), "state", -1);       
-                                               }
-                                               else 
-                                                       edg_wll_add_tagged_time_t_to_XMLBody(&pomValue, conditions[row][i].value.t.tv_sec, "time", edg_wll_StatToString(conditions[row][i].attr_id.state), "state", -1);
-                                               break;
-                               
-                                       case EDG_WLL_QUERY_ATTR_PARENT:
-                                               edg_wll_add_jobid_to_XMLBody(&pomValue, conditions[row][i].value.j, "parent_job", NULL);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_OWNER:
-                                               edg_wll_add_string_to_XMLBody(&pomValue, (conditions[row][i].value.c) ? conditions[row][i].value.c : 
-                                                                                                               "NULL", "owner", NULL);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_STATUS:
-                                               edg_wll_add_edg_wll_JobStatCode_to_XMLBody(&pomValue, conditions[row][i].value.i, "status", EDG_WLL_JOB_UNDEF);
-                                               if (conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN)
-                                                       edg_wll_add_edg_wll_JobStatCode_to_XMLBody(&pomValue, conditions[row][i].value2.i, "status", EDG_WLL_JOB_UNDEF);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_LOCATION:
-                                               edg_wll_add_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "location", NULL);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_DESTINATION:
-                                               edg_wll_add_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "destination", NULL);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                                               edg_wll_add_int_to_XMLBody(&pomValue, conditions[row][i].value.i, "resubmitted", -1);
-                                               if (conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN)
-                                                       edg_wll_add_int_to_XMLBody(&pomValue, conditions[row][i].value2.i, "resubmitted", -1);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_DONECODE:
-                                               edg_wll_add_int_to_XMLBody(&pomValue, conditions[row][i].value.i, "donecode", -1);
-                                               if (conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN)
-                                                       edg_wll_add_int_to_XMLBody(&pomValue, conditions[row][i].value2.i, "donecode", -1);
-                                               break;
-                                       case EDG_WLL_QUERY_ATTR_EXITCODE:
-                                               edg_wll_add_int_to_XMLBody(&pomValue, conditions[row][i].value.i, "exitcode", -1);
-                                               if (conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN)
-                                                       edg_wll_add_int_to_XMLBody(&pomValue, conditions[row][i].value2.i, "exitcode", -1);
-                                               break;
-                                       /* common conditions */
-                                       case EDG_WLL_QUERY_ATTR_USERTAG:
-                                               edg_wll_add_tagged_string_to_XMLBody(&pomValue, conditions[row][i].value.c, "usertag", conditions[row][i].attr_id.tag, "name", NULL);
-                                               break;
-                               default:
-                                       free(pomValue);
-                                       return -1;
-                       }
-                       switch (conditions[row][i].op) {
-                               case EDG_WLL_QUERY_OP_EQUAL: pomOp = "equal"; break;
-                               case EDG_WLL_QUERY_OP_LESS: pomOp = "less"; break;
-                               case EDG_WLL_QUERY_OP_GREATER: pomOp = "greater"; break;
-                               case EDG_WLL_QUERY_OP_WITHIN: pomOp = "within"; break;
-                               case EDG_WLL_QUERY_OP_UNEQUAL: pomOp = "unequal"; break;
-                               default:
-                                       return -1;
-                       }
-       
-                       len = asprintf(&list[i],"\t\t\t<%s>\n\t\t%s\t\t\t</%s>\r\n",
-                                       pomOp,pomValue,pomOp);
-                       tot_len += len;
-                       len_list[i] = len;
-       
-                       free(pomValue);
-       
-                       i++;
-               }
-       
-       
-               pomA = (char *) malloc(tot_len  * sizeof(char) +
-                       sizeof(QUERY_JOBS_OR_BEGIN) + sizeof(QUERY_JOBS_OR_END) - 1);
-       
-               memcpy(pomA, QUERY_JOBS_OR_BEGIN, sizeof(QUERY_JOBS_OR_BEGIN));
-               pomB = pomA + sizeof(QUERY_JOBS_OR_BEGIN) - 1;
-       
-               for (i=0; i < nconditions; i++) {
-                       memcpy(pomB, list[i], len_list[i] );
-                       pomB += len_list[i];
-                       free(list[i]);
-               }
-               free(list);
-               free(len_list);
-               
-               strcpy(pomB, QUERY_JOBS_OR_END);
-               asprintf(message,"%s%s", pomC, pomA);
-               free(pomA);
-               free(pomC);
-               pomC = *message;                
-               *message = NULL;
-
-               row++;
-       }
-
-
-       asprintf(message,"%s", pomC);   
-
-       free(pomC);
-
-        return 0;
-}
-
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_QueryEvents */
-int edg_wll_QueryEventsRequestToXML(
-               edg_wll_Context ctx,
-                const edg_wll_QueryRec **job_conditions,
-                const edg_wll_QueryRec **event_conditions,
-                char **message)
-{
-        char *pomA, *pomB, *pomC;
-        int i = 0, len, tot_len = 0, row = 0;
-        int nevent_conditions;
-        char **list;
-        int *len_list;
-
-       
-       edg_wll_JobQueryRecToXML(ctx, job_conditions, &pomC);
-
-       row = 0;
-       while(event_conditions && event_conditions[row]) {      
-
-               pomA = pomB = NULL;
-
-               for (i=0; event_conditions[row][i].attr != EDG_WLL_QUERY_ATTR_UNDEF ; i++);
-               nevent_conditions = i;
-       
-                list = (char **) malloc ((nevent_conditions) * sizeof(*list));
-                len_list = (int *) malloc ((nevent_conditions) * sizeof(*len_list));
-
-               i=0;
-               while (i < nevent_conditions) {
-                       const char *pomOp;
-                       char       *pomValue;
-       
-                       asprintf(&pomValue,"%s","");
-       
-                       switch (event_conditions[row][i].attr) {
-                               /* event specific conditions */
-                               case EDG_WLL_QUERY_ATTR_TIME:
-                                       if (event_conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN) {
-                                               edg_wll_add_tagged_time_t_to_XMLBody(&pomValue, event_conditions[row][i].value.t.tv_sec, "time", edg_wll_StatToString(event_conditions[row][i].attr_id.state), "state", -1);
-                                               edg_wll_add_tagged_time_t_to_XMLBody(&pomValue, event_conditions[row][i].value2.t.tv_sec, "time", edg_wll_StatToString(event_conditions[row][i].attr_id.state), "state", -1);   
-                                       }
-                                       else 
-                                               edg_wll_add_tagged_time_t_to_XMLBody(&pomValue, event_conditions[row][i].value.t.tv_sec, "time", edg_wll_StatToString(event_conditions[row][i].attr_id.state), "state", -1);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_LEVEL:
-                                       edg_wll_add_int_to_XMLBody(&pomValue, event_conditions[row][i].value.i, "level", -1);
-                                       if (event_conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN)
-                                               edg_wll_add_int_to_XMLBody(&pomValue, event_conditions[row][i].value2.i, "level", -1);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_HOST:
-                                       edg_wll_add_string_to_XMLBody(&pomValue, event_conditions[row][i].value.c, "host", NULL);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_SOURCE:
-                                       edg_wll_add_int_to_XMLBody(&pomValue, event_conditions[row][i].value.i, "source", -1);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_INSTANCE:
-                                       edg_wll_add_string_to_XMLBody(&pomValue, event_conditions[row][i].value.c, "instance", NULL);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-                                       edg_wll_add_int_to_XMLBody(&pomValue, event_conditions[row][i].value.i, "type", EDG_WLL_EVENT_UNDEF);
-                                       if (event_conditions[row][i].op == EDG_WLL_QUERY_OP_WITHIN)
-                                               edg_wll_add_int_to_XMLBody(&pomValue, event_conditions[row][i].value2.i, "type", EDG_WLL_EVENT_UNDEF);
-                                       break;
-                               /* common conditions */
-                               case EDG_WLL_QUERY_ATTR_USERTAG:
-                                       edg_wll_add_tagged_string_to_XMLBody(&pomValue, event_conditions[row][i].value.c, "usertag", event_conditions[row][i].attr_id.tag, "name", NULL);
-                                       break;
-                               default:
-                                       free(pomValue);
-                                       return -1;
-                       }
-                       switch (event_conditions[row][i].op) {
-                               case EDG_WLL_QUERY_OP_EQUAL: pomOp = "equal"; break;
-                               case EDG_WLL_QUERY_OP_LESS: pomOp = "less"; break;
-                               case EDG_WLL_QUERY_OP_GREATER: pomOp = "greater"; break;
-                               case EDG_WLL_QUERY_OP_WITHIN: pomOp = "within"; break;
-                               case EDG_WLL_QUERY_OP_UNEQUAL: pomOp = "unequal"; break;
-                               default:
-                                       return -1;
-                       }
-       
-                       len = asprintf(&list[i],"\t\t\t<%s>\n\t\t%s\t\t\t</%s>\r\n",
-                                       pomOp,pomValue,pomOp);
-       
-                       tot_len += len;
-                       len_list[i] = len;
-       
-                       free(pomValue);
-       
-                       i++;
-               }
-
-                pomA = (char *) malloc(tot_len  * sizeof(char) +
-                        sizeof(QUERY_EVENTS_OREC_BEGIN) + sizeof(QUERY_EVENTS_OREC_END) - 1);
-
-                memcpy(pomA, QUERY_EVENTS_OREC_BEGIN, sizeof(QUERY_EVENTS_OREC_BEGIN));
-                pomB = pomA + sizeof(QUERY_EVENTS_OREC_BEGIN) - 1;
-
-                for (i=0; i < nevent_conditions; i++) {
-                        memcpy(pomB, list[i], len_list[i] );
-                        pomB += len_list[i];
-                        free(list[i]);
-                }
-                free(list);
-                free(len_list);
-
-                strcpy(pomB, QUERY_EVENTS_OREC_END);
-                asprintf(message,"%s%s", pomC, pomA);
-                free(pomA);
-                free(pomC);
-                pomC = *message;
-                *message = NULL;
-
-               row++;
-       }       
-       
-       asprintf(message,"%s softLimit=\"%d\" queryRes=\"%d\">\r\n\t<and>\r\n%s%s",
-               QUERY_EVENTS_REQUEST_BEGIN, 
-               ctx->p_query_events_limit, ctx->p_query_results,
-               pomC, QUERY_EVENTS_REQUEST_END);        
-
-       free(pomC);
-
-       return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_QueryJobs */
-int edg_wll_QueryJobsRequestToXML(
-               edg_wll_Context ctx,
-               const edg_wll_QueryRec **conditions,
-                int flags,
-                char **message)
-{
-        char *pomC, *cflags;
-
-       
-       edg_wll_JobQueryRecToXML(ctx, conditions, &pomC);       
-
-       asprintf(message,
-               "%s softLimit=\"%d\" queryRes=\"%d\">\r\n\t<flags>%s</flags>\r\n\t<and>\r\n%s%s",
-               QUERY_JOBS_REQUEST_BEGIN,
-               ctx->p_query_jobs_limit, ctx->p_query_results,
-               cflags = edg_wll_stat_flags_to_string(flags), pomC, QUERY_JOBS_REQUEST_END);    
-
-       free(cflags);
-       free(pomC);
-
-        return 0;
-}
-
-
-/* construct Message-Body of Request-Line for edg_wll_Purge */
-int edg_wll_PurgeRequestToXML(
-                edg_wll_Context ctx,
-               const edg_wll_PurgeRequest *request,
-                char **message)
-{
-        char *pomA, *pomB, *pomC;
-
-
-       if (!request) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       if (request->jobs) edg_wll_add_strlist_to_XMLBody(&pomA, request->jobs, "jobs",
-                                                               "jobId", "\t", NULL);
-
-       /* print timeout for all status codes */
-       pomB = strdup("");
-       edg_wll_add_time_t_list_to_XMLBody(&pomB, request->timeout, "timeout", edg_wll_StatToString, "\t",
-                                               0, EDG_WLL_NUMBER_OF_STATCODES);
-
-       trio_asprintf(&pomC,"%s%s%s\t<flags>%|Xs</flags>\r\n%s",
-                       PURGE_REQUEST_BEGIN,pomA,pomB,edg_wll_purge_flags_to_string(request->flags),
-                       PURGE_REQUEST_END);
-
-       free(pomA);
-       free(pomB);
-
-
-        *message = pomC;
-
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Dump */
-int edg_wll_DumpRequestToXML(
-                edg_wll_Context ctx,
-               const edg_wll_DumpRequest *request,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!request) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       if (request->from < 0)
-               edg_wll_add_string_to_XMLBody(&pomA, 
-                       edg_wll_DumpConstToString(request->from), "from", NULL);
-       else
-       edg_wll_add_time_t_to_XMLBody(&pomA, request->from, "from", 0);
-       if (request->to < 0)
-               edg_wll_add_string_to_XMLBody(&pomA,
-                       edg_wll_DumpConstToString(request->to), "to", NULL);
-       else
-       edg_wll_add_time_t_to_XMLBody(&pomA, request->to, "to", 0);
-
-       trio_asprintf(&pomB,"%s%s%s",
-                       DUMP_REQUEST_BEGIN,pomA,DUMP_REQUEST_END);
-
-       free(pomA);
-
-
-        *message = pomB;
-
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Load */
-int edg_wll_LoadRequestToXML(
-                edg_wll_Context ctx,
-               const edg_wll_LoadRequest *request,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!request) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       edg_wll_add_string_to_XMLBody(&pomA, request->server_file, "server_file", 0);
-
-       trio_asprintf(&pomB,"%s%s%s",
-                       LOAD_REQUEST_BEGIN,pomA,LOAD_REQUEST_END);
-
-       free(pomA);
-
-
-        *message = pomB;
-
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_IndexedAttrs */
-int edg_wll_IndexedAttrsRequestToXML(
-                edg_wll_Context ctx,
-                char **message)
-{
-       char *pomB;
-
-
-       trio_asprintf(&pomB,"%s%s",
-                       INDEXED_ATTRS_REQUEST_BEGIN,INDEXED_ATTRS_REQUEST_END);
-
-        *message = pomB;
-
-        return 0;
-}
-
-
-/* construct Message-Body of Request-Line for edg_wll_Notif* functions */
-int edg_wll_NotifRequestToXML(
-                edg_wll_Context ctx, 
-               const char *function,
-               const edg_wll_NotifId notifId,
-               const char *address,
-               edg_wll_NotifChangeOp op,
-               edg_wll_QueryRec const * const *conditions,
-                char **message)
-{
-       char *pomA=NULL, *pomB=NULL, *pomC=NULL;
-
-
-       pomA = strdup("");
-       edg_wll_add_string_to_XMLBody(&pomA, edg_wll_NotifIdUnparse(notifId), "notifId", NULL);
-       edg_wll_add_string_to_XMLBody(&pomA, address, "clientAddress", NULL);
-       edg_wll_add_string_to_XMLBody(&pomA, edg_wll_NotifChangeOpToString(op), "notifChangeOp", NULL);
-       if (conditions && conditions[0] && conditions[0][0].attr != EDG_WLL_QUERY_ATTR_UNDEF)
-               edg_wll_JobQueryRecToXML(ctx, conditions, &pomB);
-               
-
-       if (pomB)
-               trio_asprintf(&pomC,"%s function=\"%s\">\r\n%s\t<and>\r\n%s\t</and>\r\n%s",
-                       NOTIF_REQUEST_BEGIN,function,pomA,pomB,NOTIF_REQUEST_END);
-       else
-               trio_asprintf(&pomC,"%s function=\"%s\">\r\n%s%s",
-                       NOTIF_REQUEST_BEGIN,function,pomA,NOTIF_REQUEST_END);
-
-
-       free(pomA);
-       free(pomB);
-        *message = pomC;
-
-        return 0;
-}
diff --git a/org.glite.lb.common/test/il_int_test.cpp b/org.glite.lb.common/test/il_int_test.cpp

deleted file mode 100644 (file)

index f00b4c6..0000000
--- a/org.glite.lb.common/test/il_int_test.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-
-
-extern "C" {
-#include "il_string.h"
-}
-
-class IlIntTest: public CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE( IlIntTest );
-       CPPUNIT_TEST( testPutInt );
-       CPPUNIT_TEST( testGetInt );
-       CPPUNIT_TEST( testLenInt );
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void setUp() {
-       }
-
-       void tearDown() {
-       }
-
-       void testPutInt() {
-               put_int(buffer, 17);
-               CPPUNIT_ASSERT(!strcmp(buffer, "17\n"));
-       }
-
-       void testGetInt() {
-               int d;
-               get_int("17\n", &d);
-               CPPUNIT_ASSERT(d == 17);
-               CPPUNIT_ASSERT(get_int("17 \n", &d) == NULL);
-       }
-
-       void testLenInt() {
-               CPPUNIT_ASSERT(3 == len_int(17));
-       }
-
-protected:
-       char buffer[255];
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION( IlIntTest ) ;
-
diff --git a/org.glite.lb.common/test/il_string_test.cpp b/org.glite.lb.common/test/il_string_test.cpp

deleted file mode 100644 (file)

index 2f03a94..0000000
--- a/org.glite.lb.common/test/il_string_test.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
-
-extern "C" {
-#include "il_string.h"
-}
-
-class IlStringTest : public CppUnit::TestFixture 
-{
-       CPPUNIT_TEST_SUITE( IlStringTest );
-       CPPUNIT_TEST( testPutString );
-       CPPUNIT_TEST( testGetString );
-       CPPUNIT_TEST( testLenString );
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void setUp() {
-       }
-
-       void tearDown() {
-       }
-
-       void testPutString() {
-               put_string(buffer, "ahoj");
-               CPPUNIT_ASSERT( !strncmp(buffer,"4 ahoj\n",7) );
-       }
-
-       void testGetString() {
-               char *s;
-               get_string("4 ahoj\n", &s);
-               CPPUNIT_ASSERT( s != NULL );
-               CPPUNIT_ASSERT( !strcmp(s, "ahoj") );
-               CPPUNIT_ASSERT( s[4] == 0 );
-               free(s);
-       }
-
-       void testLenString() {
-               int d = len_string("ahoj");
-               CPPUNIT_ASSERT( d == 7);
-       }
-
-private:
-       char buffer[255];
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION( IlStringTest );
diff --git a/org.glite.lb.common/test/il_test.cpp b/org.glite.lb.common/test/il_test.cpp

deleted file mode 100644 (file)

index 794c0a0..0000000
--- a/org.glite.lb.common/test/il_test.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TextTestRunner.h>
-
-
-int main(int argc, char *argv[])
-{
-       CppUnit::Test  *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextTestRunner runner;
-
-       runner.addTest(suite);
-       runner.setOutputter(CppUnit::CompilerOutputter::defaultOutputter(&runner.result(), std::cerr));
-
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.common/test/parse.cpp.T b/org.glite.lb.common/test/parse.cpp.T

deleted file mode 100644 (file)

index 18f2736..0000000
--- a/org.glite.lb.common/test/parse.cpp.T
+++ /dev/null
@@ -1,120 +0,0 @@
-#include <iostream>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-
-#include <glite/lb/producer.h>
-#include "events_parse.h"
-
-class EventParseTest: public  CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(EventParseTest);
-       CPPUNIT_TEST(regJob);
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void regJob();
-
-
-};
-
-static char * compare_events(const edg_wll_Event *e1, const edg_wll_Event *e2)
-{
-       if (e1->any.type != e2->any.type) return "type";
-@@@{
-       selectType $event '_common_';
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = getName $f;
-               my $ft = $f->{type};
-
-               my $a = "e1->any.$fn";
-               my $b = "e2->any.$fn";
-
-               gen "\tif (!(".eval($main::compare{C}->{$ft}).")) return \"$fn\";\n";
-       }
-       
-       gen "\tswitch(e1->any.type) {\n";
-       for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes)
-       {
-               my $tu = uc $t;
-               my $tl = lcfirst $t;
-
-               selectType $event $t;
-               gen "\t\tcase EDG_WLL_EVENT\_$tu :\n";
-               for ($event->getFieldsOrdered) {
-                       my $f = selectField $event $_;
-                       my $fn = $f->{name};
-                       my $ft = $f->{type};
-
-                       my $a = "e1->$tl.$fn";
-                       my $b = "e2->$tl.$fn";
-
-                       gen "\t\t\tif (!(".eval($main::compare{C}->{$ft}).")) return \"$fn\";\n";
-               }
-               gen "\t\tbreak;\n";
-       }
-@@@}
-               default: return "default";
-       } /* switch */
-       return NULL;
-}
-
-void EventParseTest::regJob()
-{
-       edg_wll_Context ctx;
-       edg_wll_Event   *e1,*e2;
-       char    *line,*et,*ed;
-
-       edg_wll_InitContext(&ctx);
-       e1 = edg_wll_InitEvent(EDG_WLL_EVENT_REGJOB);
-       e1->any.type = EDG_WLL_EVENT_REGJOB;
-
-       e1->regJob.jdl = strdup("very long job = \"blabla\" \\\\ \n hugh\t;");
-       e1->regJob.ns = strdup("ns address");
-       e1->regJob.jobtype = EDG_WLL_REGJOB_SIMPLE;
-       e1->regJob.seed = strdup("");
-
-       gettimeofday(&e1->any.timestamp,NULL);
-       
-       e1->any.host = strdup("some.host");
-       e1->any.level = 7;
-       e1->any.priority = 0;
-       edg_wlc_JobIdParse("https://some.host:1234/x67qr549qc",&e1->any.jobId);
-       e1->any.seqcode = EDG_WLL_SEQ_BIGHELPER_INITIAL;
-       e1->any.user = strdup("/O=Grid/CN=This User");
-       e1->any.source = EDG_WLL_SOURCE_USER_INTERFACE;
-       e1->any.src_instance = strdup("");
-
-       line = edg_wll_UnparseEvent(ctx,e1);
-       std::cerr << line << std::endl;
-       
-       if (!line) {
-               edg_wll_Error(ctx,&et,&ed);
-               CPPUNIT_ASSERT_MESSAGE(std::string("UnparseEvent():") + et + " " + ed, line);
-       }
-
-       if (edg_wll_ParseEvent(ctx,line,&e2)) {
-               edg_wll_Error(ctx,&et,&ed);
-               CPPUNIT_ASSERT_MESSAGE(std::string("ParseEvent():") + et + " " + ed, 0);
-       }
-
-       if ((et = compare_events(e1,e2))) {
-               CPPUNIT_ASSERT_MESSAGE(std::string("compare_events():") + et, 0);
-       }
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION( EventParseTest );
-
-int main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-       
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.common/test/test_gss.cpp b/org.glite.lb.common/test/test_gss.cpp

deleted file mode 100644 (file)

index 97688c3..0000000
--- a/org.glite.lb.common/test/test_gss.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-#include <iostream>
-#include <sys/types.h>
-#include <unistd.h>
-
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-
-#include "lb_gss.h"
-
-class GSSTest: public  CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(GSSTest);
-       CPPUNIT_TEST(echo);
-       CPPUNIT_TEST(errorTest);
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void echo();
-       void errorTest();
-
-       void setUp();
-
-private:
-       gss_cred_id_t   my_cred;
-       char *          my_subject;
-       int             sock, port;
-       struct timeval  timeout;
-       
-       void replier();
-       
-};
-
-
-void GSSTest::replier() {
-       edg_wll_GssConnection   conn;
-       edg_wll_GssStatus       stat;
-       struct sockaddr_in      a;
-       socklen_t               alen = sizeof(a);
-       int                     s, len;
-       char                    buf[100];
-       
-
-       if ( (s = accept(sock, (struct sockaddr *) &a, &alen)) < 0 ) exit(1);
-       
-       if ( edg_wll_gss_accept(my_cred, s, &timeout, &conn, &stat) ) exit(1);
-
-       while ( (len = edg_wll_gss_read(&conn, buf, sizeof(buf), &timeout, &stat)) >= 0 ) {
-               if ( edg_wll_gss_write(&conn, buf, len, &timeout, &stat) ) exit(1);
-       }       
-
-       exit(0);
-}
-
-
-void GSSTest::setUp(void) {
-       pid_t pid;
-       edg_wll_GssStatus stat;
-       struct sockaddr_in      a;
-       socklen_t               alen = sizeof(a);
-       char *                  cred_file = NULL;
-       char *                  key_file = NULL;
-
-       timeout.tv_sec = 10;
-       timeout.tv_usec = 0;
-       
-       key_file = cred_file = getenv("X509_USER_PROXY");
-       CPPUNIT_ASSERT_MESSAGE("credential file", cred_file);
-       
-       if (edg_wll_gss_acquire_cred_gsi(cred_file, key_file, &my_cred, &my_subject, &stat))
-               CPPUNIT_ASSERT_MESSAGE("gss_acquire_cred", 0);
-       
-        sock = socket(PF_INET,SOCK_STREAM,0);
-       CPPUNIT_ASSERT_MESSAGE("socket()", sock >= 0);
-
-        a.sin_family = AF_INET;
-        a.sin_port = 0;
-        a.sin_addr.s_addr = INADDR_ANY;
-
-        if (bind(sock,(struct sockaddr *) &a,sizeof(a))) {
-               CPPUNIT_ASSERT_MESSAGE("bind()", 0);
-        }
-
-        if (listen(sock,1)) {
-               CPPUNIT_ASSERT_MESSAGE("listen()", 0);
-       }
-
-       getsockname(sock,(struct sockaddr *) &a,&alen);
-       port = ntohs(a.sin_port);
-
-       if ( !(pid = fork()) ) replier();
-       else close(sock);
-}
-
-
-
-void GSSTest::echo()
-{
-       edg_wll_GssConnection   conn;
-       edg_wll_GssStatus       stat;
-       size_t                  total;
-       int                     err;
-       char                    buf[] = "f843fejwfanczn nc4*&686%$$&^(*)*#$@WSH";       
-       char                    buf2[100];      
-
-
-       err = edg_wll_gss_connect(my_cred, "localhost", port, &timeout, &conn, &stat);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_gss_connect()", !err);
-       
-       err = edg_wll_gss_write(&conn, buf, strlen(buf)+1, &timeout, &stat);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_gss_write()", !err);
-       
-       err = edg_wll_gss_read_full(&conn, buf2, strlen(buf)+1, &timeout, &total, &stat);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_gss_read_full()", !err);
-
-       CPPUNIT_ASSERT(strlen(buf)+1 == (int) total && !strcmp(buf,buf2) );
-
-       edg_wll_gss_close(&conn, &timeout);
-               
-}
-
-
-void GSSTest::errorTest()
-{
-       edg_wll_GssConnection   conn;
-       edg_wll_GssStatus       stat;
-       int                     err;
-       char *                  msg = NULL;
-
-
-       err = edg_wll_gss_connect(my_cred, "xxx.porno.net", port, &timeout, &conn, &stat);
-       if (err) edg_wll_gss_get_error(&stat, "gss_connect()", &msg);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_gss_get_error()", msg);
-}
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( GSSTest );
-
-int main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-       
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.logger/.cvsignore b/org.glite.lb.logger/.cvsignore

deleted file mode 100644 (file)

index 1df717b..0000000
--- a/org.glite.lb.logger/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.lb.logger/LICENSE b/org.glite.lb.logger/LICENSE

deleted file mode 100644 (file)

index 259a91f..0000000
--- a/org.glite.lb.logger/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware\r
-================================\r
-\r
-Copyright (c) 2004 on behalf of the EU EGEE Project: \r
-The European Organization for Nuclear Research (CERN), \r
-Istituto Nazionale di Fisica Nucleare (INFN), Italy\r
-Datamat Spa, Italy\r
-Centre National de la Recherche Scientifique (CNRS), France\r
-CS Systeme d'Information (CSSI), France\r
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden\r
-Universiteit van Amsterdam (UvA), Netherlands\r
-University of Helsinki (UH.HIP), Finlan\r
-University of Bergen (UiB), Norway\r
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom\r
-\r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are\r
-met: \r
-\r
-1. Redistributions of source code must retain the above copyright\r
-notice, this list of conditions and the following disclaimer.\r
-\r
-2. Redistributions in binary form must reproduce the above copyright\r
-notice, this list of conditions and the following disclaimer in the\r
-documentation and/or other materials provided with the distribution.\r
-\r
-3. The end-user documentation included with the redistribution, if\r
-any, must include the following acknowledgment: "This product includes\r
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."\r
-Alternatively, this acknowledgment may appear in the software itself, if\r
-and wherever such third-party acknowledgments normally appear.\r
-\r
-4. The names EGEE and the EU EGEE Project must not be\r
-used to endorse or promote products derived from this software without\r
-prior written permission. For written permission, please contact\r
-<email address>.\r
-\r
-5. You are under no obligation whatsoever to provide anyone with any\r
-bug fixes, patches, or upgrades to the features, functionality or\r
-performance of the Software ("Enhancements") that you may develop over\r
-time; however, if you choose to provide your Enhancements to The EU\r
-EGEE Project, or if you choose to otherwise publish or distribute your\r
-Enhancements, in source code form without contemporaneously requiring\r
-end users of The EU EGEE Proejct to enter into a separate written license\r
-agreement for such Enhancements, then you hereby grant The EU EGEE Project\r
-a non-exclusive, royalty-free perpetual license to install, use, copy,\r
-modify, prepare derivative works, incorporate into the EGEE Middleware\r
-or any other computer software, distribute, and sublicense your\r
-Enhancements or derivative works thereof, in binary and source code\r
-form (if any), whether developed by The EU EGEE Project or third parties.\r
-\r
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\r
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE\r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\r
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\r
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\r
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\r
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
-This software consists of voluntary contributions made by many\r
-individuals on behalf of the EU EGEE Prject. For more information on The\r
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on\r
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/\r
-\r
-\r
diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile

deleted file mode 100644 (file)

index 32e1f19..0000000
--- a/org.glite.lb.logger/Makefile
+++ /dev/null
@@ -1,160 +0,0 @@
-# defaults
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-client
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-
--include Makefile.inc
-
-CC=gcc
-
-VPATH:=${top_srcdir}/src:${top_srcdir}/test
-
-VERSION=-DVERSION=\"GLite-${version}\"
-
-SUFFIXES=.no
-
-GLOBUSINC=-I${globus_prefix}/include/${nothrflavour}
-
-GLOBUSTHRINC=-I${globus_prefix}/include/${thrflavour}
-
-DEBUG:=-g -O0
-CFLAGS:=${DEBUG} \
-       -I${stagedir}/include -I${top_srcdir}/src \
-       -D_GNU_SOURCE \
-       ${COVERAGE_FLAGS} \
-       ${VERSION}
-
-LDFLAGS:=-L${stagedir}/lib \
-       ${COVERAGE_FLAGS} 
-LINK:=libtool --mode=link ${CC} ${LDFLAGS}
-LINKXX:=libtool --mode=link ${CXX} -rpath ${stagedir}/lib ${LDFLAGS} 
-INSTALL:=libtool --mode=install install
-
-GLOBUS_LIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour}
-
-GLOBUS_THRLIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${thrflavour} \
-       -lglobus_gssapi_gsi_${thrflavour}
-
-EXT_LIBS:= -L${ares_prefix}/lib -lares \
-       -L${expat_prefix}/lib -lexpat
-
-COMMON_LIB:=-lglite_lb_common
-
-TEST_LIBS:=-L${cppunit_prefix}/lib -lcppunit
-TEST_INC:=-I${cppunit_prefix}/include
-
-LOGD_OBJS:= logd_proto.o logd.o
-
-INTERLOG_OBJS:=il_error.o input_queue_socket.o \
-       recover.o send_event.o \
-       event_queue.o event_store.o il_master.o interlogd.o \
-       queue_mgr.o server_msg.o queue_thread.o
-
-INTERLOG_NOBJS:=${INTERLOG_OBJS:.o=.no}
-
-INTERLOG_TEST_OBJS:= \
-       il_error.o \
-       server_msg.o \
-       server_msgTest.o \
-       queue_thread.o \
-       event_store.o \
-       event_storeTest.o \
-       queue_mgr.o \
-       il_master.o \
-       input_queue_socket.o \
-       input_queue_socketTest.o \
-       send_event.o \
-       event_queue.o \
-       event_queueTest.o \
-       IlTestBase.o \
-       il_test.o 
-
-glite_lb_logd: ${LOGD_OBJS}
-       ${LINK} -o $@ ${LOGD_OBJS} ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS}
-
-glite_lb_interlogd: ${INTERLOG_OBJS}
-       ${LINK} -o $@ ${INTERLOG_OBJS} \
-               ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
-
-glite_lb_notif_interlogd: ${INTERLOG_NOBJS}
-       ${LINK} -o $@ ${INTERLOG_NOBJS} \
-               ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} -lpthread
-
-default: all
-
-all compile: glite_lb_logd glite_lb_interlogd glite_lb_notif_interlogd
-
-stage: compile
-       $(MAKE) install PREFIX=${stagedir}
-
-check: 
-# do nothing until test/ is really added to CVS
-# check.ll check.il
-
-#check.ll: logd_proto_test.o ll_test.o
-#      ${LINKXX} -o $@ ${COMMON_LIB}_${nothrflavour} ${EXT_LIBS} ${GLOBUS_LIBS} ${TEST_LIBS} $+
-#      ./check.ll
-
-check.ll:
-       -echo commented out -- fix needed
-
-check.il: ${INTERLOG_TEST_OBJS}
-       ${LINKXX} -o $@ ${COMMON_LIB}_${thrflavour} ${EXT_LIBS} ${GLOBUS_THRLIBS} ${TEST_LIBS} -lpthread $+
-
-dist: distsrc distbin
-
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-
-install:
-       -mkdir -p ${PREFIX}/bin
-       -mkdir -p ${PREFIX}/etc/init.d
-       -mkdir -p ${PREFIX}/share/doc/${package}-${version}
-       ${INSTALL} -m 755 glite_lb_logd ${PREFIX}/bin/glite-lb-logd
-       ${INSTALL} -m 755 glite_lb_interlogd ${PREFIX}/bin/glite-lb-interlogd
-       ${INSTALL} -m 755 glite_lb_notif_interlogd ${PREFIX}/bin/glite-lb-notif-interlogd
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-locallogger
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-
-%.no: %.c
-       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -DIL_NOTIFICATIONS -c $< -o $@
-
-${INTERLOG_OBJS}: %.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSTHRINC} -c $< -o $@
-
-${LOGD_OBJS}: %.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $< -o $@
-
-logd_proto_test.o: %.o: %.c
-       ${CC} ${CFLAGS} ${GLOBUSINC} -c $< -o $@
-
-ll_test.o: %.o: %.cpp
-       ${CXX} ${CFLAGS} ${TEST_INC} -c $< -o $@
-
-il_test.o IlTestBase.o server_msgTest.o event_queueTest.o input_queue_socketTest.o event_storeTest.o: %.o: %.cpp
-       ${CXX} ${CFLAGS} ${GLOBUSTHRINC} ${TEST_INC} -c $< -o $@
diff --git a/org.glite.lb.logger/build.xml b/org.glite.lb.logger/build.xml

deleted file mode 100755 (executable)

index 293f6d5..0000000
--- a/org.glite.lb.logger/build.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.3  2004/07/29 23:21:51  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.2  2004/07/07 09:24:57  akrenek
-       thr/nonthr flavours used correctly
-       
-       Revision 1.3  2004/07/06 17:45:30  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.2  2004/06/23 00:29:33  dimeglio
-       Added standard comments and handling of support files
-       
--->
-
-<project name="logger" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite LB Client Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                Load configure options (order is important)
-            ========================================= -->
-       <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>
-
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-       <!-- =========================================
-            RPM settings
-            ========================================= -->
-
-       <property name="build.package.summary" value="L&amp;B local logger" />
-       <property name="build.package.description" value="
-Daemons installed on any EGEE machine producing Logging &amp; Bookkeeping
-(L&amp;B)&#xA;events. They are responsible for non-blocking accept of
-an event, persistent&#xA;storage, and reliable transfer to bookkeeping server." />
-
-</project>             
diff --git a/org.glite.lb.logger/config/startup b/org.glite.lb.logger/config/startup

deleted file mode 100755 (executable)

index 055c890..0000000
--- a/org.glite.lb.logger/config/startup
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-GLITE_USER=${GLITE_USER:-glite}
-GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-$GLITE_LOCATION/var}
-
-[ -f /etc/glite.conf ] && . /etc/glite.conf
-[ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
-
-[ -f $GLITE_LOCATION/etc/lb.conf ] && . $GLITE_LOCATION/etc/lb.conf
-[ -f $GLITE_LOCATION_VAR/etc/lb.conf ] && . $GLITE_LOCATION_VAR/etc/lb.conf
-
-[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
-
-unset creds port
-
-start()
-{
-       [ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] &&
-               creds="-c $GLITE_HOST_CERT -k $GLITE_HOST_KEY"
-
-       [ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
-
-       [ -n "$GLITE_LB_LOGGER_PORT" ] && port="-p $GLITE_LB_LOGGER_PORT"
-
-       echo -n Starting glite-lb-logd ...
-        (cd /tmp && ls -f /tmp |fgrep ^dglogd_sock_ |xargs rm -f)
-       su $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-logd \
-               $creds $port" && echo " done"
-
-       echo -n Starting glite-lb-interlogd ...
-       su $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-interlogd \
-               $creds" && echo " done"
-}
-
-stop()
-{
-               echo -n Stopping glite-lb-logd ...
-               killall glite-lb-logd
-               echo " done"
-               echo -n Stopping glite-lb-interlogd ...
-               killall glite-lb-interlogd
-               echo " done"
-}
-
-status()
-{
-       if netstat -an --inet | grep "^tcp .* 0.0.0.0:${GLITE_LB_LOGGER_PORT:-9002} .*LISTEN" >/dev/null 2>&1 ;then
-       echo glite-lb-logd running
-       else
-       echo glite-lb-logd not running
-       return 1
-       fi
-       if netstat -an --unix | grep "^unix .* LISTEN.* /tmp/interlogger.sock$" >/dev/null 2>&1 ;then
-       echo glite-lb-interlogd running
-       else
-       echo glite-lb-interlogd not running
-       return 1
-       fi
-}
-
-case x$1 in
-       xstart) start;;
-       xstop)  stop;;
-       xrestart) stop; start;;
-       xstatus) status;;
-       x*)     echo usage: $0 start,stop,restart,status >&2
-               exit 1;;
-esac
diff --git a/org.glite.lb.logger/project/build.properties b/org.glite.lb.logger/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.lb.logger/project/configure.properties.xml b/org.glite.lb.logger/project/configure.properties.xml

deleted file mode 100644 (file)

index 0e51395..0000000
--- a/org.glite.lb.logger/project/configure.properties.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.1  2004/07/07 12:08:47  akrenek
-       *** empty log message ***
-       
-       Revision 1.2  2004/07/06 20:47:11  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Client configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-cppunit_prefix=${with.cppunit.prefix}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.lb.logger/project/properties.xml b/org.glite.lb.logger/project/properties.xml

deleted file mode 100755 (executable)

index 44827cf..0000000
--- a/org.glite.lb.logger/project/properties.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Logger component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
--->
-
-<project name="LB Logger component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${lb.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${lb.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="logger" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.lb.logger/project/tar_exclude b/org.glite.lb.logger/project/tar_exclude

deleted file mode 100644 (file)

index e1fcd1a..0000000
--- a/org.glite.lb.logger/project/tar_exclude
+++ /dev/null
@@ -1,10 +0,0 @@
-tar_exclude
-CVS
-build.xml
-build
-build.properties
-properties.xml
-configure.properties.xml
-.cvsignore
-.project
-.cdtproject
diff --git a/org.glite.lb.logger/project/version.properties b/org.glite.lb.logger/project/version.properties

deleted file mode 100644 (file)

index b7f1d82..0000000
--- a/org.glite.lb.logger/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:13:53 CEST 2004
-module.version=0.2.1
-module.build=48
-module.age=1
diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c

deleted file mode 100644 (file)

index d311a1a..0000000
--- a/org.glite.lb.logger/src/event_queue.c
+++ /dev/null
@@ -1,314 +0,0 @@
-#ident "$Header$"
-
-/* 
- *   - general queue handling routines (insert, get)
- */
-
-#include <netdb.h>
-#include <sys/socket.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "interlogd.h"
-
-struct event_queue_msg {
-  struct server_msg *msg;
-  struct event_queue_msg *prev;
-};
-
-struct event_queue *
-event_queue_create(char *server_name)
-{
-  struct event_queue *eq;
-  char *p;
-
-  p = strchr(server_name, ':');
-  
-  if(p) 
-    *p++ = 0;
-
-  if((eq = malloc(sizeof(*eq))) == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "event_queue_create: error allocating event queue");
-    return(NULL);
-  }
-
-  memset(eq, 0, sizeof(*eq));
-
-  eq->dest_name = strdup(server_name);
-
-  if(p)
-    *(p-1) = ':';
-  
-#if defined(IL_NOTIFICATIONS)
-  eq->dest_port = atoi(p);
-#else
-  eq->dest_port = p ? atoi(p)+1 : GLITE_WMSC_JOBID_DEFAULT_PORT+1;
-#endif
-  /* create all necessary locks */
-  if(pthread_rwlock_init(&eq->update_lock, NULL)) {
-    set_error(IL_SYS, errno, "event_queue_create: error creating update lock");
-    free(eq);
-    return(NULL);
-  }
-  if(pthread_mutex_init(&eq->cond_lock, NULL)) {
-    set_error(IL_SYS, errno, "event_queue_create: error creating cond mutex");
-    free(eq);
-    return(NULL);
-  }
-  if(pthread_cond_init(&eq->ready_cond, NULL)) {
-    set_error(IL_SYS, errno, "event_queue_create: error creating cond variable");
-    free(eq);
-    return(NULL);
-  }
-
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-  if(pthread_cond_init(&eq->flush_cond, NULL)) {
-    set_error(IL_SYS, errno, "event_queue_create: error creating cond variable");
-    free(eq);
-    return(NULL);
-  }
-#endif
-
-  return(eq);
-}
-
-
-int
-event_queue_free(struct event_queue *eq)
-{
-  assert(eq != NULL);
-
-  if(!event_queue_empty(eq))
-    return(-1);
-
-  if(eq->thread_id)
-    pthread_cancel(eq->thread_id);
-
-
-  pthread_rwlock_destroy(&eq->update_lock);
-  pthread_mutex_destroy(&eq->cond_lock);
-  pthread_cond_destroy(&eq->ready_cond);
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-  pthread_cond_destroy(&eq->flush_cond);
-#endif
-  free(eq);
-
-  return(0);
-}
-
-
-int
-event_queue_empty(struct event_queue *eq)
-{
-  int ret;
-
-  assert(eq != NULL);
-
-  event_queue_lock_ro(eq);
-  ret = eq->head == NULL;
-  event_queue_unlock(eq);
-
-  return(ret);
-}
-
-
-int
-event_queue_insert(struct event_queue *eq, struct server_msg *msg)
-{
-  struct event_queue_msg *el;
-#if defined(INTERLOGD_EMS)
-  struct event_queue_msg *tail;
-#endif
-  
-  assert(eq != NULL);
-
-  if((el = malloc(sizeof(*el))) == NULL) 
-    return(set_error(IL_NOMEM, ENOMEM, "event_queue_insert: not enough room for queue element"));
-
-  el->msg = server_msg_copy(msg);
-  if(el->msg == NULL) {
-    free(el);
-    return(-1);
-  };
-
-  /* this is critical section */
-  event_queue_lock(eq);
-#if defined(INTERLOGD_EMS)
-  if(server_msg_is_priority(msg)) {
-    /* priority messages go first */
-    tail = eq->tail_ems;
-    if(tail) {
-      el->prev = tail->prev;
-      tail->prev = el;
-      if (tail == eq->tail)
-       eq->tail = el;
-    } else {
-      el->prev = eq->head;
-      eq->head = el;
-      if(eq->tail == NULL)
-       eq->tail = el;
-    }
-    eq->tail_ems = el;
-  } else 
-#endif
-  { 
-    /* normal messages */
-    if(eq->tail)
-      eq->tail->prev = el;
-    else
-      eq->head = el;
-    eq->tail = el;
-    el->prev = NULL;
-  }
-#if defined(INTERLOGD_EMS)
-  /* if we are inserting message between mark_prev and mark_this,
-     we have to adjust mark_prev accordingly */
-  if(eq->mark_this && (el->prev == eq->mark_this)) 
-    eq->mark_prev = el;
-#endif
-  event_queue_unlock(eq);
-  /* end of critical section */
-
-  return(0);
-}
-
-
-int
-event_queue_get(struct event_queue *eq, struct server_msg **msg)
-{
-  struct event_queue_msg *el;
-
-  assert(eq != NULL);
-  assert(msg != NULL);
-  
-  event_queue_lock_ro(eq);
-  el = eq->head;
-#if defined(INTERLOGD_EMS)
-  /* this message is marked for removal, it is first on the queue */
-  eq->mark_this = el;
-  eq->mark_prev = NULL;
-#endif
-  event_queue_unlock(eq);
-
-  if(el == NULL)
-    return(-1);
-
-  *msg = el->msg;
-
-  return(0);
-}
-
-
-int 
-event_queue_remove(struct event_queue *eq)
-{
-  struct event_queue_msg *el;
-#if defined(INTERLOGD_EMS)
-  struct event_queue_msg *prev;
-#endif
-
-  assert(eq != NULL);
-
-  /* this is critical section */
-  event_queue_lock(eq);
-#if defined(INTERLOGD_EMS)
-  el = eq->mark_this;
-  prev = eq->mark_prev;
-
-  if(el == NULL) {
-    event_queue_unlock(eq);
-    return(-1);
-  }
-
-  if(prev == NULL) {
-    /* removing from head of the queue */
-    eq->head = el->prev;
-  } else {
-    /* removing from middle of the queue */
-    prev->prev = el->prev;
-  }
-  if(el == eq->tail) {
-    /* we are removing the last message */
-    eq->tail = NULL;
-  }
-  if(el == eq->tail_ems) {
-    /* we are removing last priority message */
-    eq->tail_ems = NULL;
-  }
-
-  eq->mark_this = NULL;
-  eq->mark_prev = NULL;
-#else
-  el = eq->head;
-  if(el == NULL) {
-         event_queue_unlock(eq);
-         return(-1);
-  }
-  eq->head = el->prev;
-  if(el == eq->tail) {
-         eq->tail = NULL;
-  }
-#endif
-  event_queue_unlock(eq);
-  /* end of critical section */
-    
-  server_msg_free(el->msg);
-  free(el);
-
-  return(0);
-}
-
-#if defined(IL_NOTIFICATIONS)
-
-int
-event_queue_move_events(struct event_queue *eq_s, struct event_queue *eq_d, char *notif_id)
-{
-       struct event_queue_msg *p, **source_prev, **dest_tail;
-
-       assert(eq_s != NULL);
-       assert(notif_id != NULL);
-
-       event_queue_lock(eq_s);
-       if(eq_d) {
-               event_queue_lock(eq_d);
-               /* dest tail is set to point to the last (NULL) pointer in the list */
-               dest_tail = (eq_d->head == NULL) ? &(eq_d->head) : &(eq_d->tail->prev);
-       }
-       source_prev = &(eq_s->head);
-       p = *source_prev;
-       eq_s->tail = NULL;
-       while(p) {
-               if(strcmp(p->msg->job_id_s, notif_id) == 0) {
-                       il_log(LOG_DEBUG, "  moving event with notif id %s from %s:%d to %s:%d\n",
-                              notif_id, eq_s->dest_name,eq_s->dest_port, eq_d ? eq_d->dest_name : "trash",eq_d ? eq_d->dest_port : -1);
-                       /* remove the message from the source list */
-                       *source_prev = p->prev;
-                       if(eq_d) {
-                               /* append the message at the end of destination list */
-                               p->prev = NULL;
-                               *dest_tail = p;
-                               dest_tail = &(p->prev);
-                               eq_d->tail = p;
-                       } else {
-                               /* free the message */
-                               server_msg_free(p->msg);
-                               free(p);
-                       }
-               } else {
-                       /* message stays */
-                       source_prev = &(p->prev);
-                       eq_s->tail = p;
-               }
-               p = *source_prev;
-       }
-       if(eq_d) event_queue_unlock(eq_d);
-       event_queue_unlock(eq_s);
-       return(0);
-}
-
-#endif
diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c

deleted file mode 100644 (file)

index 295b2f0..0000000
--- a/org.glite.lb.logger/src/event_store.c
+++ /dev/null
@@ -1,1025 +0,0 @@
-#ident "$Header$"
-
-#include <assert.h>
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/events_parse.h"
-
-#include "interlogd.h"
-
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-
-static char *file_prefix = NULL;
-
-
-struct event_store_list {
-       struct event_store *es;
-       struct event_store_list *next;
-};
-
-
-static struct event_store_list *store_list;
-static pthread_rwlock_t store_list_lock = PTHREAD_RWLOCK_INITIALIZER;
-
-
-/* ----------------
- * helper functions
- * ----------------
- */
-static
-char *
-jobid2eventfile(IL_EVENT_ID_T job_id)
-{
-  char *buffer;
-  char *hash;
-
-  if(job_id) {
-    hash = IL_EVENT_GET_UNIQUE(job_id);
-    asprintf(&buffer, "%s.%s", file_prefix, hash);
-    free(hash);
-  } else 
-    asprintf(&buffer, "%s.default", file_prefix);
-    
-  return(buffer);
-}
-
-
-static
-char *
-jobid2controlfile(IL_EVENT_ID_T job_id)
-{
-  char buffer[256];
-  char *hash;
-
-  if(job_id) {
-    hash = IL_EVENT_GET_UNIQUE(job_id);
-    snprintf(buffer, 256, "%s.%s.ctl", file_prefix, hash);
-    free(hash);
-  } else 
-    snprintf(buffer, 256, "%s.default.ctl", file_prefix);
-    
-  return(strdup(buffer));
-}
-
-
-static
-char *
-read_event_string(FILE *file)
-{
-  char *buffer, *p, *n;
-  int  len, c;
-
-  buffer=malloc(1024);
-  if(buffer == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "read_event_string: no room for event");
-    return(NULL);
-  }
-  p = buffer;
-  len = 1024;
-
-  while((c=fgetc(file)) != EOF) {
-    
-    /* we have to have free room for one byte */
-    /* if(len - (p - buffer) < 1) */
-    if(p - buffer >= len) {
-      n = realloc(buffer, len + 8192);
-      if(n == NULL) {
-       free(buffer);
-       set_error(IL_NOMEM, ENOMEM, "read_event_string: no room for event");
-       return(NULL);
-      }
-      p = p - buffer + n;
-      buffer = n;
-      len += 8192;
-    }
-
-    if(c == EVENT_SEPARATOR) {
-      *p++ = 0;
-      break;
-    } else
-      *p++ = (char) c; 
-  }
-
-  if(c != EVENT_SEPARATOR) {
-    free(buffer);
-    return(NULL);
-  }
-
-  return(buffer);
-}
-
-
-
-/* ------------------------------
- * event_store 'member' functions
- * ------------------------------
- */
-static
-int
-event_store_free(struct event_store *es)
-{
-  assert(es != NULL);
-
-  if(es->job_id_s) free(es->job_id_s);
-  if(es->event_file_name) free(es->event_file_name);
-  if(es->control_file_name) free(es->control_file_name);
-  pthread_rwlock_destroy(&es->use_lock);
-  pthread_rwlock_destroy(&es->update_lock);
-  free(es);
-
-  return(0);
-}
-
-
-static
-struct event_store *
-event_store_create(char *job_id_s)
-{
-  struct event_store *es;
-  IL_EVENT_ID_T job_id;
-
-  es = malloc(sizeof(*es));
-  if(es == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "event_store_create: error allocating room for structure");
-    return(NULL);
-  }
-
-  memset(es, 0, sizeof(*es));
-
-  il_log(LOG_DEBUG, "  creating event store for id %s\n", job_id_s);
-
-  job_id = NULL;
-  if(strcmp(job_id_s, "default") && IL_EVENT_ID_PARSE(job_id_s, &job_id)) {
-    set_error(IL_LBAPI, EDG_WLL_ERROR_PARSE_BROKEN_ULM, "event_store_create: error parsing id");
-    free(es);
-    return(NULL);
-  }
-
-  es->job_id_s = strdup(job_id_s);
-  es->event_file_name = jobid2eventfile(job_id);
-  es->control_file_name = jobid2controlfile(job_id);
-  IL_EVENT_ID_FREE(job_id);
-
-  if(pthread_rwlock_init(&es->update_lock, NULL)) 
-          abort();
-  if(pthread_rwlock_init(&es->use_lock, NULL)) 
-         abort();
-
-  return(es);
-}
-
-
-static
-int
-event_store_lock_ro(struct event_store *es)
-{
-  assert(es != NULL);
-
-  if(pthread_rwlock_rdlock(&es->update_lock)) 
-    abort();
-
-  return(0);
-}
-
-
-static
-int
-event_store_lock(struct event_store *es)
-{
-  assert(es != NULL);
-
-  if(pthread_rwlock_wrlock(&es->update_lock)) 
-    abort();
-
-  return(0);
-}
-
-
-static
-int
-event_store_unlock(struct event_store *es)
-{
-  assert(es != NULL);
-
-  if(pthread_rwlock_unlock(&es->update_lock)) 
-    abort();
-  return(0);
-}
-
-
-static
-int
-event_store_read_ctl(struct event_store *es)
-{
-  FILE *ctl_file;
-
-  assert(es != NULL);
-
-  event_store_lock(es);
-  if((ctl_file = fopen(es->control_file_name, "r")) == NULL) {
-    /* no control file, new event file */
-    es->last_committed_ls = 0;
-    es->last_committed_bs = 0;
-  } else {
-    /* read last seen and last committed counts */
-    fscanf(ctl_file, "%*s\n%ld\n%ld\n",
-          &es->last_committed_ls,
-          &es->last_committed_bs);
-    fclose(ctl_file);
-  }
-  event_store_unlock(es);
-
-  return(0);
-}
-
-
-static
-int
-event_store_write_ctl(struct event_store *es)
-{
-  FILE   *ctl;
-
-  assert(es != NULL);
-
-  ctl = fopen(es->control_file_name, "w");
-  if(ctl == NULL) {
-    set_error(IL_SYS, errno, "event_store_write_ctl: error opening control file");
-    return(-1);
-  }
-
-  if(fprintf(ctl, "%s\n%ld\n%ld\n", 
-            es->job_id_s, 
-            es->last_committed_ls,
-            es->last_committed_bs) < 0) {
-    set_error(IL_SYS, errno, "event_store_write_ctl: error writing control record");
-    return(-1);
-  }
-
-  if(fclose(ctl) < 0) {
-    set_error(IL_SYS, errno, "event_store_write_ctl: error closing control file");
-    return(-1);
-  }
-
-  return(0);
-}
-
-
-/*
- * event_store_recover()
- *   - recover after restart or catch up when events missing in IPC
- *   - if offset > 0, read everything behind it
- *   - if offset == 0, read everything behind min(last_committed_bs, last_committed_es)
- */
-int
-event_store_recover(struct event_store *es)
-{
-  struct event_queue *eq_l = NULL, *eq_b, *eq_b_new;
-  struct server_msg *msg;
-  char *event_s;
-  int fd, ret;
-  long last;
-  FILE *ef;
-  struct flock efl;
-  char err_msg[128];
-
-  assert(es != NULL);
-  
-#if defined(IL_NOTIFICATIONS)
-  eq_b = queue_list_get(es->dest);
-#else
-  /* find bookkepping server queue */
-  eq_b = queue_list_get(es->job_id_s);
-#endif
-  if(eq_b == NULL) 
-    return(-1);
-
-#if !defined(IL_NOTIFICATIONS)
-  /* get log server queue */
-  eq_l = queue_list_get(NULL);
-#endif
-
-  event_store_lock(es);
-
-  il_log(LOG_DEBUG, "  reading events from %s\n", es->event_file_name);
-
-  /* open event file */
-  ef = fopen(es->event_file_name, "r");
-  if(ef == NULL) {
-         snprintf(err_msg, sizeof(err_msg), 
-                  "event_store_recover: error opening event file %s",
-                  es->event_file_name);
-         set_error(IL_SYS, errno, err_msg);
-         event_store_unlock(es);
-         return(-1);
-  }
-
-  /* lock the file for reading (we should not read while dglogd is writing) */
-  fd = fileno(ef);
-  efl.l_type = F_RDLCK;
-  efl.l_whence = SEEK_SET;
-  efl.l_start = 0;
-  efl.l_len = 0;
-  if(fcntl(fd, F_SETLKW, &efl) < 0) {
-         snprintf(err_msg, sizeof(err_msg), 
-                  "event_store_recover: error locking event file %s",
-                  es->event_file_name);
-         set_error(IL_SYS, errno, err_msg);
-         event_store_unlock(es);
-         fclose(ef);
-         return(-1);
-  }
-
-  /* get the position in file to be sought */
-  if(es->offset)
-    last = es->offset;
-  else {
-#if !defined(IL_NOTIFICATIONS)
-    if(eq_b == eq_l) 
-      last = es->last_committed_ls;
-    else
-#endif
-      /* last = min(ls, bs) */
-      last = (es->last_committed_bs < es->last_committed_ls) ? es->last_committed_bs : es->last_committed_ls;
-  }
-
-  il_log(LOG_DEBUG, "    setting starting file position to  %ld\n", last);
-  il_log(LOG_DEBUG, "    bytes sent to logging server: %d\n", es->last_committed_ls);
-  il_log(LOG_DEBUG, "    bytes sent to bookkeeping server: %d\n", es->last_committed_bs);
-
-  /* skip all committed or already enqueued events */
-  if(fseek(ef, last, SEEK_SET) < 0) {
-    set_error(IL_SYS, errno, "event_store_recover: error setting position for read");
-    event_store_unlock(es);
-    fclose(ef);
-    return(-1);
-  }
-
-  /* enqueue all remaining events */
-  ret = 1;
-  msg = NULL;
-  while((event_s=read_event_string(ef)) != NULL) {
-       
-    /* last holds the starting position of event_s in file */
-    il_log(LOG_DEBUG, "    reading event at %ld\n", last);
-
-    /* break from now on means there was some error */
-    ret = -1;
-
-    /* create message for server */
-    msg = server_msg_create(event_s, last);
-    free(event_s);
-    if(msg == NULL) {
-      break;
-    }
-    msg->es = es;
-
-    /* first enqueue to the LS */
-    if(!bs_only && (last >= es->last_committed_ls)) {
-      
-      il_log(LOG_DEBUG, "      queueing event at %ld to logging server\n", last);
-
-#if !defined(IL_NOTIFICATIONS)
-      if(enqueue_msg(eq_l, msg) < 0)
-       break;
-#endif
-      }
-
-#ifdef IL_NOTIFICATIONS
-    eq_b_new = queue_list_get(msg->dest);
-    if (eq_b_new != eq_b) {
-           free(es->dest);
-           es->dest = strdup(msg->dest);
-           eq_b = eq_b_new;
-    }
-#endif
-
-    /* now enqueue to the BS, if neccessary */
-    if((eq_b != eq_l) && 
-       (last >= es->last_committed_bs)) {
-      
-      il_log(LOG_DEBUG, "      queueing event at %ld to bookkeeping server\n", last);
-      
-      if(enqueue_msg(eq_b, msg) < 0)
-       break;
-    }
-    server_msg_free(msg);
-    msg = NULL;
-
-    /* now last is also the offset behind the last successfully queued event */
-    last = ftell(ef);
-
-    /* ret == 0 means EOF or incomplete event found */
-    ret = 0;
-
-  } /* while */
-
-  /* due to this little assignment we had to lock the event_store for writing */
-  es->offset = last;
-  il_log(LOG_DEBUG, "  event store offset set to %ld\n", last);
-
-  if(msg) 
-    server_msg_free(msg);
-
-  fclose(ef);
-  il_log(LOG_DEBUG, "  finished reading events with %d\n", ret);
-
-  event_store_unlock(es);
-  return(ret);
-}
-
-
-/*
- * event_store_sync()
- *   - check the position of event and fill holes from file
- *   - return 1 if the event is new,
- *            0 if it was seen before,
- *           -1 if there was an error
- */
-int
-event_store_sync(struct event_store *es, long offset)
-{
-  int ret;
-
-  assert(es != NULL);
-
-  event_store_lock_ro(es);
-  if(es->offset == offset) 
-    /* we are up to date */
-    ret = 1;
-  else if(es->offset > offset)
-    /* we have already seen this event */
-    ret = 0;
-  else {
-    /* es->offset < offset, i.e. we have missed some events */
-    event_store_unlock(es);
-    ret = event_store_recover(es);
-    /* XXX possible room for intervention by another thread - is there 
-     * any other thread messing with us? 
-     * 1) After recover() es->offset is set at the end of file. 
-     * 2) es->offset is set only by recover() and next().
-     * 3) Additional recover can not do much harm.
-     * 4) And next() is only called by the same thread as sync().
-     * => no one is messing with us right now */
-    event_store_lock_ro(es);
-    if(ret < 0)
-      ret = -1;
-    else 
-      /* somehow we suppose that now es->offset >= offset */
-      /* in fact it must be es->offset > offset, anything else would be weird */
-      ret = (es->offset > offset) ? 0 : 1;
-  }
-  event_store_unlock(es);
-  return(ret);
-}
-
-
-int
-event_store_next(struct event_store *es, int len)
-{
-  assert(es != NULL);
-  
-  event_store_lock(es);
-  es->offset += len;
-  event_store_unlock(es);
-
-  return(0);
-}
-
-
-/* 
- * event_store_commit()
- *
- */
-int
-event_store_commit(struct event_store *es, int len, int ls)
-{
-  assert(es != NULL);
-
-  event_store_lock(es);
-
-  if(ls)
-    es->last_committed_ls += len;
-  else {
-    es->last_committed_bs += len;
-    if (bs_only) es->last_committed_ls += len;
-  }
-
-  if(event_store_write_ctl(es) < 0) {
-    event_store_unlock(es);
-    return(-1);
-  }
-
-  event_store_unlock(es);
-
-
-  return(0);
-}
-
-
-/*
- * event_store_clean()
- *  - remove the event files (event and ctl), if they are not needed anymore
- *  - returns 0 if event_store is in use, 1 if it was removed and -1 on error
- *
- * Q: How do we know that we can safely remove the files?
- * A: When all events from file have been committed both by LS and BS.
- */
-static 
-int
-event_store_clean(struct event_store *es)
-{
-  long last;
-  int fd;
-  FILE *ef;
-  struct flock efl;
-
-  assert(es != NULL);
-
-  /* prevent sender threads from updating */
-  event_store_lock(es);
-  
-  il_log(LOG_DEBUG, "  trying to cleanup event store %s\n", es->job_id_s);
-  il_log(LOG_DEBUG, "    bytes sent to logging server: %d\n", es->last_committed_ls);
-  il_log(LOG_DEBUG, "    bytes sent to bookkeeping server: %d\n", es->last_committed_bs);
-
-  /* preliminary check to avoid opening event file */
-  /* if the positions differ, some events still have to be sent */
-  if(es->last_committed_ls != es->last_committed_bs) {
-    event_store_unlock(es);
-    il_log(LOG_DEBUG, "  not all events sent, cleanup aborted\n");
-    return(0);
-  }
-
-  /* the file can only be removed when all the events were succesfully sent 
-     (ie. committed both by LS and BS */
-  /* That also implies that the event queues are 'empty' at the moment. */
-  ef = fopen(es->event_file_name, "r+");
-  if(ef == NULL) {
-    /* if we can not open the event store, it is an error and the struct should be removed */
-    /* XXX - is it true? */
-    event_store_unlock(es);
-    il_log(LOG_ERR,  "  event_store_clean: error opening event file: %s\n", strerror(errno));
-    return(1);
-  }
-  
-  fd = fileno(ef);
-  
-  /* prevent local-logger from writing into event file */
-  efl.l_type = F_WRLCK;
-  efl.l_whence = SEEK_SET;
-  efl.l_start = 0;
-  efl.l_len = 0;
-  if(fcntl(fd, F_SETLK, &efl) < 0) {
-    il_log(LOG_DEBUG, "    could not lock event file, cleanup aborted\n");
-    fclose(ef);
-    event_store_unlock(es);
-    if(errno != EACCES &&
-       errno != EAGAIN) {
-      set_error(IL_SYS, errno, "event_store_clean: error locking event file");
-      return(-1);
-    }
-    return(0);
-  }
-  
-  /* now the file should not contain partially written event, so it is safe
-     to get offset behind last event by seeking the end of file */
-  if(fseek(ef, 0, SEEK_END) < 0) {
-    set_error(IL_SYS, errno, "event_store_clean: error seeking the end of file");
-    event_store_unlock(es);
-    fclose(ef);
-    return(-1);
-  }
-  
-  last = ftell(ef);
-  il_log(LOG_DEBUG, "    total bytes in file: %d\n", last);
-
-  if(es->last_committed_ls < last) {
-    fclose(ef);
-    event_store_unlock(es);
-    il_log(LOG_DEBUG, "    events still waiting in queue, cleanup aborted\n");
-    return(0);
-  } else if( es->last_committed_ls > last) {
-         il_log(LOG_WARNING, "  warning: event file seems to shrink!\n");
-  }
-  
-  /* now we are sure that all events were sent and the event queues are empty */
-  il_log(LOG_INFO, "    removing event file %s\n", es->event_file_name);
-  
-  /* remove the event file */
-  unlink(es->event_file_name);
-  unlink(es->control_file_name);
-  
-  /* clear the counters */
-  es->last_committed_ls = 0;
-  es->last_committed_bs = 0;
-  es->offset = 0;
-
-  /* unlock the event_store even if it is going to be removed */
-  event_store_unlock(es);
-
-  /* close the event file (that unlocks it as well) */
-  fclose(ef);
-
-  /* indicate that it is safe to remove this event_store */
-  return(1);
-}
-
-
-
-/* --------------------------------
- * event store management functions
- * --------------------------------
- */
-struct event_store *
-event_store_find(char *job_id_s)
-{
-  struct event_store_list *q, *p;
-  struct event_store *es;
-
-  if(pthread_rwlock_wrlock(&store_list_lock)) {
-         abort();
-  }
-
-  es = NULL;
-  
-  q = NULL;
-  p = store_list;
-  
-  while(p) {
-    if(strcmp(p->es->job_id_s, job_id_s) == 0) {
-      es = p->es;
-      if(pthread_rwlock_rdlock(&es->use_lock))
-             abort();
-      if(pthread_rwlock_unlock(&store_list_lock)) 
-             abort();
-      return(es);
-    }
-
-    q = p;
-    p = p->next;
-  }
-
-  es = event_store_create(job_id_s);
-  if(es == NULL) {
-         if(pthread_rwlock_unlock(&store_list_lock)) 
-                 abort();
-         return(NULL);
-  }
-
-  p = malloc(sizeof(*p));
-  if(p == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "event_store_find: no room for new event store");
-      if(pthread_rwlock_unlock(&store_list_lock)) 
-             abort();
-    return(NULL);
-  }
-  
-  p->next = store_list;
-  store_list = p;
-    
-  p->es = es;
-
-  if(pthread_rwlock_rdlock(&es->use_lock))
-         abort();
-
-  if(pthread_rwlock_unlock(&store_list_lock)) 
-         abort();
-
-  return(es);
-}
-
-
-int
-event_store_release(struct event_store *es)
-{
-       assert(es != NULL);
-
-       if(pthread_rwlock_unlock(&es->use_lock))
-               abort();
-       il_log(LOG_DEBUG, "  released lock on %s\n", es->job_id_s);
-       return(0);
-}
-
-
-static
-int
-event_store_from_file(char *filename)
-{
-       struct event_store *es;
-       FILE *event_file;
-       char *event_s, *job_id_s = NULL;
-       int ret;
-#if defined(IL_NOTIFICATIONS)
-       edg_wll_Event *notif_event;
-       edg_wll_Context context;
-       char *dest_name = NULL;
-
-       edg_wll_InitContext(&context);
-#endif
-       
-       il_log(LOG_INFO, "  attaching to event file: %s\n", filename);
-       
-       event_file = fopen(filename, "r");
-       if(event_file == NULL) {
-               set_error(IL_SYS, errno, "event_store_from_file: error opening event file");
-               return(-1);
-       }
-       event_s = read_event_string(event_file);
-       fclose(event_file);
-       if(event_s == NULL) 
-               return(0);
-       
-#if defined(IL_NOTIFICATIONS)
-       if((ret=edg_wll_ParseNotifEvent(context, event_s, &notif_event))) {
-               set_error(IL_LBAPI, ret, "event_store_from_file: could not parse event");
-               ret = -1;
-               goto out;
-       }
-       if(notif_event->notification.notifId == NULL) {
-               set_error(IL_LBAPI, EDG_WLL_ERROR_PARSE_BROKEN_ULM, 
-                         "event_store_from_file: parse error - no notif id");
-               ret = -1;
-               goto out;
-       }
-       if((job_id_s = edg_wll_NotifIdUnparse(notif_event->notification.notifId)) == NULL) {
-               set_error(IL_SYS, ENOMEM, "event_store_from_file: could not copy id");
-               ret = -1;
-               goto out;
-       }
-       if(notif_event->notification.dest_host && 
-          (strlen(notif_event->notification.dest_host) > 0)) {
-               asprintf(&dest_name, "%s:%d", notif_event->notification.dest_host, notif_event->notification.dest_port);
-       }
-       
-#else
-       job_id_s = edg_wll_GetJobId(event_s);
-#endif
-       il_log(LOG_DEBUG, "  event id: '%s'\n", job_id_s);
-       if(job_id_s == NULL) {
-               il_log(LOG_NOTICE, "  skipping file, could not parse event\n");
-               ret = 0;
-               goto out;
-       }
-       
-       es=event_store_find(job_id_s);
-       
-       if(es == NULL) {
-               ret = -1;
-               goto out;
-       }
-
-#if defined(IL_NOTIFICATIONS)
-       es->dest = dest_name;
-#endif
-
-       if((es->last_committed_ls == 0) &&
-          (es->last_committed_bs == 0) &&
-          (es->offset == 0)) {
-               ret = event_store_read_ctl(es);
-       } else 
-               ret = 0;
-       
-       event_store_release(es);
-
-out:
-#if defined(IL_NOTIFICATIONS)
-       if(notif_event) {
-               edg_wll_FreeEvent(notif_event);
-               free(notif_event);
-       }
-#endif
-       if(event_s) free(event_s); 
-       if(job_id_s) free(job_id_s);
-       return(ret);
-}
-
-
-int
-event_store_init(char *prefix)
-{
-  if(file_prefix == NULL) {
-    file_prefix = strdup(prefix);
-    store_list = NULL;
-  }
-
-  /* read directory and get a list of event files */
-  {
-    int len;
-
-    char *p, *dir;
-    DIR *event_dir;
-    struct dirent *entry;
-
-
-    /* get directory name */
-    p = strrchr(file_prefix, '/');
-    if(p == NULL) {
-      dir = strdup(".");
-      p = "";
-      len = 0;
-    } else {
-      *p = '\0';
-      dir = strdup(file_prefix);
-      *p++ = '/';
-      len = strlen(p);
-    }
-
-    event_dir = opendir(dir);
-    if(event_dir == NULL) {
-      free(dir);
-      set_error(IL_SYS, errno, "event_store_init: error opening event directory");
-      return(-1);
-    }
-    
-    while((entry=readdir(event_dir))) {
-      char *s;
-
-      /* skip all files that do not match prefix */
-      if(strncmp(entry->d_name, p, len) != 0) 
-       continue;
-
-      /* skip all control files */
-      if((s=strstr(entry->d_name, ".ctl")) != NULL &&
-        s[4] == '\0')
-       continue;
-
-      s = malloc(strlen(dir) + strlen(entry->d_name) + 2);
-      if(s == NULL) {
-       free(dir);
-       set_error(IL_NOMEM, ENOMEM, "event_store_init: no room for file name");
-       return(-1);
-      }
-
-      *s = '\0';
-      strcat(s, dir);
-      strcat(s, "/");
-      strcat(s, entry->d_name);
-
-      if(event_store_from_file(s) < 0) {
-       free(dir);
-       free(s);
-       closedir(event_dir);
-       return(-1);
-      }
-
-      free(s);
-    }
-    closedir(event_dir);
-    free(dir);
-  }
-
-  return(0);
-}
-
-
-int
-event_store_recover_all()
-{
-  struct event_store_list *sl;
-
-
-  if(pthread_rwlock_rdlock(&store_list_lock)) 
-         abort();
-
-  /* recover all event stores */
-  sl = store_list;
-  while(sl != NULL) {
-
-         /* recover this event store */
-         /* no need to lock use_lock in event_store, the store_list_lock is in place */
-         if(event_store_recover(sl->es) < 0) {
-                 il_log(LOG_ERR, "  error recovering event store %s:\n    %s\n", sl->es->event_file_name, error_get_msg());
-                 clear_error();
-         }
-         sl = sl->next;
-  }
-  
-  if(pthread_rwlock_unlock(&store_list_lock)) 
-         abort();
-
-  return(0);
-}
-
-
-#if 0 
-int
-event_store_remove(struct event_store *es)
-{
-  struct event_store_list *p, **q;
-
-  assert(es != NULL);
-
-  switch(event_store_clean(es)) {
-  case 0:
-    il_log(LOG_DEBUG, "  event store not removed, still used\n");
-    return(0);
-    
-  case 1:
-    if(pthread_rwlock_wrlock(&store_list_lock) < 0) {
-      set_error(IL_SYS, errno, "  event_store_remove: error locking event store list");
-      return(-1);
-    }
-
-    p = store_list;
-    q = &store_list;
-
-    while(p) {
-      if(p->es == es) {
-       (*q) = p->next;
-       event_store_free(es);
-       free(p);
-       break;
-      }
-      q = &(p->next);
-      p = p->next;
-    }
-
-    if(pthread_rwlock_unlock(&store_list_lock) < 0) {
-      set_error(IL_SYS, errno, "  event_store_remove: error unlocking event store list");
-      return(-1);
-    }
-    return(1);
-
-  default:
-    return(-1);
-  }
-  /* not reached */
-  return(0);
-}
-#endif
-
-int
-event_store_cleanup()
-{
-  struct event_store_list *sl;
-  struct event_store_list *slnext;
-  struct event_store_list **prev;
-
-  /* try to remove event files */
-
-  if(pthread_rwlock_wrlock(&store_list_lock)) 
-         abort();
-
-  sl = store_list;
-  prev = &store_list;
-
-  while(sl != NULL) {
-         int ret;
-
-         slnext = sl->next;
-         
-         /* one event store at time */
-         ret = pthread_rwlock_trywrlock(&sl->es->use_lock);
-         if(ret == EBUSY) {
-                 il_log(LOG_DEBUG, "  event_store %s is in use by another thread\n", 
-                        sl->es->job_id_s);
-                 sl = slnext;
-                 continue;
-         } else if (ret < 0)
-           abort();
-
-         switch(event_store_clean(sl->es)) {
-                 
-         case 1:
-                 /* remove this event store */
-                 (*prev) = slnext;
-                 event_store_free(sl->es);
-                 free(sl);
-                 break;
-                 
-         case -1:
-                 il_log(LOG_ERR, "  error removing event store %s (file %s):\n    %s\n", 
-                        sl->es->job_id_s, sl->es->event_file_name, error_get_msg());
-                 event_store_release(sl->es);
-                 clear_error();
-                 /* go on to the next */
-                 
-         default:
-                 event_store_release(sl->es);
-                 prev = &(sl->next);
-                 break;
-         }
-         
-         sl = slnext;
-  }
-  
-  if(pthread_rwlock_unlock(&store_list_lock)) 
-         abort();
-  
-  return(0);
-}
-
diff --git a/org.glite.lb.logger/src/il_error.c b/org.glite.lb.logger/src/il_error.c

deleted file mode 100644 (file)

index 6a9083a..0000000
--- a/org.glite.lb.logger/src/il_error.c
+++ /dev/null
@@ -1,184 +0,0 @@
-#ident "$Header$"
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <netdb.h>
-#include <assert.h>
-#include <pthread.h>
-#include <stdlib.h>
-
-/* XXX DK: */
-#include <err.h> // SSL header file 
-
-#include "glite/lb/lb_gss.h"
-
-#include "il_error.h"
-
-
-extern int log_level;
-
-static pthread_key_t err_key;
-
-static int IL_ERR_MSG_LEN = 128;
-
-static
-void
-error_key_delete(void *err)
-{
-  free(err);
-}
-
-static 
-void
-error_key_create()
-{
-  pthread_key_create(&err_key, error_key_delete);
-}
-
-static 
-struct error_inf *
-error_get_err ()
-{
-  struct error_inf *err;
-
-  /* get thread specific error structure */
-  err = (struct error_inf *)pthread_getspecific(err_key);
-  assert(err != NULL);
-
-  return(err);
-}
-
-int
-init_errors(int level)
-{
-  static pthread_once_t error_once = PTHREAD_ONCE_INIT;
-  struct error_inf *err;
-
-  /* create the key for thread specific error only once */
-  pthread_once(&error_once, error_key_create);
-  
-  /* there is no thread error yet, try to create one */
-  if((err = (struct error_inf *)malloc(sizeof(*err)))) {
-    /* allocation successfull, make it thread specific data */
-    if(pthread_setspecific(err_key, err)) {
-       free(err);
-       return(-1);
-    }
-  } else 
-    return(-1);
-
-  err->code_maj = 0;
-  err->code_min = 0;
-  err->msg = malloc(IL_ERR_MSG_LEN + 1);
-  if(err->msg == NULL) 
-         return(-1);
-
-  if(level)
-    log_level = level;
-
-  return(0);
-}
-
-int 
-set_error(int code, long minor, char *msg)
-{
-  struct error_inf *err;
-
-  err = error_get_err();
-
-  err->code_maj = code;
-  err->code_min = minor;
-
-  switch(code) {
-
-  case IL_SYS:
-    snprintf(err->msg, IL_ERR_MSG_LEN, "%s: %s", msg, strerror(err->code_min));
-    break;
-
-  case IL_HOST:
-    snprintf(err->msg, IL_ERR_MSG_LEN, "%s: %s", msg, hstrerror(err->code_min));
-    break;
-
-  /* XXX DK: je tahle hodnota k necemu potreba? */
-  case IL_AUTH:
-    snprintf(err->msg, IL_ERR_MSG_LEN, "%s: %s", msg, ERR_error_string(err->code_min, NULL));
-    break;
-
-  case IL_DGGSS:
-    switch(err->code_min) {
-
-    case EDG_WLL_GSS_ERROR_GSS:
-      snprintf(err->msg, IL_ERR_MSG_LEN, "%s", msg);
-      break;
-
-    case EDG_WLL_GSS_ERROR_TIMEOUT:
-      snprintf(err->msg, IL_ERR_MSG_LEN, "%s: Timeout in GSS connection.", msg);
-      break;
-
-    case EDG_WLL_GSS_ERROR_EOF:
-      snprintf(err->msg, IL_ERR_MSG_LEN, "%s: Connection lost.", msg);
-      break;
-
-    case EDG_WLL_GSS_ERROR_ERRNO:
-      snprintf(err->msg, IL_ERR_MSG_LEN, "%s: %s", msg, strerror(errno));
-      break;
-      
-    case EDG_WLL_GSS_ERROR_HERRNO:
-      snprintf(err->msg, IL_ERR_MSG_LEN, "%s: %s", msg, hstrerror(errno));
-      break;
-    }
-
-  default:
-         strncpy(err->msg, msg, IL_ERR_MSG_LEN);
-  }
-
-  return(code);
-}
-
-
-int 
-clear_error() {
-  struct error_inf *err;
-
-  err = error_get_err();
-
-  err->code_maj = IL_OK;
-  err->code_min = 0;
-  *(err->msg) = 0;
-
-  return(0);
-} 
-
-
-int
-error_get_maj()
-{
-  struct error_inf *err;
-
-  err = error_get_err();
-
-  return(err->code_maj);
-}
-
-
-long
-error_get_min()
-{
-  struct error_inf *err;
-
-  err = error_get_err();
-
-  return(err->code_min);
-}
-
-
-char * 
-error_get_msg()
-{
-  struct error_inf *err;
-
-  err = error_get_err();
-
-  return(err->msg);
-}
diff --git a/org.glite.lb.logger/src/il_error.h b/org.glite.lb.logger/src/il_error.h

deleted file mode 100644 (file)

index 120e7ed..0000000
--- a/org.glite.lb.logger/src/il_error.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef IL_ERROR_H
-#define IL_ERROR_H
-
-#ident "$Header$"
-
-#include <syslog.h>
-
-enum err_code_maj { /* minor =                   */
-  IL_OK,            /*     0                     */
-  IL_SYS,           /*     errno                 */
-  IL_NOMEM,         /*     ENOMEM                */
-  IL_AUTH,          /*     0 (SSL error)         */
-  IL_PROTO,         /*     LB_*                  */
-  IL_LBAPI,         /*     dgLBErrCode           */
-  IL_DGGSS,         /*     EDG_WLL_GSS_*         */
-  IL_HOST           /*     h_errno               */
-};
-
-struct error_inf {
-  int  code_maj;
-  long code_min;
-  char *msg;
-};
-
-int init_errors(int);
-int set_error(int, long, char *);
-int clear_error();
-int error_get_maj();
-long error_get_min();
-char *error_get_msg();
-
-int il_log(int, char *, ...);
-
-#endif
diff --git a/org.glite.lb.logger/src/il_master.c b/org.glite.lb.logger/src/il_master.c

deleted file mode 100644 (file)

index f6414c9..0000000
--- a/org.glite.lb.logger/src/il_master.c
+++ /dev/null
@@ -1,419 +0,0 @@
-#ident "$Header$"
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/context.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/il_string.h"
-
-#include "interlogd.h"
-
-int 
-enqueue_msg(struct event_queue *eq, struct server_msg *msg)
-{
-#if defined(IL_NOTIFICATIONS)
-       struct event_queue *eq_known;
-
-       /* now we have a new event with possibly changed destination,
-          so check for the already known destination and possibly move 
-          events from the original output queue to a new one */
-       eq_known = notifid_map_get_dest(msg->job_id_s);
-       if(eq != eq_known) {
-               /* client has changed delivery address for this notification */
-               if(notifid_map_set_dest(msg->job_id_s, eq) < 0) 
-                       return(-1);
-               /* move all events with this notif_id from eq_known to eq */
-               if(eq_known != NULL) 
-                       event_queue_move_events(eq_known, eq, msg->job_id_s);
-       }
-#endif
-
-       /* fire thread to take care of this queue */
-       if(event_queue_create_thread(eq) < 0) 
-               return(-1);
-       
-#if defined(IL_NOTIFICATIONS)
-       /* if there are no data to send, do not send anything 
-          (messsage was just to change the delivery address) */
-       if(msg->len == 0) 
-               return(0);
-
-#endif
-       /* avoid losing signal to thread */
-       event_queue_cond_lock(eq);
-
-       /* insert new event */
-       if(event_queue_insert(eq, msg) < 0)
-               return(-1);
-      
-       /* signal thread that we have a new message */
-       event_queue_signal(eq);
-
-       /* allow thread to continue */
-       event_queue_cond_unlock(eq);
-
-       return(0);
-}
-
-
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-pthread_mutex_t flush_lock = PTHREAD_MUTEX_INITIALIZER;
-pthread_cond_t flush_cond = PTHREAD_COND_INITIALIZER;
-#endif /* INTERLOGD_FLUSH */
-
-#ifdef INTERLOGD_HANDLE_CMD
-static 
-int
-parse_cmd(char *event, char **job_id_s, long *receipt, int *timeout)
-{
-       char *token, *r;
-       int ret;
-
-       if(strstr(event, "DG.TYPE=\"command\"") == NULL)
-               return(-1);
-
-       *job_id_s = NULL;
-       *timeout = 0;
-       *receipt = 0;
-       ret = 0;
-
-       for(token = strtok(event, " "); token != NULL; token = strtok(NULL, " ")) {
-               r = index(token, '=');
-               if(r == NULL) {
-                       ret = -1;
-                       continue;
-               }
-               if(strncmp(token, "DG.COMMAND", r - token) == 0) {
-#if defined(INTERLOGD_FLUSH)                   
-                       if(strcmp(++r, "\"flush\"")) {
-#endif
-                               il_log(LOG_WARNING, "  command %s not implemented\n", r);
-                               ret = -1;
-                               continue;
-#if defined(INTERLOGD_FLUSH)
-                       }
-#endif
-               } else if(strncmp(token, "DG.JOBID", r - token) == 0) {
-                       char  *p;
-      
-                       r += 2; /* skip =" */
-                       p = index(r, '"');
-                       if(p == NULL) { ret = -1; continue; }
-                       *job_id_s = strndup(r, p-r);
-
-               } else if(strncmp(token, "DG.TIMEOUT", r - token) == 0) {
-                       sscanf(++r, "\"%d\"", timeout);
-               } else if(strncmp(token, "DG.LLLID", r - token) == 0) {
-                       sscanf(++r, "%ld", receipt);
-               }
-    
-       }
-       return(0);
-}
-
-
-/* return value:
- *   0 - not command
- *   1 - success
- *  -1 - failure
- */
-
-static 
-int 
-handle_cmd(char *event, long offset)
-{
-       char *job_id_s;
-       struct event_queue *eq;
-       int  num_replies, num_threads = 0;
-       int  timeout, result;
-       long receipt;
-       struct timespec endtime;
-       struct timeval  tv;
-
-       /* parse command */
-       if(parse_cmd(event, &job_id_s, &receipt, &timeout) < 0) 
-               return(0);
-
-#if defined(INTERLOGD_FLUSH)
-       il_log(LOG_DEBUG, "  received FLUSH command\n");
-
-       /* catchup with all neccessary event files */
-       if(job_id_s) {
-               struct event_store *es = event_store_find(job_id_s);
-
-               if(es == NULL) {
-                       goto cmd_error;
-               }
-               result = event_store_recover(es);
-               /* NOTE: if flush had been stored in file, there would have been
-                  no need to lock the event_store at all */
-               event_store_release(es);
-               if(result < 0) {
-                       il_log(LOG_ERR, "  error trying to catch up with event file: %s\n",
-                              error_get_msg());
-                       clear_error();
-               }
-       } else 
-         /* this call does not fail :-) */
-         event_store_recover_all();
-
-       il_log(LOG_DEBUG, "  alerting threads to report status\n");
-
-       /* prevent threads from reporting too early */
-       if(pthread_mutex_lock(&flush_lock) < 0) {
-               /*** this error is considered too serious to allow the program run anymore!
-                    set_error(IL_SYS, errno, "pthread_mutex_lock: error locking flush lock");
-                    goto cmd_error;
-               */
-               abort();
-       }
-
-       /* wake up all threads */
-       if(job_id_s) {
-               /* find appropriate queue */
-               eq = queue_list_get(job_id_s);
-               if(eq == NULL) goto cmd_error;
-               if(!event_queue_empty(eq) && !queue_list_is_log(eq)) {
-                       num_threads++;
-                       event_queue_cond_lock(eq);
-                       eq->flushing = 1;
-                       event_queue_wakeup(eq);
-                       event_queue_cond_unlock(eq);
-               }
-       } else {
-               /* iterate over event queues */
-               for(eq=queue_list_first(); eq != NULL; eq=queue_list_next()) {
-                       if(!event_queue_empty(eq) && !queue_list_is_log(eq)) {
-                               num_threads++;
-                               event_queue_cond_lock(eq);
-                               eq->flushing = 1;
-                               event_queue_wakeup(eq);
-                               event_queue_cond_unlock(eq);
-                       }
-               }
-       }
-       if(!bs_only) {
-               eq = queue_list_get(NULL);
-               if(eq == NULL) goto cmd_error;
-               if(!event_queue_empty(eq)) {
-                       num_threads++;
-                       event_queue_cond_lock(eq);
-                       eq->flushing = 1;
-                       event_queue_wakeup(eq);
-                       event_queue_cond_unlock(eq);
-               }
-       }
-
-       /* wait for thread replies */
-       num_replies = 0;
-       result = 1;
-       gettimeofday(&tv, NULL);
-       endtime.tv_sec = tv.tv_sec + timeout;
-       endtime.tv_nsec = 1000 * tv.tv_usec;
-       while(num_replies < num_threads) {
-               int ret;
-               if((ret=pthread_cond_timedwait(&flush_cond, &flush_lock, &endtime)) < 0) {
-                       il_log(LOG_ERR, "    error waiting for thread reply: %s\n", strerror(errno));
-                       result = (ret == ETIMEDOUT) ? 0 : -1;
-                       break;
-               }
-               
-               /* collect results from reporting threads */
-               if(job_id_s) {
-                       /* find appropriate queue */
-                       eq = queue_list_get(job_id_s);
-                       if(eq == NULL) goto cmd_error;
-                       if(!queue_list_is_log(eq)) {
-                               event_queue_cond_lock(eq);
-                               if(eq->flushing == 2) {
-                                       eq->flushing = 0;
-                                       num_replies++;
-                                       result = ((result == 1) || (eq->flush_result < 0))  ? 
-                                               eq->flush_result : result;
-                               }
-                               event_queue_cond_unlock(eq);
-                       }
-               } else {
-                       /* iterate over event queues */
-                       for(eq=queue_list_first(); eq != NULL; eq=queue_list_next()) {
-                               if(!queue_list_is_log(eq)) {
-                                       event_queue_cond_lock(eq);
-                                       if(eq->flushing == 2) {
-                                               eq->flushing = 0;
-                                               num_replies++;
-                                               il_log(LOG_DEBUG, "    thread reply: %d\n", eq->flush_result);
-                                               result = ((result == 1) || (eq->flush_result < 0))  ? 
-                                                       eq->flush_result : result;
-                                       }
-                                       event_queue_cond_unlock(eq);
-                               }
-                       }
-               }
-               if(!bs_only) {
-                       eq = queue_list_get(NULL);
-                       if(eq == NULL) goto cmd_error;
-                       event_queue_cond_lock(eq);
-                       if(eq->flushing == 2) {
-                               eq->flushing = 0;
-                               num_replies++;
-                               result = ((result == 1) || (eq->flush_result < 0))  ? 
-                                       eq->flush_result : result;
-                       }
-                       event_queue_cond_unlock(eq);
-               }
-       }
-
-       /* prevent deadlock in next flush */
-       if(pthread_mutex_unlock(&flush_lock) < 0) 
-               abort();
-
-
-       /* report back to local logger */
-       switch(result) {
-       case 1:
-               result = 0; break;
-       case 0:
-               result = EDG_WLL_IL_EVENTS_WAITING; break;
-       default:
-               result = EDG_WLL_IL_SYS; break;
-       }
-       if(job_id_s) free(job_id_s);
-       result = send_confirmation(receipt, result);
-       if(result <= 0) 
-               il_log(LOG_ERR, "handle_cmd: error sending status: %s\n", error_get_msg());
-       return(1);
-
-
-cmd_error:
-       if(job_id_s) free(job_id_s);
-       return(-1);
-#else
-       return(0);
-#endif /* INTERLOGD_FLUSH */
-}
-#endif /* INTERLOGD_HANDLE_CMD */
-
-
-static 
-int
-handle_msg(char *event, long offset)
-{ 
-       struct server_msg *msg = NULL;
-#if !defined(IL_NOTIFICATIONS)
-       struct event_queue *eq_l;
-#endif
-       struct event_queue *eq_s;
-       struct event_store *es;
-
-       int ret;
-
-       /* convert event to message for server */
-       if((msg = server_msg_create(event, offset)) == NULL) {
-               il_log(LOG_ERR, "    handle_msg: error parsing event '%s':\n      %s\n", event, error_get_msg());
-               return(0);
-       }
-  
-       /* sync event store with IPC (if neccessary)
-        * This MUST be called before inserting event into output queue! */
-       if((es = event_store_find(msg->job_id_s)) == NULL) 
-               return(-1);
-       msg->es = es;
-
-       ret = event_store_sync(es, offset);
-       il_log(LOG_DEBUG, "  syncing event store at %d with event at %d, result %d\n", es->offset, offset, ret);
-       if(ret < 0) {
-               il_log(LOG_ERR, "    handle_msg: error syncing event store:\n      %s\n", error_get_msg());
-               event_store_release(es);
-               return(0);
-       } else if(ret == 0) {
-               /* we have seen this event already */
-               server_msg_free(msg);
-               event_store_release(es);
-               return(1);
-       }
-
-       /* find apropriate queue for this event */
-#if defined(IL_NOTIFICATIONS)
-       eq_s = queue_list_get(msg->dest);
-#else
-       eq_s = queue_list_get(msg->job_id_s);
-#endif
-       if(eq_s == NULL) { 
-               il_log(LOG_ERR, "    handle_msg: apropriate queue not found: %s\n", error_get_msg());
-               clear_error();
-       } else {
-               if(enqueue_msg(eq_s, msg) < 0)
-                       goto err;
-       }
-
-#if !defined(IL_NOTIFICATIONS)
-       eq_l = queue_list_get(NULL);
-       if(!bs_only && eq_l != eq_s) {
-               /* send to default queue (logging server) as well */
-               if(enqueue_msg(eq_l, msg) < 0)
-                       goto err;
-       }
-#endif
-
-       /* if there was no error, set the next expected event offset */
-       event_store_next(es, msg->ev_len);
-       /* allow cleanup thread to check on this event_store */
-       event_store_release(es);
-
-       /* free the message */
-       server_msg_free(msg);
-       return(1);
-
-err:
-       event_store_release(es);
-       server_msg_free(msg);
-       return(-1);
-}
-
-
-
-int 
-loop()
-{
-       /* receive events */
-       while(1) {
-               char *msg;
-               long offset;
-               int ret;
-    
-               clear_error();
-               if((ret = input_queue_get(&msg, &offset, INPUT_TIMEOUT)) < 0) 
-               {
-                       if(error_get_maj() == IL_PROTO) {
-                               il_log(LOG_DEBUG, "  premature EOF while receiving event\n");
-                               /* problems with socket input, try to catch up from files */
-                               event_store_recover_all();
-                               continue;
-                       } else 
-                               return(-1);
-               }
-               else if(ret == 0) {
-                       continue;
-               }
-
-#ifdef INTERLOGD_HANDLE_CMD            
-               ret = handle_cmd(msg, offset);
-               if(ret == 0)
-#endif
-                       ret = handle_msg(msg, offset);
-               free(msg);
-               if(ret < 0)
-                       switch (error_get_maj()) {
-                               case IL_SYS:
-                               case IL_NOMEM:
-                                       return (ret);
-                                       break;
-                               default: 
-                                       il_log(LOG_ERR, "Error: %s\n", error_get_msg());
-                                       break;
-                       }
-       } /* while */
-}
diff --git a/org.glite.lb.logger/src/input_queue_socket.c b/org.glite.lb.logger/src/input_queue_socket.c

deleted file mode 100644 (file)

index f183319..0000000
--- a/org.glite.lb.logger/src/input_queue_socket.c
+++ /dev/null
@@ -1,207 +0,0 @@
-#ident "$Header$"
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-
-#include "interlogd.h"
-
-
-static const int   SOCK_QUEUE_MAX = 50;
-extern char *socket_path;
-
-static int sock;
-static int accepted;
-
-int 
-input_queue_attach()
-{ 
-  struct sockaddr_un saddr;
-
-  if((sock=socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-    set_error(IL_SYS, errno, "input_queue_attach: error creating socket");
-    return(-1);
-  }
-
-  memset(&saddr, 0, sizeof(saddr));
-  saddr.sun_family = AF_UNIX;
-  strcpy(saddr.sun_path, socket_path);
-
-  /* test for the presence of the socket and another instance 
-     of interlogger listening */
-  if(connect(sock, (struct sockaddr *)&saddr, sizeof(saddr.sun_path)) < 0) {
-         if(errno == ECONNREFUSED) {
-                 /* socket present, but no one at the other end; remove it */
-                 il_log(LOG_WARNING, "  removing stale input socket %s\n", socket_path);
-                 unlink(socket_path);
-         }
-         /* ignore other errors for now */
-  } else {
-         /* connection was successful, so bail out - there is 
-            another interlogger running */
-         set_error(IL_SYS, EADDRINUSE, "input_queue_attach: another instance of interlogger is running");
-         return(-1);
-  }
-  
-  if(bind(sock, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) {
-    set_error(IL_SYS, errno, "input_queue_attach: error binding socket");
-    return(-1);
-  }
-
-  if (listen(sock, SOCK_QUEUE_MAX)) {
-    set_error(IL_SYS, errno, "input_queue_attach: error listening on socket");
-    return -1;
-  }
-
-  return(0);
-}
-
-void input_queue_detach()
-{
-  if (sock >= 0)
-    close(sock);
-  unlink(socket_path);
-}
-
-
-static
-char *
-read_event(int sock, long *offset)
-{
-  char *buffer, *p, *n;
-  int  len, alen;
-  char buf[256];
-
-  /* receive offset */
-  len = recv(sock, offset, sizeof(*offset), MSG_NOSIGNAL);
-  if(len < sizeof(*offset)) {
-    set_error(IL_PROTO, errno, "read_event: error reading offset");
-    return(NULL);
-  }
-  
-  /* receive event string */
-  buffer=malloc(1024);
-  if(buffer == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "read_event: no room for event");
-    return(NULL);
-  }
-  p = buffer;
-
-  alen = 1024;
-  while((len=recv(sock, buf, sizeof(buf), MSG_PEEK | MSG_NOSIGNAL)) > 0) {
-    int i;
-
-    /* we have to be prepared for sizeof(buf) bytes */
-    if(alen - (p - buffer) < (int)sizeof(buf)) {
-      alen += 8192;
-      n = realloc(buffer, alen);
-      if(n == NULL) {
-       free(buffer);
-       set_error(IL_NOMEM, ENOMEM, "read_event: no room for event");
-       return(NULL);
-      }
-      p = p - buffer + n;
-      buffer = n;
-    }
-
-    /* copy all relevant bytes from buffer */
-    for(i=0; (i < len) && (buf[i] != EVENT_SEPARATOR); i++) 
-      *p++ = buf[i];
-
-    /* remove the data from queue */
-    if(i > 0) 
-      if(recv(sock, buf, i, MSG_NOSIGNAL) != i) {
-       set_error(IL_SYS, errno, "read_event: error reading data");
-       free(buffer);
-       return(NULL);
-      }
-    if(i < len)
-      /* the event is complete */
-      break;
-  }
-
-  /* terminate buffer */
-  *p = 0;
-
-  if(len < 0) {
-    set_error(IL_SYS, errno, "read_event: error reading data");
-    free(buffer);
-    return(NULL);
-  }
-
-  /* if len == 0, we have not encountered EVENT_SEPARATOR and thus the event is not complete */
-  if(len == 0) {
-    set_error(IL_PROTO, errno, "read_event: error reading data - premature EOF");
-    free(buffer);
-    return(NULL);
-  }
-
-  /* this is probably not necessary at all:
-     either len <=0, which was covered before,
-     or 0 <= i < len => p > buffer;
-     I would say this condition can not be satisfied.
-  */
-  if(p == buffer) {
-    set_error(IL_PROTO, errno, "read_event: error reading data - no data received");
-    free(buffer);
-    return(NULL);
-  }
-
-  return(buffer);
-}
-
-
-/*
- * Returns: -1 on error, 0 if no message available, message length otherwise
- *
- */
-int
-input_queue_get(char **buffer, long *offset, int timeout)
-{
-  fd_set fds;
-  struct timeval tv;
-  int msg_len;
-
-  assert(buffer != NULL);
-
-  FD_ZERO(&fds);
-  FD_SET(sock, &fds);
-  
-  tv.tv_sec = timeout;
-  tv.tv_usec = 0;
-  
-  msg_len = select(sock + 1, &fds, NULL, NULL, timeout >= 0 ? &tv : NULL);
-  switch(msg_len) {
-     
-  case 0: /* timeout */
-    return(0);
-    
-  case -1: /* error */
-    set_error(IL_SYS, errno, "input_queue_get: error waiting for event");
-    return(-1);
-    
-  default:
-    break;
-  }
-  
-  if((accepted=accept(sock, NULL, NULL)) < 0) {
-    set_error(IL_SYS, errno, "input_queue_get: error accepting connection");
-    return(-1);
-  }
-
-  *buffer = read_event(accepted, offset);
-  close(accepted);
-
-  if(*buffer == NULL) {
-    if(error_get_maj() != IL_OK)
-      return(-1);
-    else
-      return(0);
-  }
-    
-  return(strlen(*buffer));
-}
diff --git a/org.glite.lb.logger/src/interlogd.c b/org.glite.lb.logger/src/interlogd.c

deleted file mode 100644 (file)

index dba2f0d..0000000
--- a/org.glite.lb.logger/src/interlogd.c
+++ /dev/null
@@ -1,279 +0,0 @@
-#ident "$Header$"
-
-/*
-   interlogger - collect events from local-logger and send them to logging and bookkeeping servers
-
-*/
-#include <getopt.h>
-#include <string.h>
-#include <signal.h>
-#include <pthread.h>
-
-#include <globus_common.h>
-
-#include "interlogd.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/lb_gss.h"
-
-#define EXIT_FAILURE 1
-#if defined(IL_NOTIFICATIONS)
-#define DEFAULT_PREFIX "/tmp/notif_events"
-#define DEFAULT_SOCKET "/tmp/notif_interlogger.sock"
-#else
-#define DEFAULT_PREFIX "/tmp/dglogd.log"
-#define DEFAULT_SOCKET "/tmp/interlogger.sock"
-#endif
-
-
-/* The name the program was run with, stripped of any leading path. */
-char *program_name;
-static int killflg = 0;
-
-int TIMEOUT = DEFAULT_TIMEOUT;
-
-gss_cred_id_t cred_handle = GSS_C_NO_CREDENTIAL;
-pthread_mutex_t cred_handle_lock = PTHREAD_MUTEX_INITIALIZER;
-
-time_t key_mtime = 0, cert_mtime = 0;
-
-static void usage (int status)
-{
-       printf("%s - \n"
-              "  collect events from local-logger and send them to logging and bookkeeping servers\n"
-              "Usage: %s [OPTION]... [FILE]...\n"
-              "Options:\n"
-              "  -h, --help                 display this help and exit\n"
-              "  -V, --version              output version information and exit\n"
-              "  -d, --debug                do not run as daemon\n"
-              "  -v, --verbose              print extensive debug output\n"
-              "  -f, --file-prefix <prefix> path and prefix for event files\n"
-              "  -c, --cert <file>          location of server certificate\n"
-              "  -k, --key  <file>          location of server private key\n"
-              "  -C, --CAdir <dir>          directory containing CA certificates\n"
-              "  -b, --book                 send events to bookkeeping server only\n"
-              "  -l, --log-server <host>    specify address of log server\n"
-              "  -s, --socket <path>        non-default path of local socket\n"
-              , program_name, program_name);
-       exit(status);
-}
-
-
-/* Option flags and variables */
-static int debug;
-static int verbose = 0;
-char *file_prefix = DEFAULT_PREFIX;
-int bs_only = 0;
-
-char *cert_file = NULL;
-char *key_file  = NULL;
-char *CAcert_dir = NULL;
-char *log_server = NULL;
-char *socket_path = DEFAULT_SOCKET;
-
-static struct option const long_options[] =
-{
-  {"help", no_argument, 0, 'h'},
-  {"version", no_argument, 0, 'V'},
-  {"verbose", no_argument, 0, 'v'},
-  {"debug", no_argument, 0, 'd'},
-  {"file-prefix", required_argument, 0, 'f'},
-  {"cert", required_argument, 0, 'c'},
-  {"key", required_argument, 0, 'k'},
-  {"book", no_argument, 0, 'b'},
-  {"CAdir", required_argument, 0, 'C'},
-  {"log-server", required_argument, 0, 'l'},
-  {"socket", required_argument, 0, 's'},
-  {NULL, 0, NULL, 0}
-};
-
-
-
-/* Set all the option flags according to the switches specified.
-   Return the index of the first non-option argument.  */
-static int
-decode_switches (int argc, char **argv)
-{
-  int c;
-
-  debug = 0;
-
-  while ((c = getopt_long (argc, argv,
-                          "f:"  /* file prefix */
-                          "h"  /* help */
-                          "V"  /* version */
-                          "v"  /* verbose */
-                          "c:"          /* certificate */
-                          "k:"          /* key */
-                          "C:"          /* CA dir */
-                          "b"  /* only bookeeping */
-                           "l:" /* log server */
-                          "d" /* debug */
-                          "s:", /* socket */
-                          long_options, (int *) 0)) != EOF)
-    {
-      switch (c)
-       {
-       case 'V':
-         printf ("interlogger %s\n", VERSION);
-         exit (0);
-
-       case 'v':
-         verbose = 1;
-         break;
-
-       case 'h':
-         usage (0);
-
-       case 'd':
-         debug = 1;
-         break;
-
-       case 'f':
-         file_prefix = strdup(optarg);
-         break;
-
-       case 'c':
-         cert_file = strdup(optarg);
-         break;
-
-       case 'k':
-         key_file = strdup(optarg);
-         break;
-
-       case 'b':
-         bs_only = 1;
-         break;
-
-       case 'l':
-         log_server = strdup(optarg);
-         break;
-
-       case 'C':
-         CAcert_dir = strdup(optarg);
-         break;
-
-       case 's':
-         socket_path = strdup(optarg);
-         break;
-
-       default:
-         usage (EXIT_FAILURE);
-       }
-    }
-
-  return optind;
-}
-
-
-void handle_signal(int num) {
-    il_log(LOG_DEBUG, "Received signal %d\n", num);
-    killflg++;
-}
-
-int
-main (int argc, char **argv)
-{
-  int i;
-  char *p;
-  edg_wll_GssStatus gss_stat;
-  int ret;
-
-  program_name = argv[0];
-
-  setlinebuf(stdout);
-  setlinebuf(stderr);
-
-  i = decode_switches (argc, argv);
-
-  if ((p = getenv("EDG_WL_INTERLOG_TIMEOUT"))) TIMEOUT = atoi(p);
-
-  /* force -b if we do not have log server */
-  if(log_server == NULL) {
-    log_server = strdup(DEFAULT_LOG_SERVER);
-    bs_only = 1;
-  }
-
-  if(init_errors(verbose ? LOG_DEBUG : LOG_WARNING)) {
-    fprintf(stderr, "Failed to initialize error message subsys. Exiting.\n");
-    exit(EXIT_FAILURE);
-  }
-
-  if (signal(SIGPIPE, handle_signal) == SIG_ERR
-      || signal(SIGABRT, handle_signal) == SIG_ERR
-      || signal(SIGTERM, handle_signal) == SIG_ERR
-      || signal(SIGINT, handle_signal) == SIG_ERR) {
-    perror("signal");
-    exit(EXIT_FAILURE);
-  }
-
-  il_log(LOG_INFO, "Initializing input queue...\n");
-  if(input_queue_attach() < 0) {
-    il_log(LOG_CRIT, "Failed to initialize input queue: %s\n", error_get_msg());
-    exit(EXIT_FAILURE);
-  }
-
-  /* initialize output queues */
-  il_log(LOG_INFO, "Initializing event queues...\n");
-  if(queue_list_init(log_server) < 0) {
-    il_log(LOG_CRIT, "Failed to initialize output event queues: %s\n", error_get_msg());
-    exit(EXIT_FAILURE);
-  }
-
-  if (CAcert_dir)
-     setenv("X509_CERT_DIR", CAcert_dir, 1);
-
-  edg_wll_gss_watch_creds(cert_file,&cert_mtime);
-  ret = edg_wll_gss_acquire_cred_gsi(cert_file, key_file, &cred_handle, NULL, &gss_stat);
-  if (ret) {
-     char *gss_err = NULL;
-     char *str;
-
-     if (ret == EDG_WLL_GSS_ERROR_GSS)
-       edg_wll_gss_get_error(&gss_stat, "edg_wll_gss_acquire_cred_gsi()", &gss_err);
-     asprintf(&str, "Failed to load GSI credential: %s\n",
-             (gss_err) ? gss_err : "edg_wll_gss_acquire_cred_gsi() failed"); 
-     il_log(LOG_CRIT, str);
-     free(str);
-     if (gss_err)
-       free(gss_err);
-     exit(EXIT_FAILURE);
-  }
-  
-  if(!debug &&
-     (daemon(0,0) < 0)) {
-    perror("daemon");
-    exit(EXIT_FAILURE);
-  }
-
-  if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS)  {
-       il_log(LOG_CRIT, "Failed to initialize Globus common module\n");
-       exit(EXIT_FAILURE);
-  }
-
-  /* find all unsent events waiting in files */
-  { 
-         pthread_t rid;
-
-         il_log(LOG_INFO, "Starting recovery thread...\n");
-         if(pthread_create(&rid, NULL, recover_thread, NULL) < 0) {
-                 il_log(LOG_CRIT, "Failed to start recovery thread: %s\n", strerror(errno));
-                 exit(EXIT_FAILURE);
-         }
-         pthread_detach(rid);
-  }
-
-  il_log(LOG_INFO, "Entering main loop...\n");
-
-  /* do the work */
-  if(loop() < 0) {
-    il_log(LOG_CRIT, "Fatal error: %s\n", error_get_msg());
-    if (killflg) {
-      input_queue_detach();
-      exit(EXIT_FAILURE);
-    }
-  }
-  il_log(LOG_INFO, "Done!\n");
-  input_queue_detach();
-
-  exit (0);
-}
diff --git a/org.glite.lb.logger/src/interlogd.h b/org.glite.lb.logger/src/interlogd.h

deleted file mode 100644 (file)

index 3c96828..0000000
--- a/org.glite.lb.logger/src/interlogd.h
+++ /dev/null
@@ -1,205 +0,0 @@
-#ifndef INTERLOGGER_P_H
-#define INTERLOGGER_P_H
-
-#ident "$Header$"
-
-#include "il_error.h"
-#include "glite/lb/lb_gss.h"
-
-#include <pthread.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>
-#ifdef HAVE_DMALLOC_H
-#include <dmalloc.h>
-#endif
-
-#define INTERLOGD_HANDLE_CMD
-#define INTERLOGD_FLUSH
-#define INTERLOGD_EMS
-
-#define DEFAULT_USER "michal"
-#define DEFAULT_LOG_SERVER "localhost"
-#define DEFAULT_TIMEOUT 60
-
-#if defined(IL_NOTIFICATIONS)
-
-#include "glite/lb/notifid.h"
-
-#undef INTERLOGD_HANDLE_CMD
-#undef INTERLOGD_FLUSH
-#undef INTERLOGD_EMS
-#define IL_EVENT_ID_T          edg_wll_NotifId
-#define IL_EVENT_GET_UNIQUE(a) edg_wll_NotifIdGetUnique((a))
-#define IL_EVENT_ID_FREE(a)    edg_wll_NotifIdFree((a))
-#define IL_EVENT_ID_PARSE(a,b) edg_wll_NotifIdParse((a),(b))
-
-#else
-
-#define INTERLOGD_HANDLE_CMD
-#define INTERLOGD_FLUSH
-#define INTERLOGD_EMS
-#define IL_EVENT_ID_T          edg_wlc_JobId
-#define IL_EVENT_GET_UNIQUE(a) edg_wlc_JobIdGetUnique((a))
-#define IL_EVENT_ID_FREE(a)    edg_wlc_JobIdFree((a))
-#define IL_EVENT_ID_PARSE(a,b) edg_wlc_JobIdParse((a),(b))
-
-#endif
-
-
-#define EVENT_SEPARATOR '\n'
-
-// #define TIMEOUT      5
-extern int TIMEOUT;
-#define INPUT_TIMEOUT (60)
-
-
-extern gss_cred_id_t cred_handle;
-extern pthread_mutex_t cred_handle_lock;
-extern char *cert_file;
-extern char *key_file;
-extern char *CAcert_dir;
-extern int bs_only;
-
-
-/* shared data for thread communication */
-#ifdef INTERLOGD_FLUSH
-extern pthread_mutex_t flush_lock;
-extern pthread_cond_t flush_cond;
-#endif
-  
-struct event_store {
-       char     *event_file_name;         /* file with events from local logger */
-       char     *control_file_name;       /* file with control information */
-       char     *job_id_s;                /* string form of the job id */
-       long      last_committed_bs;       /* offset behind event that was last committed by BS */
-       long      last_committed_ls;       /*  -"-                                           LS */
-       long      offset;                  /* expected file position of next event */
-       int       recovering;              /* flag for recovery mode */
-       pthread_rwlock_t update_lock;      /* lock to prevent simultaneous updates */
-       pthread_rwlock_t use_lock;         /* lock to prevent struct deallocation */
-#if defined(IL_NOTIFICATIONS)
-       char     *dest;                    /* host:port destination */
-#endif
-};
-
-
-struct server_msg {
-       char                   *job_id_s;       /* necessary for commit */
-       long                    offset;         /* just for printing more information to debug */
-       char                   *msg;
-       int                     len;
-       int                     ev_len;
-       struct event_store     *es;             /* cache for corresponding event store */
-       long                    receipt_to;     /* receiver (long local-logger id - LLLID) of delivery confirmation (for priority messages) */
-#if defined(IL_NOTIFICATIONS)
-       char                   *dest_name;
-       int                     dest_port;
-       char                   *dest;
-#endif
-};
-
-
-struct event_queue {
-       edg_wll_GssConnection   gss;            /* GSS connection */
-       char                   *dest_name;
-       int                     dest_port;
-       int                     timeout;        /* queue timeout */
-       struct event_queue_msg *tail;           /* last message in the queue */
-       struct event_queue_msg *head;           /* first message in the queue */
-#if defined(INTERLOGD_EMS)
-       struct event_queue_msg *tail_ems;       /* last priority message in the queue (or NULL) */
-       struct event_queue_msg *mark_this;      /* mark message for removal */
-       struct event_queue_msg *mark_prev;      /* predecessor of the marked message */
-#endif
-       pthread_t               thread_id;      /* id of associated thread */
-       pthread_rwlock_t        update_lock;    /* mutex for queue updates */
-       pthread_mutex_t         cond_lock;      /* mutex for condition variable */
-       pthread_cond_t          ready_cond;     /* condition variable for message arrival */
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-       int                     flushing;
-       int                     flush_result;   /* result of flush operation */
-       pthread_cond_t          flush_cond;     /* condition variable for flush operation */
-#endif
-};
-
-
-/* server msg methods */
-struct server_msg *server_msg_create(char *, long);
-struct server_msg *server_msg_copy(struct server_msg *);
-int server_msg_init(struct server_msg *, char *);
-#if defined(INTERLOGD_EMS)
-int server_msg_is_priority(struct server_msg *);
-#endif
-int server_msg_free(struct server_msg *);
-
-/* general event queue methods */
-struct event_queue *event_queue_create(char *);
-int event_queue_free(struct event_queue *);
-int event_queue_empty(struct event_queue *);
-int event_queue_insert(struct event_queue *, struct server_msg *);
-int event_queue_get(struct event_queue *, struct server_msg **);
-int event_queue_remove(struct event_queue *);
-int event_queue_enqueue(struct event_queue *, char *);
-/* helper */
-int enqueue_msg(struct event_queue *, struct server_msg *);
-
-/* protocol event queue methods */
-int event_queue_connect(struct event_queue *);
-int event_queue_send(struct event_queue *);
-int event_queue_close(struct event_queue *);
-int send_confirmation(long, int);
-
-/* thread event queue methods */
-int event_queue_create_thread(struct event_queue *);
-int event_queue_lock(struct event_queue *);
-int event_queue_unlock(struct event_queue *);
-int event_queue_lock_ro(struct event_queue *);
-int event_queue_signal(struct event_queue *);
-int event_queue_wait(struct event_queue *, int);
-int event_queue_sleep(struct event_queue *);
-int event_queue_wakeup(struct event_queue *);
-int event_queue_cond_lock(struct event_queue *);
-int event_queue_cond_unlock(struct event_queue *);
-
-/* input queue */
-int input_queue_attach();
-void input_queue_detach();
-int input_queue_get(char **, long *, int);
-
-/* queue management functions */
-int queue_list_init(char *);
-struct event_queue *queue_list_get(char *);
-struct event_queue *queue_list_first();
-struct event_queue *queue_list_next();
-int queue_list_is_log(struct event_queue *);
-
-#if defined(IL_NOTIFICATIONS)
-struct event_queue *notifid_map_get_dest(const char *);
-int notifid_map_set_dest(const char *, struct event_queue *);
-int event_queue_move_events(struct event_queue *, struct event_queue *, char *); 
-#endif
-
-/* event store functions */
-int event_store_init(char *);
-int event_store_cleanup();
-int event_store_recover_all(void);
-struct event_store *event_store_find(char *);
-int event_store_sync(struct event_store *, long);
-int event_store_next(struct event_store *, int);
-int event_store_commit(struct event_store *, int, int);
-int event_store_recover(struct event_store *);
-int event_store_release(struct event_store *);
-/* int event_store_remove(struct event_store *); */
-
-/* master main loop */
-int loop();
-
-/* recover thread */
-void *recover_thread(void*);
-
-#endif
diff --git a/org.glite.lb.logger/src/logd.c b/org.glite.lb.logger/src/logd.c

deleted file mode 100644 (file)

index d022bff..0000000
--- a/org.glite.lb.logger/src/logd.c
+++ /dev/null
@@ -1,436 +0,0 @@
-#ident "$Header$"
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <unistd.h> 
-#include <string.h>
-#include <getopt.h>
-
-#include <globus_common.h>
-
-#include "logd_proto.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/lb_gss.h"
-
-static const char rcsid[] = "@(#)$Id$";
-static int verbose = 0;
-static int debug = 0;
-static int port = EDG_WLL_LOG_PORT_DEFAULT;
-static char *prefix = EDG_WLL_LOG_PREFIX_DEFAULT;
-static char *cert_file = NULL;
-static char *key_file = NULL;
-static char *CAcert_dir = NULL;
-static int noAuth = 0;
-static int noIPC = 0;
-static int noParse = 0;
-
-#define DEFAULT_SOCKET "/tmp/interlogger.sock"
-char *socket_path = DEFAULT_SOCKET;
-
-extern int confirm_sock;
-extern char confirm_sock_name[256];
-
-static struct option const long_options[] = {
-       { "help", no_argument, 0, 'h' },
-       { "version", no_argument, 0, 'V' },
-       { "verbose", no_argument, 0, 'v' },
-       { "debug", no_argument, 0, 'd' },
-       { "port", required_argument, 0, 'p' },
-       { "file-prefix", required_argument, 0, 'f' },
-       { "cert", required_argument, 0, 'c' },
-       { "key", required_argument, 0, 'k' },
-       { "CAdir", required_argument, 0, 'C' },
-       { "socket",required_argument, 0, 's' },
-       { "noAuth", no_argument, 0, 'x' },
-       { "noIPC", no_argument, 0, 'y' },
-       { "noParse", no_argument, 0, 'z' },
-       { NULL, 0, NULL, 0}
-};
-
-/*
- *----------------------------------------------------------------------
- *
- * usage - print usage
- *
- *----------------------------------------------------------------------
- */
-
-static void
-usage(char *program_name) {
-       fprintf(stdout,"%s\n"
-               "- collect events from logging API calls,\n"
-               "- save them to files and\n"
-               "- send them to inter-logger\n\n"
-               "Usage: %s [option]\n"
-               "-h, --help                 display this help and exit\n"
-               "-V, --version              output version information and exit\n"
-               "-d, --debug                do not run as daemon\n"
-               "-v, --verbose              print extensive debug output\n"
-               "-p, --port <num>           port to listen\n"
-               "-f, --file-prefix <prefix> path and prefix for event files\n"
-               "-c, --cert <file>          location of server certificate\n"
-               "-k, --key  <file>          location of server private key\n"
-               "-C, --CAdir <dir>          directory containing CA certificates\n"
-               "-s, --socket <dir>         socket to send messages (NOT IMPLEMENTED YET)\n"
-               "--noAuth                   do not check caller's identity\n"
-               "--noIPC                    do not send messages to inter-logger\n"
-               "--noParse                  do not parse messages for correctness\n",
-               program_name,program_name);
-}
-
-static sighandler_t mysignal(int num,sighandler_t handler)
-{
-       struct sigaction        sa,osa;
-
-       memset(&sa,0,sizeof(sa));
-       sa.sa_handler = handler;
-       sa.sa_flags = SA_RESTART;
-       return sigaction(num,&sa,&osa) ? SIG_ERR : osa.sa_handler;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * handle_signal -
- *     USR1 - increase the verbosity of the program
- *     USR2 - decrease the verbosity of the program
- *
- *----------------------------------------------------------------------
- */
-void handle_signal(int num) {
-       if (num != SIGCHLD) edg_wll_ll_log(LOG_NOTICE,"Received signal %d\n", num);
-       switch (num) {
-               case SIGUSR1:
-                       if (edg_wll_ll_log_level < LOG_DEBUG) edg_wll_ll_log_level++;
-                       edg_wll_ll_log(LOG_NOTICE,"Logging level is now %d\n", edg_wll_ll_log_level);
-                       break;
-               case SIGUSR2:
-                       if (edg_wll_ll_log_level > LOG_EMERG) edg_wll_ll_log_level--;
-                       edg_wll_ll_log(LOG_NOTICE,"Logging level is now %d\n", edg_wll_ll_log_level);
-                       break;
-               case SIGPIPE:
-                       edg_wll_ll_log(LOG_NOTICE,"Broken pipe, lost communication channel.\n");
-                       break;
-               case SIGCHLD:
-                       while (wait3(NULL,WNOHANG,NULL) > 0);
-                       break;
-               case SIGINT:
-               case SIGTERM:
-               case SIGQUIT:
-                       if (confirm_sock) {
-                               edg_wll_ll_log(LOG_NOTICE,"Closing confirmation socket.\n");
-                               close(confirm_sock);
-                               unlink(confirm_sock_name);
-                       }
-                       exit(1);
-                       break;
-               default: break;
-       }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * doit - do all the dirty work
- *
- *----------------------------------------------------------------------
- */
-static int
-doit(int socket, gss_cred_id_t cred_handle, char *file_name_prefix, int noipc, int noparse)
-{
-    char       *subject;
-    int        ret;
-    struct timeval timeout = {10,0};
-    edg_wll_GssConnection      con;
-    edg_wll_GssStatus  gss_stat;
-    gss_buffer_desc    gss_token = GSS_C_EMPTY_BUFFER;
-    gss_name_t client_name = GSS_C_NO_NAME;
-    OM_uint32  min_stat;
-    gss_OID    name_type = GSS_C_NO_OID;
-
-    /* authentication */
-    edg_wll_ll_log(LOG_INFO,"Processing authentication:\n");
-// FIXME - put here some meaningfull value of timeout + do somthing if timeouted
-    ret = edg_wll_gss_accept(cred_handle,socket,&timeout,&con, &gss_stat);
-    if (ret) {
-           edg_wll_ll_log(LOG_ERR,"edg_wll_gss_accept() failed\n");
-           return(-1);
-    }
-
-    gss_stat.major_status = gss_inquire_context(&gss_stat.minor_status, con.context,
-                                               &client_name, NULL, NULL, NULL, NULL,
-                                               NULL, NULL);
-    if (GSS_ERROR(gss_stat.major_status)) {
-       char *gss_err;
-       edg_wll_gss_get_error(&gss_stat, "Cannot read client identification", &gss_err);
-       edg_wll_ll_log(LOG_WARNING, "%s\n", gss_err);
-       free(gss_err);
-    } else {
-       gss_stat.major_status = gss_display_name(&gss_stat.minor_status, client_name,
-                                               &gss_token, &name_type);
-       if (GSS_ERROR(gss_stat.major_status)) {
-         char *gss_err;
-         edg_wll_gss_get_error(&gss_stat, "Cannot process client identification", &gss_err);
-         edg_wll_ll_log(LOG_WARNING, "%s\n", gss_err);
-         free(gss_err);
-       }
-    }
-
-    if (GSS_ERROR(gss_stat.major_status) ||
-        edg_wll_gss_oid_equal(name_type, GSS_C_NT_ANONYMOUS)) {
-       edg_wll_ll_log(LOG_INFO,"  User not authenticated, setting as \"%s\". \n",EDG_WLL_LOG_USER_DEFAULT);
-       subject=strdup(EDG_WLL_LOG_USER_DEFAULT);
-    } else {
-       edg_wll_ll_log(LOG_INFO,"  User successfully authenticated as:\n");
-       edg_wll_ll_log(LOG_INFO, "   %s\n", (char *)gss_token.value);
-       subject=gss_token.value;
-       memset(&gss_token.value, 0, sizeof(gss_token.value));
-    }
-
-    ret = edg_wll_log_proto_server(&con,subject,file_name_prefix,noipc,noparse);
-
-    edg_wll_gss_close(&con, NULL);
-    if (subject) free(subject);
-    if (gss_token.length)
-       gss_release_buffer(&min_stat, &gss_token);
-    if (client_name != GSS_C_NO_NAME)
-       gss_release_name(&min_stat, &client_name);
-    return ret;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Main -
- *
- *----------------------------------------------------------------------
- */
-int main(int argc, char *argv[])
-{
-   int ret;
-   int childpid;
-   int opt;
-
-   int listener_fd;
-   int client_fd;
-   struct sockaddr_in client_addr;
-   int client_addr_len;
-
-   char *my_subject_name = NULL;
-
-   time_t      cert_mtime = 0, key_mtime = 0;
-   OM_uint32   min_stat;
-   edg_wll_GssStatus   gss_stat;
-   gss_cred_id_t       cred = GSS_C_NO_CREDENTIAL;
-
-
-   setlinebuf(stdout);
-   setlinebuf(stderr);
-
-   /* welcome */
-   fprintf(stdout,"\
-This is LocalLogger, part of Workload Management System in EU DataGrid.\
-Copyright (c) 2002 CERN, INFN and CESNET on behalf of the EU DataGrid.\n");
-
-   /* get arguments */
-   while ((opt = getopt_long(argc,argv,
-       "h"  /* help */
-       "V"  /* version */
-       "v"  /* verbose */
-       "d"  /* debug */
-       "p:" /* port */
-       "f:" /* file prefix */
-       "c:" /* certificate */
-       "k:" /* key */
-       "C:" /* CA dir */
-       "s:" /* socket */
-       "x"  /* noAuth */
-       "y"  /* noIPC */
-       "z",  /* noParse */
-       long_options, (int *) 0)) != EOF) {
-
-       switch (opt) {
-               case 'V': fprintf(stdout,"%s:\t%s\n",argv[0],rcsid); exit(0);
-               case 'v': verbose = 1; break;
-               case 'd': debug = 1; break;
-               case 'p': port = atoi(optarg); break;
-               case 'f': prefix = optarg; break;
-               case 'c': cert_file = optarg; break;
-               case 'k': key_file = optarg; break;
-               case 'C': CAcert_dir = optarg; break;
-               case 's': socket_path = optarg; break;
-               case 'x': noAuth = 1; break;
-               case 'y': noIPC = 1; break;
-               case 'z': noParse = 1; break;
-               case 'h':
-               default:
-                       usage(argv[0]); exit(0);
-       }
-   }
-   edg_wll_ll_log_init(verbose ? LOG_DEBUG : LOG_INFO);
-   edg_wll_ll_log(LOG_INFO,"Initializing...\n");
-
-   /* check noParse */
-   edg_wll_ll_log(LOG_INFO,"Parse messages for correctness...");
-   if (noParse) {
-       edg_wll_ll_log(LOG_INFO,"no.\n");
-   } else {
-       edg_wll_ll_log(LOG_INFO,"yes.\n");
-   }
-
-   /* check noIPC */
-   edg_wll_ll_log(LOG_INFO,"Send messages also to inter-logger...");
-   if (noIPC) {
-       edg_wll_ll_log(LOG_INFO,"no.\n");
-   } else {
-       edg_wll_ll_log(LOG_INFO,"yes.\n");
-   }
-
-   /* check prefix correctness */
-/* XXX: check probably also write permisions */
-   edg_wll_ll_log(LOG_INFO,"Store messages with the filename prefix \"%s\"...",prefix);
-   if (strlen(prefix) > FILENAME_MAX - 34) {
-       edg_wll_ll_log(LOG_INFO,"no.\n");
-       edg_wll_ll_log(LOG_CRIT,"Too long prefix for file names, would not be able to write to log files. Exiting.\n");
-       exit(1);
-   } else {
-       edg_wll_ll_log(LOG_INFO,"yes.\n");
-   }
-
-   if (CAcert_dir)
-      setenv("X509_CERT_DIR", CAcert_dir, 1);
-
-   /* daemonize */
-   edg_wll_ll_log(LOG_INFO,"Running as daemon...");
-   if (debug) {
-       edg_wll_ll_log(LOG_NOTICE,"no.\n");
-   }
-   else if (daemon(0,0) < 0) {
-       edg_wll_ll_log(LOG_CRIT,"Failed to run as daemon. Exiting.\n");
-       perror("daemon");
-       exit(1);
-   }
-   else {
-       edg_wll_ll_log(LOG_INFO,"yes.\n");
-   }
-
-   /* initialize Globus common module */
-   edg_wll_ll_log(LOG_INFO,"Initializing Globus common module...");
-   if (globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS) {
-       edg_wll_ll_log(LOG_NOTICE,"no.\n");
-       edg_wll_ll_log(LOG_CRIT, "Failed to initialize Globus common module. Exiting.\n");
-       exit(1);
-   } else {
-       edg_wll_ll_log(LOG_INFO,"yes.\n");
-   }
-
-   /* initialize signal handling */
-   if (mysignal(SIGUSR1, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGUSR2, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGPIPE, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGHUP,  SIG_DFL) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGINT,  handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGQUIT, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGTERM, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-   if (mysignal(SIGCHLD, handle_signal) == SIG_ERR) { perror("signal"); exit(1); }
-
-   edg_wll_gss_watch_creds(cert_file,&cert_mtime);
-   /* XXX DK: support noAuth */
-   ret = edg_wll_gss_acquire_cred_gsi(cert_file, key_file, &cred, &my_subject_name,
-                                     &gss_stat);
-   if (ret) {
-      /* XXX DK: call edg_wll_gss_get_error() */
-      edg_wll_ll_log(LOG_CRIT, "Failed to get GSI credentials. Exiting.\n");
-      exit(1);
-   }
-
-   if (my_subject_name!=NULL) {
-       edg_wll_ll_log(LOG_INFO,"  server running with certificate: %s\n",my_subject_name);
-       free(my_subject_name);
-   } else if (noAuth) {
-       edg_wll_ll_log(LOG_INFO,"  running without certificate\n");
-#if 0
-   /* XXX DK: */    
-   } else {
-       edg_wll_ll_log(LOG_CRIT,"No server credential found. Exiting.\n");
-       exit(1);
-#endif
-   }
-
-   /* do listen */
-   edg_wll_ll_log(LOG_INFO,"Listening on port %d\n",port);
-   listener_fd = do_listen(port);
-   if (listener_fd == -1) {
-       edg_wll_ll_log(LOG_CRIT,"Failed to listen on port %d\n",port);
-       gss_release_cred(&min_stat, &cred);
-       exit(-1);
-   }
-
-   client_addr_len = sizeof(client_addr);
-   bzero((char *) &client_addr, client_addr_len);
-
-   /*
-    * Main loop
-    */
-   while (1) {
-       edg_wll_ll_log(LOG_INFO,"Accepting incomming connections...\n");
-       client_fd = accept(listener_fd, (struct sockaddr *) &client_addr,
-                          &client_addr_len);
-       if (client_fd < 0) {
-          close(listener_fd);
-          edg_wll_ll_log(LOG_CRIT,"Failed to accept incomming connections\n");
-          perror("accept");
-          gss_release_cred(&min_stat, &cred);
-          exit(-1);
-       }
-
-       switch (edg_wll_gss_watch_creds(cert_file,&cert_mtime)) {
-         gss_cred_id_t newcred;
-         case 0: break;
-         case 1:
-            ret = edg_wll_gss_acquire_cred_gsi(cert_file,key_file,&newcred,NULL,&gss_stat);
-            if (ret) {
-               edg_wll_ll_log(LOG_WARNING, "Reloading credentials failed, continue with older\n");
-            } else {
-               edg_wll_ll_log(LOG_INFO, "Reloading credentials\n");
-               gss_release_cred(&min_stat, &cred);
-               cred = newcred;
-            }
-            break;
-         case -1:
-            edg_wll_ll_log(LOG_WARNING, "edg_wll_gss_watch_creds failed\n");
-            break;
-       }
-
-    /* FORK - change next line if fork() is not needed (for debugging for
-     * example
-     */
-#if 1
-       if ((childpid = fork()) < 0) {
-             perror("fork()");
-             close(client_fd);
-       }
-       if (childpid == 0) {
-             ret=doit(client_fd,cred,prefix,noIPC,noParse);
-             close(client_fd);
-             goto end;
-       }
-       if (childpid > 0) {
-             close(client_fd);
-       }
-#else
-       ret=doit(client_fd,cred,prefix,noIPC,noParse);
-       close(client_fd);
-#endif
-    } /* while */
-
-end:
-   close(listener_fd);
-   gss_release_cred(&min_stat, &cred);
-   exit(ret);
-}
diff --git a/org.glite.lb.logger/src/logd_proto.c b/org.glite.lb.logger/src/logd_proto.c

deleted file mode 100644 (file)

index 6235592..0000000
--- a/org.glite.lb.logger/src/logd_proto.c
+++ /dev/null
@@ -1,865 +0,0 @@
-#ident "$Header$"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <string.h>
-#include <syslog.h>
-#include <fcntl.h>
-
-#include "logd_proto.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/events_parse.h"
-
-static const int one = 1;
-
-extern char* socket_path;
-
-int edg_wll_ll_log_level;
-
-#define tv_sub(a,b) {\
-       (a).tv_usec -= (b).tv_usec;\
-       (a).tv_sec -= (b).tv_sec;\
-       if ((a).tv_usec < 0) {\
-               (a).tv_sec--;\
-               (a).tv_usec += 1000000;\
-       }\
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * send_answer_back - 
- *                     
- *----------------------------------------------------------------------
- */
-static int send_answer_back(edg_wll_GssConnection *con, int answer, struct timeval *timeout) {
-       int count = 0;
-       int err = 0;
-       int ans = answer;
-       u_int8_t ans_end[4];
-       edg_wll_GssStatus       gss_stat;
-
-       edg_wll_ll_log(LOG_INFO,"Sending answer \"%d\" back to client...",answer);
-        ans_end[0] = ans & 0xff; ans >>= 8;
-        ans_end[1] = ans & 0xff; ans >>= 8;
-        ans_end[2] = ans & 0xff; ans >>= 8;
-        ans_end[3] = ans;
-       if ((err = edg_wll_gss_write_full(con,ans_end,4,timeout,&count, &gss_stat)) < 0 ) {
-               edg_wll_ll_log(LOG_INFO,"error.\n");
-               return edg_wll_log_proto_server_failure(err,&gss_stat,"Error sending answer");
-       } else {
-               edg_wll_ll_log(LOG_INFO,"o.k.\n");
-               return 0;
-       }
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * wait_for_confirmation -
- *
- * Args:    timeout - number of seconds to wait, 0 => wait indefinitely
- *
- * Returns:  1 => OK, *code contains error code sent by interlogger
- *           0 => timeout expired before anything interesting happened
- *          -1 => some error (see errno for details)
- *
- *----------------------------------------------------------------------
- */
-int confirm_sock;
-char confirm_sock_name[256];
-
-static
-int init_confirmation()
-{
-       struct sockaddr_un saddr;
-
-       /* create socket */
-       if((confirm_sock=socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-               edg_wll_ll_log(LOG_ERR,"init_confirmation(): error creating socket\n");
-               SYSTEM_ERROR("socket");
-               return(-1);
-       }
-
-       /* set the socket parameters */
-       memset(&saddr, 0, sizeof(saddr));
-       saddr.sun_family = AF_UNIX;
-       strcpy(saddr.sun_path, confirm_sock_name);
-
-       /* bind the socket */
-       if(bind(confirm_sock, (struct sockaddr *)&saddr, sizeof(saddr.sun_path)) < 0) {
-               edg_wll_ll_log(LOG_ERR,"init_confirmation(): error binding socket\n");
-               SYSTEM_ERROR("bind");
-               close(confirm_sock);
-               unlink(confirm_sock_name);
-               return(-1);
-       }
-
-       /* and listen */
-       if(listen(confirm_sock, 5) < 0) {
-               edg_wll_ll_log(LOG_ERR,"init_confirmation(): error listening on socket\n");
-               SYSTEM_ERROR("listen");
-               close(confirm_sock);
-               unlink(confirm_sock_name);
-               return(-1);
-       }
-
-       return(0);
-}
-
-
-int wait_for_confirmation(struct timeval *timeout, int *code)
-{
-       fd_set fds;
-       struct timeval  to,before,after;
-       int ret = 0, tmp = 0;
-
-       *code = 0;
-
-       FD_ZERO(&fds);
-       FD_SET(confirm_sock, &fds);
-
-       /* set timeout */
-       if (timeout) {
-               memcpy(&to,timeout,sizeof to);
-               gettimeofday(&before,NULL);
-       }
-
-       /* wait for confirmation at most timeout seconds */
-       if ((tmp=select(confirm_sock+1, &fds, NULL, NULL, timeout?&to:NULL)) < 0) {
-               edg_wll_ll_log(LOG_ERR,"wait_for_confirmation(): error selecting socket\n");
-               SYSTEM_ERROR("select");
-               ret = -1;
-       } else {
-               if (tmp == 0)
-                       ret = 0;
-               else {
-                       int nsd = accept(confirm_sock, NULL, NULL);
-                       ret = 1;
-                       if(nsd < 0) {
-                               edg_wll_ll_log(LOG_ERR,"wait_for_confirmation(): error accepting a connection on a socket\n");
-                               SYSTEM_ERROR("accept");
-                               ret = -1;
-                       } else {
-                               if(recv(nsd, code, sizeof(*code), MSG_NOSIGNAL) < 0) {
-                                       edg_wll_ll_log(LOG_ERR,"wait_for_confirmation(): error receiving a message from a socket\n");
-                                       SYSTEM_ERROR("recv");
-                                       ret = -1;
-                               }
-                               close(nsd);
-                       }
-               }
-       }
-       close(confirm_sock);
-       unlink(confirm_sock_name);
-        if (timeout) {
-           gettimeofday(&after,NULL);
-           tv_sub(after,before);
-           tv_sub(*timeout,after);
-           if (timeout->tv_sec < 0) {
-                timeout->tv_sec = 0;
-                timeout->tv_usec = 0;
-           }
-       }
-       return ret;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * do_listen - listen on given port
- *
- * Returns: socket handle or -1 if something fails
- *
- * Calls: socket, bind, listen
- *
- * Algorithm:
- *
- *----------------------------------------------------------------------
- */
-int do_listen(int port)
-{
-       int                ret;
-       int                sock;
-       struct sockaddr_in my_addr;
-
-       memset(&my_addr, 0, sizeof(my_addr));
-       my_addr.sin_family = AF_INET;
-       my_addr.sin_addr.s_addr = INADDR_ANY;
-       my_addr.sin_port = htons(port);
-
-       sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-       if (sock == -1) { 
-               edg_wll_ll_log(LOG_ERR,"do_listen(): error creating socket\n");
-               SYSTEM_ERROR("socket"); 
-               return -1; 
-       }
-
-       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-       ret = bind(sock, (struct sockaddr *)&my_addr, sizeof(my_addr));
-       if (ret == -1) { 
-               edg_wll_ll_log(LOG_ERR,"do_listen(): error binding socket\n");
-               SYSTEM_ERROR("bind"); 
-               return -1; 
-       }
-
-       ret = listen(sock, 5);
-       if (ret == -1) { 
-               edg_wll_ll_log(LOG_ERR,"do_listen(): error listening on socket\n");
-               SYSTEM_ERROR("listen"); 
-               close(sock); 
-               return -1; 
-       }
-
-       return sock;
-}
-
-/*!
- *----------------------------------------------------------------------
- * Write to socket
- * Needn't write entire buffer. Timeout is applicable only for non-blocking
- * connections 
- * \param sock IN: connection to work with
- * \param buf IN: buffer
- * \param bufsize IN: max size to write
- * \param timeout INOUT: max time allowed for operation, remaining time on return
- * \retval bytes written (>0) on success
- * \retval -1 on write error
- *----------------------------------------------------------------------
- */
-static ssize_t edg_wll_socket_write(int sock,const void *buf,size_t bufsize,struct timeval *timeout)
-{ 
-        ssize_t        len = 0, ret = 0;
-       fd_set  fds;
-       struct timeval  to,before,after;
-
-       if (timeout) {
-               memcpy(&to,timeout,sizeof to);
-               gettimeofday(&before,NULL);
-       }
-        len = write(sock,buf,bufsize);
-        while (len <= 0) {
-               FD_ZERO(&fds);
-               FD_SET(sock,&fds);
-               if ((ret=select(sock+1,&fds,NULL,NULL,timeout?&to:NULL)) < 0) {
-                       edg_wll_ll_log(LOG_ERR,"edg_wll_socket_write(): error selecting socket\n");
-                       SYSTEM_ERROR("select"); 
-                       break;
-               }
-                len = write(sock,buf,bufsize);
-        }
-        if (timeout) {
-           gettimeofday(&after,NULL);
-           tv_sub(after,before);
-           tv_sub(*timeout,after);
-           if (timeout->tv_sec < 0) {
-                timeout->tv_sec = 0;
-                timeout->tv_usec = 0;
-           }
-       }
-        return len;
-} 
-
-/*!
- *----------------------------------------------------------------------
- * Write specified amount of data to socket
- * Attempts to call edg_wll_socket_write() untill the entire request is satisfied
- * (or times out).
- * \param sock IN: connection to work with
- * \param buf IN: buffer
- * \param bufsize IN: max size to write
- * \param timeout INOUT: max time allowed for operation, remaining time on return
- * \param total OUT: bytes actually written
- * \retval bytes written (>0) on success
- * \retval -1 on write error
- *----------------------------------------------------------------------
- */
-static ssize_t edg_wll_socket_write_full(int sock,void *buf,size_t bufsize,struct timeval *timeout,ssize_t *total)
-{
-        ssize_t        len;
-        *total = 0;
-
-        while (*total < bufsize) {
-                len = edg_wll_socket_write(sock,buf+*total,bufsize-*total,timeout);
-                if (len < 0) return len;
-                *total += len;
-        }
-        return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_log_proto_server - handle incoming data
- *
- * Returns: 0 if done properly or errno
- *
- * Calls:
- *
- * Algorithm:
- *
- *----------------------------------------------------------------------
- */
-int edg_wll_log_proto_server(edg_wll_GssConnection *con, char *name, char *prefix, int noipc, int noparse)
-{
-       char    *buf,*dglllid,*dguser,*jobId,*name_esc;
-       char    header[EDG_WLL_LOG_SOCKET_HEADER_LENGTH+1];
-       char    outfilename[FILENAME_MAX];
-       int     count,count_total,size;
-       u_int8_t size_end[4];
-       size_t  msg_size,dglllid_size,dguser_size;
-       int     i,answer,answer_sent;
-       int     msg_sock;
-       char    *msg,*msg_begin;
-       FILE    *outfile;
-       int     filedesc,filelock_status,flags;
-       long    filepos;
-       struct flock filelock;
-       int     priority;
-       long    lllid;
-       int     unique;
-       struct timeval timeout;
-       int     err;
-       edg_wll_Context context;
-       edg_wll_Event   *event;
-       edg_wll_GssStatus       gss_stat;
-                
-       errno = i = answer = answer_sent = size = msg_size = dglllid_size = dguser_size = count = count_total = msg_sock = filedesc = filelock_status = /* priority */ unique = err = 0;     
-        buf = dglllid = dguser = jobId = name_esc = msg = msg_begin = NULL;
-       event = NULL;
-       if (EDG_WLL_LOG_TIMEOUT_MAX > EDG_WLL_LOG_SYNC_TIMEOUT_MAX) timeout.tv_sec = EDG_WLL_LOG_TIMEOUT_MAX;
-       else timeout.tv_sec = EDG_WLL_LOG_SYNC_TIMEOUT_MAX;
-        timeout.tv_usec = 0;
-       if (edg_wll_InitContext(&context) != 0) {
-               edg_wll_ll_log(LOG_ERR,"edg_wll_InitContex(): error.\n");
-               answer = ENOMEM; 
-               goto edg_wll_log_proto_server_end; 
-       }
-       if (edg_wll_ResetError(context) != 0) { 
-               edg_wll_ll_log(LOG_ERR,"edg_wll_ResetError(): error.\n");
-               answer = ENOMEM; 
-               goto edg_wll_log_proto_server_end;
-       }
-
-       /* look for the unique unused long local-logger id (LLLID) */
-       lllid = 1000*getpid();
-       for (i=0; (i<1000)&&(!unique); i++) {
-               lllid += i;
-               snprintf(confirm_sock_name, sizeof(confirm_sock_name), "/tmp/dglogd_sock_%ld", lllid);
-               if ((filedesc = open(confirm_sock_name,O_CREAT)) == -1) {
-                       if (errno == EEXIST) {
-                               edg_wll_ll_log(LOG_WARNING,"Warning: LLLID %ld already in use.\n",lllid);
-                       } else {
-                               SYSTEM_ERROR("open");
-                       }
-               } else {
-                       unique = 1;
-                       close(filedesc); filedesc = 0;
-                       unlink(confirm_sock_name);
-               }
-       }
-       if (!unique) {
-               edg_wll_ll_log(LOG_ERR,"Cannot determine the unique long local-logger id (LLLID)!\n",lllid);
-               return EAGAIN;
-       }
-       edg_wll_ll_log(LOG_INFO,"Long local-logger id (LLLID): %ld\n",lllid);
-
-       /* receive socket header */
-       edg_wll_ll_log(LOG_INFO,"Reading socket header...");
-       memset(header, 0, EDG_WLL_LOG_SOCKET_HEADER_LENGTH+1);
-       if ((err = edg_wll_gss_read_full(con, header, EDG_WLL_LOG_SOCKET_HEADER_LENGTH, &timeout, &count, &gss_stat)) < 0) {
-               edg_wll_ll_log(LOG_INFO,"error.\n");
-               answer = edg_wll_log_proto_server_failure(err,&gss_stat,"Error receiving header");
-               goto edg_wll_log_proto_server_end;
-       } else {
-               edg_wll_ll_log(LOG_INFO,"o.k.\n");
-       }
-       edg_wll_ll_log(LOG_DEBUG,"Checking socket header...");
-       header[EDG_WLL_LOG_SOCKET_HEADER_LENGTH] = '\0';
-       if (strncmp(header,EDG_WLL_LOG_SOCKET_HEADER,EDG_WLL_LOG_SOCKET_HEADER_LENGTH)) {
-               /* not the proper socket header text */
-               edg_wll_ll_log(LOG_DEBUG,"error.\n");
-               edg_wll_ll_log(LOG_ERR,"edg_wll_log_proto_server(): invalid socket header\n");
-               edg_wll_ll_log(LOG_DEBUG,"edg_wll_log_proto_server(): read header '%s' instead of '%s'\n",
-                               header,EDG_WLL_LOG_SOCKET_HEADER);
-               answer = EINVAL;
-               goto edg_wll_log_proto_server_end;
-       } else {
-               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-       }
-
-/*
-       edg_wll_ll_log(LOG_DEBUG,"Reading message priority...");
-       count = 0;
-       if ((err = edg_wll_gss_read_full(con, &priority, sizeof(priority), &timeout, &count, &gss_stat)) < 0) {
-               edg_wll_ll_log(LOG_DEBUG,"error.\n");
-               answer = edg_wll_log_proto_server_failure(err,&gss_stat,"Error receiving message priority");
-                goto edg_wll_log_proto_server_end;
-        } else {
-               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-       }
-*/
-
-        edg_wll_ll_log(LOG_DEBUG,"Reading message size...");
-       count = 0;
-       if ((err = edg_wll_gss_read_full(con, size_end, 4, &timeout, &count,&gss_stat)) < 0) {
-               edg_wll_ll_log(LOG_DEBUG,"error.\n");
-               answer = edg_wll_log_proto_server_failure(err,&gss_stat,"Error receiving message size");
-                goto edg_wll_log_proto_server_end;
-       } else {
-               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-       }
-       size = size_end[3]; size <<=8; 
-       size |= size_end[2]; size <<=8; 
-       size |= size_end[1]; size <<=8; 
-       size |= size_end[0];
-        edg_wll_ll_log(LOG_DEBUG,"Checking message size...");
-       if (size <= 0) {
-               edg_wll_ll_log(LOG_DEBUG,"error.\n");
-               /* probably wrong size in the header or nothing to read */
-               edg_wll_ll_log(LOG_ERR,"edg_wll_log_proto_server(): invalid size read from socket header\n");
-               edg_wll_ll_log(LOG_DEBUG,"Read size '%d'.\n",size);
-               answer = EINVAL;
-               goto edg_wll_log_proto_server_end;
-       } else {
-               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               edg_wll_ll_log(LOG_DEBUG,"- Size read from header: %d bytes.\n",size);
-       }
-
-       /* format the DG.LLLID string */
-       if (asprintf(&dglllid,"DG.LLLID=%ld ",lllid) == -1) {
-               edg_wll_ll_log(LOG_ERR,"edg_wll_log_proto_server(): nomem for DG.LLLID\n");
-               SYSTEM_ERROR("asprintf");
-               answer = ENOMEM;
-               goto edg_wll_log_proto_server_end;
-       }
-       dglllid_size = strlen(dglllid);
-
-       /* format the DG.USER string */
-       name_esc = edg_wll_LogEscape(name);
-       if (asprintf(&dguser,"DG.USER=\"%s\" ",name_esc) == -1) {
-               edg_wll_ll_log(LOG_ERR,"edg_wll_log_proto_server(): nomem for DG.USER\n");
-               SYSTEM_ERROR("asprintf");
-               answer = ENOMEM;
-               goto edg_wll_log_proto_server_end;
-       }
-       dguser_size = strlen(dguser);
-
-       /* allocate enough memory for all data */
-       msg_size = dglllid_size + dguser_size + size + 1;
-       if ((msg = malloc(msg_size)) == NULL) {
-               edg_wll_ll_log(LOG_ERR,"edg_wll_log_proto_server(): out of memory for allocating message\n");
-               SYSTEM_ERROR("malloc");
-               answer = ENOMEM;
-               goto edg_wll_log_proto_server_end;
-       }
-       strncpy(msg,dglllid,dglllid_size);
-       msg_begin = msg + dglllid_size; // this is the "official" beginning of the message
-       strncpy(msg_begin,dguser,dguser_size);
-
-       /* receive message */
-       edg_wll_ll_log(LOG_INFO,"Reading message from socket...");
-       buf = msg_begin + dguser_size;
-       count = 0;
-       if ((err = edg_wll_gss_read_full(con, buf, size, &timeout, &count, &gss_stat)) < 0) {
-               edg_wll_ll_log(LOG_INFO,"error.\n");
-               answer = edg_wll_log_proto_server_failure(err,&gss_stat,"Error receiving message");
-               goto edg_wll_log_proto_server_end;
-       } else {
-               edg_wll_ll_log(LOG_INFO,"o.k.\n");
-       }       
-
-       if (buf[count] != '\0') buf[count] = '\0';
-
-       /* parse message and get jobId and priority from it */
-       if (!noparse && strstr(msg, "DG.TYPE=\"command\"") == NULL) {
-               edg_wll_ll_log(LOG_INFO,"Parsing message for correctness...");
-               if (edg_wll_ParseEvent(context,msg_begin,&event) != 0) { 
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       edg_wll_ll_log(LOG_ERR,"edg_wll_log_proto_server(): edg_wll_ParseEvent error\n");
-                       edg_wll_ll_log(LOG_ERR,"edg_wll_ParseEvent(): %s\n",context->errDesc);
-                       answer = edg_wll_Error(context,NULL,NULL);
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_INFO,"o.k.\n");
-               }
-               edg_wll_ll_log(LOG_DEBUG,"Getting jobId from message...");
-               jobId = edg_wlc_JobIdGetUnique(event->any.jobId);
-               priority = event->any.priority;
-               edg_wll_FreeEvent(event);
-               event->any.priority = priority;
-               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-       } else {
-/* FIXME: what if edg_wll_InitEvent fails? should be checked somehow -> nomem etc.  */
-               event = edg_wll_InitEvent(EDG_WLL_EVENT_UNDEF);
-/* XXX:
-               event = calloc(1,sizeof(*event));
-               if(event == NULL) {
-                       edg_wll_ll_log(LOG_ERR, "out of memory\n");
-                       answer = ENOMEM;
-                       goto edg_wll_log_proto_server_end;
-               }
-*/
-
-/* XXX: obsolete, logd now doesn't need jobId for 'command' messages,
- * it will be probably needed for writing 'command' messages to some files
-               edg_wll_ll_log(LOG_DEBUG,"Getting jobId from message...");
-               jobId = edg_wll_GetJobId(msg);
-               if (!jobId || edg_wlc_JobIdParse(jobId,&j)) {
-                       edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                       edg_wll_ll_log(LOG_ERR,"ParseJobId(%s)\n",jobId?jobId:"NULL");
-                       answer = EINVAL;
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               }
-               free(jobId);
-               jobId = edg_wlc_JobIdGetUnique(j);
-               edg_wlc_JobIdFree(j);
-*/
-
-/* FIXME: get the priority from message some better way */
-               if (strstr(msg, "DG.PRIORITY=1") != NULL)
-                       event->any.priority = 1;
-               else event->any.priority = 0;
-       }
-
-
-       /* if not command, save message to file */
-       if(strstr(msg, "DG.TYPE=\"command\"") == NULL) {
-               /* compose the name of the log file */
-//             edg_wll_ll_log(LOG_DEBUG,"Composing filename from prefix \"%s\" and jobId \"%s\"...",prefix,jobId);
-               count = strlen(prefix);
-               strncpy(outfilename,prefix,count); count_total=count;
-               strncpy(outfilename+count_total,".",1); count_total+=1; count=strlen(jobId);
-               strncpy(outfilename+count_total,jobId,count); count_total+=count;
-               outfilename[count_total]='\0';
-//             edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               edg_wll_ll_log(LOG_INFO,"Writing message to \"%s\"...",outfilename);
-
-               i = 0;
-open_event_file:
-               /* fopen and properly handle the filelock */
-               if ((outfile = fopen(outfilename,"a")) == NULL) {
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       SYSTEM_ERROR("fopen"); 
-                       answer = errno; 
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_INFO,".");
-               }
-               if ((filedesc = fileno(outfile)) == -1) {
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       SYSTEM_ERROR("fileno"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_INFO,".");
-               }
-               filelock.l_type = F_WRLCK;
-               filelock.l_whence = SEEK_SET;
-               filelock.l_start = 0;
-               filelock.l_len = 0;
-               if ((filelock_status=fcntl(filedesc,F_SETLK,&filelock) < 0) && (i < FCNTL_ATTEMPTS)) {
-                       fclose(outfile);
-                       edg_wll_ll_log(LOG_DEBUG,"\nWaiting %d seconds for filelock to open...\n",FCNTL_TIMEOUT);
-                       sleep(FCNTL_TIMEOUT);
-                       i++;
-                       goto open_event_file;
-               }
-               if (filelock_status < 0) {
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       SYSTEM_ERROR("fcntl"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_INFO,".");
-               }
-               if (fseek(outfile, 0, SEEK_END) == -1) {
-                       SYSTEM_ERROR("fseek"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               }
-               if ((filepos=ftell(outfile)) == -1) {
-                       SYSTEM_ERROR("ftell"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               }
-               /* write, flush and sync */
-               if (fputs(msg,outfile) == EOF) {
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       SYSTEM_ERROR("fputs"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               }       
-               if (fflush(outfile) == EOF) {
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       SYSTEM_ERROR("fflush"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               }
-               if (fsync(filedesc) < 0) { /* synchronize */
-                       edg_wll_ll_log(LOG_INFO,"error.\n");
-                       SYSTEM_ERROR("fsync"); 
-                       answer = errno; 
-                       fclose(outfile); 
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_INFO,"o.k.\n");
-               }
-               /* close and unlock */
-               fclose(outfile); 
-       } else {
-               filepos = 0;
-       }
-
-
-       /* if not priority send now the answer back to client */
-       if (!event->any.priority) {
-               if (!send_answer_back(con,answer,&timeout)) { 
-                       answer_sent = 1;
-               }
-       } 
-
-       /* send message via IPC (UNIX socket) */
-       if (!noipc) {
-               struct sockaddr_un saddr;
-               edg_wll_ll_log(LOG_INFO,"The message will be send via IPC (UNIX socket):\n");
-
-               /* initialize socket */
-               edg_wll_ll_log(LOG_DEBUG,"Initializing UNIX socket...\n");
-
-               edg_wll_ll_log(LOG_DEBUG,"- Getting UNIX socket descriptor...");
-               msg_sock = socket(PF_UNIX, SOCK_STREAM, 0);
-               if(msg_sock < 0) {
-                       edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                       SYSTEM_ERROR("socket"); 
-                       answer = errno; 
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               }
-
-               edg_wll_ll_log(LOG_DEBUG,"- Setting UNIX socket parameters...");
-               memset(&saddr, 0, sizeof(saddr));
-               saddr.sun_family = AF_UNIX;
-               strcpy(saddr.sun_path, socket_path);
-               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-
-               edg_wll_ll_log(LOG_DEBUG,"-- adding O_NONBLOCK to socket parameters...");
-               if ((flags = fcntl(msg_sock, F_GETFL, 0)) < 0 ||
-                       fcntl(msg_sock, F_SETFL, flags | O_NONBLOCK) < 0) {
-                       edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                       SYSTEM_ERROR("fcntl"); 
-                       answer = errno; 
-                       close(msg_sock); 
-                       goto edg_wll_log_proto_server_end;
-               } else {
-                       edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               }
-
-               /* for priority messages initialize also another socket for confirmation */
-               if (event->any.priority) {
-                       edg_wll_ll_log(LOG_DEBUG,"- Initializing 2nd UNIX socket for priority messages confirmation...");
-                       if(init_confirmation() < 0) { 
-                               edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                               answer = errno; 
-                               goto edg_wll_log_proto_server_end; 
-                       } else {
-                               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-                       }
-               }         
-
-               edg_wll_ll_log(LOG_DEBUG,"Connecting to UNIX socket...");
-               for (i=0; i < CONNECT_ATTEMPTS; i++) {
-                       if(connect(msg_sock, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) {
-                               if ((errno == EAGAIN) || (errno == ETIMEDOUT)) {
-                                       edg_wll_ll_log(LOG_DEBUG,"."); 
-                                       sleep(CONNECT_TIMEOUT);
-                                       continue;
-                               } else if (errno == EISCONN) {
-                                       edg_wll_ll_log(LOG_DEBUG,"warning.\n");
-                                       edg_wll_ll_log(LOG_ERR,"The socket is already connected!\n");
-                                       break;
-                               } else {
-                                       edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                                       SYSTEM_ERROR("connect"); 
-                                       answer = errno; 
-                                       close(msg_sock); 
-                                       goto edg_wll_log_proto_server_end_1;
-                               }
-                       } else {
-                               edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-                               break;
-                       }
-               }
-
-               edg_wll_ll_log(LOG_DEBUG,"Sending via IPC the message position %ld (%d bytes)...", filepos, sizeof(filepos));
-               count = 0;
-               if (edg_wll_socket_write_full(msg_sock, &filepos, sizeof(filepos), &timeout, &count) < 0) {
-                       edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                       edg_wll_ll_log(LOG_ERR,"edg_wll_socket_write_full(): error,\n");
-                       answer = errno; 
-                       close(msg_sock); 
-                       goto edg_wll_log_proto_server_end_1;
-               } else {
-                       edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               }
-
-               edg_wll_ll_log(LOG_DEBUG,"Sending via IPC the message itself (%d bytes)...",msg_size);
-               if (edg_wll_socket_write_full(msg_sock, msg, msg_size, &timeout, &count) < 0) {
-                       edg_wll_ll_log(LOG_DEBUG,"error.\n");
-                       edg_wll_ll_log(LOG_ERR,"edg_wll_socket_write_full(): error."); 
-                       answer = errno; 
-                       close(msg_sock); 
-                       goto edg_wll_log_proto_server_end_1;
-               } else {
-                       edg_wll_ll_log(LOG_DEBUG,"o.k.\n");
-               }
-
-               close(msg_sock);
-
-               if (event->any.priority) {
-                       edg_wll_ll_log(LOG_INFO,"Waiting for confirmation...");
-                       if ((count = wait_for_confirmation(&timeout, &answer)) < 0) {
-                               edg_wll_ll_log(LOG_INFO,"error.\n");
-                               edg_wll_ll_log(LOG_ERR,"wait_for_confirmation(): error.\n"); 
-                               answer = errno;
-                       } else {
-                               edg_wll_ll_log(LOG_INFO,"o.k.\n");
-                               if (count == 0) {
-                                       edg_wll_ll_log(LOG_DEBUG,"Waking up, timeout expired.\n");
-                                       answer = EAGAIN;
-                               } else {
-                                       edg_wll_ll_log(LOG_DEBUG,"Confirmation received, waking up.\n");
-                               }
-                       }
-               }
-       } else {
-               edg_wll_ll_log(LOG_NOTICE,"Not sending via IPC.\n");
-       }
-
-edg_wll_log_proto_server_end:
-       /* if not sent already, send the answer back to client */
-       if (!answer_sent) {
-               answer = send_answer_back(con,answer,&timeout);
-       } 
-       /* clean */
-       edg_wll_FreeContext(context);
-       if (name_esc) free(name_esc);
-       if (dglllid) free(dglllid);
-       if (dguser) free(dguser);
-       if (jobId) free(jobId);
-       if (msg) free(msg);
-       if (event) free(event);
-
-       edg_wll_ll_log(LOG_INFO,"Done.\n");
-
-       return answer;
-
-edg_wll_log_proto_server_end_1:
-       if (event->any.priority) {
-               close(confirm_sock);
-               unlink(confirm_sock_name);
-       }       
-       goto edg_wll_log_proto_server_end;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_log_proto_server_failure - handle protocol failures on the server side
- *
- * Returns: errno
- *
- *----------------------------------------------------------------------
- */
-int edg_wll_log_proto_server_failure(int code, edg_wll_GssStatus *gss_code, const char *text)
-{
-       const char      *func = "edg_wll_log_proto_server()";
-        int             ret = 0;
-
-       if(code>0) {
-                return(0);
-       }
-       switch(code) {
-               case EDG_WLL_GSS_ERROR_EOF: 
-                       edg_wll_ll_log(LOG_ERR,"%s: %s, EOF occured\n", func, text);    
-                       ret = EAGAIN;
-                       break;
-               case EDG_WLL_GSS_ERROR_TIMEOUT: 
-                       edg_wll_ll_log(LOG_ERR,"%s: %s, timeout expired\n", func, text);        
-                       ret = EAGAIN;
-                       break;
-               /* XXX DK: co tenhle break??: */
-               case EDG_WLL_GSS_ERROR_ERRNO: perror("edg_wll_gss_read()"); break;
-                       edg_wll_ll_log(LOG_ERR,"%s: %s, system error occured\n", func, text);   
-                       ret = EAGAIN;
-                       break;
-               case EDG_WLL_GSS_ERROR_GSS:
-                       {
-                          char *gss_err;
-
-                          edg_wll_gss_get_error(gss_code, "GSS error occured", &gss_err);
-                          edg_wll_ll_log(LOG_ERR,"%s: %s, %s\n", func, text, gss_err);
-                          free(gss_err);
-                          ret = EAGAIN;
-                          break;
-                       }
-               default:
-                       edg_wll_ll_log(LOG_ERR,"%s: %s, unknown error occured\n");
-                       break;
-       }
-       return ret;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ll_log_init - initialize the logging level
- *
- *----------------------------------------------------------------------
- */
-void edg_wll_ll_log_init(int level) {
-       edg_wll_ll_log_level = level;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * edg_wll_ll_log - print to stderr according to logging level
- *   serious messages are also written to syslog
- *
- *----------------------------------------------------------------------
- */
-void edg_wll_ll_log(int level, const char *fmt, ...) {
-    char *err_text;
-       va_list fmt_args;
-
-       va_start(fmt_args, fmt);
-    vasprintf(&err_text, fmt, fmt_args);
-    va_end(fmt_args);
-
-       if(level <= edg_wll_ll_log_level) 
-               fprintf(stderr, "[%d] %s", (int) getpid(), err_text);
-       if(level <= LOG_ERR) {
-        openlog("edg-wl-logd", LOG_PID | LOG_CONS, LOG_DAEMON);
-               syslog(level, "%s", err_text);
-               closelog();
-       }
-
-    if(err_text) free(err_text);
-
-    return;
-}
diff --git a/org.glite.lb.logger/src/logd_proto.h b/org.glite.lb.logger/src/logd_proto.h

deleted file mode 100644 (file)

index b8e167e..0000000
--- a/org.glite.lb.logger/src/logd_proto.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_LOCALLOGGER_LOGD_PROTO_H__
-#define __EDG_WORKLOAD_LOGGING_LOCALLOGGER_LOGD_PROTO_H__
-
-#ident "$Header$"
-
-/**
- * \file edg/workload/logging/locallogger/logd_proto.h
- * \brief server part of the logging protocol
- * \note private
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <syslog.h>
-
-#include "glite/lb/log_proto.h"
-#include "glite/lb/lb_gss.h"
-
-int edg_wll_log_proto_server(edg_wll_GssConnection *con, char *name, char *prefix, int noipc, int noparse);
-int edg_wll_log_proto_server_failure(int code, edg_wll_GssStatus *gss_code, const char *text);
-
-#define SYSTEM_ERROR(my_err) { \
-       if (errno !=0 ) \
-               edg_wll_ll_log(LOG_ERR,"%s: %s\n",my_err,strerror(errno)); \
-       else \
-               edg_wll_ll_log(LOG_ERR,"%s\n",my_err); }
-
-/* locallogger daemon error handling */
-
-extern int edg_wll_ll_log_level;
-void edg_wll_ll_log_init(int level);
-void edg_wll_ll_log(int level, const char *fmt, ...);
-
-
-/* fcntl defaults */
-
-#define FCNTL_ATTEMPTS         5
-#define FCNTL_TIMEOUT          1
-
-
-/* connect defaults */
-
-#define CONNECT_ATTEMPTS       50
-#define CONNECT_TIMEOUT                10
-
-
-/* locallogger daemon listen and connect functions prototypes */
-
-int do_listen(int port);
-int do_connect(char *hostname, int port);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_LOCALLOGGER_LOGD_PROTO_H__ */
diff --git a/org.glite.lb.logger/src/queue_mgr.c b/org.glite.lb.logger/src/queue_mgr.c

deleted file mode 100644 (file)

index abae1f3..0000000
--- a/org.glite.lb.logger/src/queue_mgr.c
+++ /dev/null
@@ -1,244 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "glite/lb/consumer.h"
-
-#include "interlogd.h"
-
-struct queue_list {
-  struct event_queue *queue;
-  char   *dest;
-  struct queue_list *next;
-};
-
-static struct event_queue *log_queue;
-static struct queue_list  *queues;
-
-
-static 
-int
-queue_list_create()
-{
-  queues = NULL;
-
-  return(0);
-}
-
-
-static
-int
-queue_list_find(struct queue_list *ql, const char *dest, struct queue_list **el, struct queue_list **prev)
-{
-  struct queue_list *q, *p;
-
-  assert(el != NULL);
-
-  *el = NULL;
-  if(prev)
-    *prev = NULL;
-
-  if(ql == NULL) 
-    return(0);
-
-  q = NULL;
-  p = ql;
-
-  while(p) {
-    if(strcmp(p->dest, dest) == 0) {
-      *el = p;
-      if(prev)
-       *prev = q;
-      return(1);
-    }
-
-    q = p;
-    p = p->next;
-  };
-
-  return(0);
-}
-
-
-static
-int
-queue_list_add(struct queue_list **ql, const char *dest, struct event_queue *eq)
-{
-  struct queue_list *el;
-  
-  assert(dest != NULL);
-  assert(eq != NULL);
-  assert(ql != NULL);
-
-  el = malloc(sizeof(*el));
-  if(el == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "queue_list_add: not enough room for new queue");
-    return(-1);
-  }
-
-  el->dest = strdup(dest);
-  if(el->dest == NULL) {
-    free(el);
-    set_error(IL_NOMEM, ENOMEM, "queue_list_add: not enough memory for new queue");
-    return(-1);
-  }
-  el->queue = eq;
-  el->next = queues;
-  *ql = el;
-  return 0;
-}
-
-
-/*
-static
-int
-queue_list_remove(struct queue_list *el, struct queue_list *prev)
-{
-  assert(el != NULL);
-
-  if(prev) 
-    prev->next = el->next;
-  else
-    queues = el->next;
-
-  free(el);
-  return(1);
-}
-*/
-
-
-#if !defined(IL_NOTIFICATIONS)
-static
-char *
-jobid2dest(edg_wlc_JobId jobid)
-{
-  char *server_name,*out;
-  unsigned int server_port;
-
-  if (!jobid) {
-    set_error(IL_PROTO, EDG_WLL_ERROR_PARSE_BROKEN_ULM, "jobid2dest: invalid job id");
-    return(NULL);
-  }
-  edg_wlc_JobIdGetServerParts(jobid,&server_name,&server_port);
-
-  asprintf(&out,"%s:%d",server_name,server_port);
-  free(server_name);
-  if(!out)
-    set_error(IL_SYS, ENOMEM, "jobid2dest: error creating server name");
-  return(out);
-}
-#endif
-
-struct event_queue *
-queue_list_get(char *job_id_s)
-{
-  char *dest;
-  struct queue_list *q;
-  struct event_queue *eq;
-#if !defined(IL_NOTIFICATIONS)
-  IL_EVENT_ID_T job_id;
-
-  if(job_id_s == NULL || strcmp(job_id_s, "default") == 0)
-    return(log_queue);
-
-  if(edg_wlc_JobIdParse(job_id_s, &job_id)) {
-    set_error(IL_LBAPI, EDG_WLL_ERROR_PARSE_BROKEN_ULM, "queue_list_get: invalid job id");
-    return(NULL);
-  }
-
-  dest = jobid2dest(job_id);
-  edg_wlc_JobIdFree(job_id);
-#else
-  dest = job_id_s;
-#endif
-
-  if(dest == NULL) 
-    return(NULL);
-  
-  if(queue_list_find(queues, dest, &q, NULL)) {
-#if !defined(IL_NOTIFICATIONS)
-    free(dest);
-#endif
-    return(q->queue);
-  } else {
-    eq = event_queue_create(dest);
-    if(eq)
-      queue_list_add(&queues, dest, eq);
-#if !defined(IL_NOTIFICATIONS)
-    free(dest);
-#endif
-    return(eq);
-  }
-}
-
-
-int
-queue_list_is_log(struct event_queue *eq)
-{
-  return(eq == queue_list_get(NULL));
-}
-
-
-int
-queue_list_init(char *ls)
-{
-#if !defined(IL_NOTIFICATIONS)
-  /* create queue for log server */
-  log_queue = event_queue_create(ls);
-  if(log_queue == NULL)
-    return(-1);
-#endif
-
-  return(queue_list_create());
-}
-
-
-static struct queue_list *current;
-
-
-struct event_queue *
-queue_list_first()
-{
-  current = queues;
-  return(current ? current->queue : NULL);
-}
-
-
-struct event_queue *
-queue_list_next()
-{
-  current = current ? current->next : NULL;
-  return(current ? current->queue : NULL);
-}
-
-#if defined(IL_NOTIFICATIONS)
-
-static struct queue_list  *notifid_map = NULL;
-
-struct event_queue *
-notifid_map_get_dest(const char * notif_id)
-{
-       struct queue_list *q = NULL;
-
-       queue_list_find(notifid_map, notif_id, &q, NULL);
-       return(q ? q->queue : NULL);
-}
-
-
-/* returns 1 if mapping was changed, 0 if new one had to be created, -1 on error */
-int
-notifid_map_set_dest(const char *notif_id, struct event_queue *eq)
-{
-       struct queue_list *q;
-
-       if(queue_list_find(notifid_map, notif_id, &q, NULL)) {
-               q->queue = eq;
-               return(1);
-       } else {
-               return(queue_list_add(&notifid_map, notif_id, eq));
-       }
-}
-
-#endif
diff --git a/org.glite.lb.logger/src/queue_thread.c b/org.glite.lb.logger/src/queue_thread.c

deleted file mode 100644 (file)

index 5eeff30..0000000
--- a/org.glite.lb.logger/src/queue_thread.c
+++ /dev/null
@@ -1,357 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-
-#include "interlogd.h"
-
-static 
-void 
-queue_thread_cleanup(void *q)
-{
-       struct event_queue *eq = (struct event_queue *)q;
-
-       il_log(LOG_WARNING, "thread %d exits\n", eq->thread_id);
-
-       /* unlock all held locks */
-       /* FIXME: check that the thread always exits when holding these locks;
-          unlock them at appropriate places if this condition is not met  
-          event_queue_unlock(eq);
-          event_queue_cond_unlock(eq);
-       */
-  
-       /* clear thread id */
-       eq->thread_id = 0;
-}
-
-
-static
-void *
-queue_thread(void *q)
-{
-       struct event_queue *eq = (struct event_queue *)q;
-       int ret, exit, flushing;
-
-       if(init_errors(0) < 0) {
-               il_log(LOG_ERR, "Error initializing thread specific data, exiting!");
-               pthread_exit(NULL);
-       }
-  
-       pthread_cleanup_push(queue_thread_cleanup, q); 
-
-       event_queue_cond_lock(eq);
-
-       exit = 0;
-       while(!exit) {
-    
-               clear_error();
-
-               /* if there are no events, wait for them */
-               ret = 0;
-               while (event_queue_empty(eq) 
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-                      && ((flushing=eq->flushing) != 1)
-#endif
-                       ) {
-                       ret = event_queue_wait(eq, 0);
-                       if(ret < 0) {
-                               /* error waiting */
-                               il_log(LOG_ERR, "queue_thread: %s\n", error_get_msg());
-                               event_queue_cond_unlock(eq);
-                               pthread_exit((void*)-1);
-                       }
-               }  /* END while(empty) */
-    
-               il_log(LOG_DEBUG, "  attempting delivery to %s:%d\n", eq->dest_name, eq->dest_port);
-
-               /* allow other threads to signal us, ie. insert new events while
-                * we are sending or request flush operation
-                */
-               event_queue_cond_unlock(eq);
-               
-               /* connect to server */
-               if((ret=event_queue_connect(eq)) == 0) {
-                       /* not connected */
-                       if(error_get_maj() != IL_OK)
-                               il_log(LOG_ERR, "queue_thread: %s\n", error_get_msg());
-#if defined(IL_NOTIFICATIONS)
-                       il_log(LOG_INFO, "    could not connect to client %s, waiting for retry\n", eq->dest_name);
-#else
-                       il_log(LOG_INFO, "    could not connect to bookkeeping server %s, waiting for retry\n", eq->dest_name);
-#endif
-               } else {
-                       /* connected, send events */
-                       switch(ret=event_queue_send(eq)) {
-                               
-                       case 0:
-                               /* there was an error and we still have events to send */
-                               if(error_get_maj() != IL_OK)
-                                       il_log(LOG_ERR, "queue_thread: %s\n", error_get_msg());
-                               il_log(LOG_DEBUG, "  events still waiting\n");
-                               break;
-                               
-                       case 1:
-                               /* hey, we are done for now */
-                               il_log(LOG_DEBUG, "  all events for %s sent\n", eq->dest_name);
-                               break;
-                               
-                       default:
-                               /* internal error */
-                               il_log(LOG_ERR, "queue_thread: %s\n", error_get_msg());
-                               exit = 1;      
-                               break;
-                               
-                       } /* switch */
-                       
-                       /* we are done for now anyway, so close the queue */
-                               event_queue_close(eq);
-               } 
-
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-               if(pthread_mutex_lock(&flush_lock) < 0)
-                       abort();
-               event_queue_cond_lock(eq);
-
-               /* Check if we are flushing and if we are, report status to master */
-               if(flushing == 1) {
-                       il_log(LOG_DEBUG, "    flushing mode detected, reporting status\n");
-                       /* 0 - events waiting, 1 - events sent, < 0 - some error */
-                       eq->flush_result = ret;
-                       eq->flushing = 2;
-                       if(pthread_cond_signal(&flush_cond) < 0)
-                               abort();
-               }
-               if(pthread_mutex_unlock(&flush_lock) < 0)
-                       abort();
-#else
-               event_queue_cond_lock(eq);
-#endif
-
-               /* if there was some error with server, sleep for a while */
-               /* iff !event_queue_empty() */
-               if(ret == 0) 
-                       event_queue_sleep(eq);
-
-               if(exit) {
-                       /* we have to clean up before exiting */
-                       event_queue_cond_unlock(eq);
-               }
-    
-       } /* while */
-
-       pthread_cleanup_pop(1);
-
-       return(eq);
-}
-
-
-int
-event_queue_create_thread(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       /* if there is a thread already, just return */
-       if(eq->thread_id > 0)
-               return(0);
-
-       /* create the thread itself */
-       if(pthread_create(&eq->thread_id, NULL, queue_thread, eq) < 0) {
-               eq->thread_id = 0;
-               set_error(IL_SYS, errno, "event_queue_create_thread: error creating new thread");
-               return(-1);
-       }
-
-       /* the thread is never going to be joined */
-       pthread_detach(eq->thread_id);
-
-       return(1);
-}
-
-
-
-int
-event_queue_lock(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_rwlock_wrlock(&eq->update_lock)) {
-               /*** abort instead, this is too serious
-               set_error(IL_SYS, errno, "event_queue_lock: error acquiring write lock");
-               return(-1);
-               */
-               abort();
-       }
-
-       return(0);
-}
-
-
-int
-event_queue_lock_ro(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_rwlock_rdlock(&eq->update_lock)) {
-               /*** abort instead, this is too serious
-               set_error(IL_SYS, errno, "event_queue_lock_ro: error acquiring read lock");
-               return(-1);
-               */
-               abort();
-       }
-
-       return(0);
-}
-
-
-int
-event_queue_unlock(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_rwlock_unlock(&eq->update_lock)) {
-               /*** abort instead, this is too serious
-               set_error(IL_SYS, errno, "event_queue_unlock: error releasing lock");
-               return(-1);
-               */
-               abort();
-       }
-
-       return(0);
-}
-
-
-int
-event_queue_signal(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_cond_signal(&eq->ready_cond)) {
-               /*** abort instead, this is too serious
-               set_error(IL_SYS, errno, "event_queue_signal: error signaling queue thread");
-               return(-1);
-               */
-               abort();
-       }
-       return(0);
-}
-
-
-int
-event_queue_wait(struct event_queue *eq, int timeout)
-{
-       assert(eq != NULL);
-
-       if(timeout) {
-               struct timespec endtime;
-               int  ret = 0;
-
-               endtime.tv_sec = time(NULL) + timeout;
-               endtime.tv_nsec = 0;
-               
-               if((ret=pthread_cond_timedwait(&eq->ready_cond, &eq->cond_lock, &endtime))) {
-                       if(ret == ETIMEDOUT) 
-                               return(1);
-                       /*** abort instead, this is too serious
-                       set_error(IL_SYS, errno, "event_queue_wait: error waiting on condition variable");
-                       return(-1);
-                       */
-                       abort();
-               }
-       } else {
-               if(pthread_cond_wait(&eq->ready_cond, &eq->cond_lock)) {
-                       /*** abort instead, this is too serious
-                       set_error(IL_SYS, errno, "event_queue_wait: error waiting on condition variable");
-                       return(-1);
-                       */
-                       abort();
-               }
-       }
-       return(0);
-}
-
-
-int event_queue_sleep(struct event_queue *eq)
-{
-#if defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH)
-       struct timespec ts;
-       struct timeval tv;
-       int ret;
-
-       assert(eq != NULL);
-
-       gettimeofday(&tv, NULL);
-       ts.tv_sec = tv.tv_sec + eq->timeout;
-       ts.tv_nsec = 1000 * tv.tv_usec;
-       if((ret=pthread_cond_timedwait(&eq->flush_cond, &eq->cond_lock, &ts)) < 0) {
-               if(ret != ETIMEDOUT) {
-                       /*** abort instead, this is too serious
-                       set_error(IL_SYS, errno, "event_queue_sleep: error waiting on condition");
-                       return(-1);
-                       */
-                       abort();
-               }
-       }
-#else
-       sleep(eq->timeout);
-#endif
-       return(0);
-}
-
-
-#if defined(INTERLOGD_HANDLE_CMD)
-int event_queue_wakeup(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_cond_signal(&eq->ready_cond)) {
-               /**
-               set_error(IL_SYS, errno, "event_queue_wakeup: error signaling queue thread");
-               return(-1);
-               */
-               abort();
-       }
-#if defined(INTERLOGD_FLUSH)
-       if(pthread_cond_signal(&eq->flush_cond)) {
-               /**
-               set_error(IL_SYS, errno, "event_queue_wakeup: error signaling queue thread");
-               return(-1);
-               */
-               abort();
-       }
-#endif
-       return(0);
-}
-#endif
-
-int event_queue_cond_lock(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_mutex_lock(&eq->cond_lock)) {
-               /**
-               set_error(IL_SYS, errno, "event_queue_cond_lock: error locking condition mutex");
-               return(-1);
-               */
-               abort();
-       }
-
-       return(0);
-}
-
-
-int event_queue_cond_unlock(struct event_queue *eq)
-{
-       assert(eq != NULL);
-
-       if(pthread_mutex_unlock(&eq->cond_lock)) {
-               /**
-               set_error(IL_SYS, errno, "event_queue_cond_unlock: error locking condition mutex");
-               return(-1);
-               */
-               abort();
-       }
-
-       return(0);
-}
diff --git a/org.glite.lb.logger/src/recover.c b/org.glite.lb.logger/src/recover.c

deleted file mode 100644 (file)

index ed31186..0000000
--- a/org.glite.lb.logger/src/recover.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <assert.h>
-#include <errno.h>
-
-#include "interlogd.h"
-
-extern char *file_prefix;
-
-extern time_t cert_mtime, key_mtime;
-
-void *
-recover_thread(void *q)
-{
-       if(init_errors(0) < 0) {
-               il_log(LOG_ERR, "Error initializing thread specific data, exiting!");
-               pthread_exit(NULL);
-       }
-
-       while(1) {
-               il_log(LOG_INFO, "Looking up event files...\n");
-               if(event_store_init(file_prefix) < 0) {
-                       il_log(LOG_ERR, "recover_thread: %s\n", error_get_msg());
-                       exit(1);
-               }
-               if(event_store_recover_all() < 0) {
-                       il_log(LOG_ERR, "recover_thread: %s\n", error_get_msg());
-                       exit(1);
-               }
-               if(event_store_cleanup() < 0) {
-                       il_log(LOG_ERR, "recover_thread: %s\n", error_get_msg());
-                       exit(1);
-               }
-               il_log(LOG_INFO, "Checking for new certificate...\n");
-               if(pthread_mutex_lock(&cred_handle_lock) < 0)
-                       abort();
-               if (edg_wll_gss_watch_creds(cert_file, &cert_mtime) > 0) {
-                       gss_cred_id_t new_cred_handle = GSS_C_NO_CREDENTIAL;
-                       OM_uint32 min_stat;
-                       int ret;
-
-                       ret = edg_wll_gss_acquire_cred_gsi(cert_file,key_file, 
-                               &new_cred_handle, NULL, NULL);
-                       if (new_cred_handle != GSS_C_NO_CREDENTIAL) {
-                               gss_release_cred(&min_stat, &cred_handle);
-                               cred_handle = new_cred_handle;
-                               il_log(LOG_INFO, "New certificate found and deployed.\n");
-                       }
-               }
-               if(pthread_mutex_unlock(&cred_handle_lock) < 0)
-                       abort();
-               sleep(INPUT_TIMEOUT);
-       }
-}
diff --git a/org.glite.lb.logger/src/send_event.c b/org.glite.lb.logger/src/send_event.c

deleted file mode 100644 (file)

index 83de250..0000000
--- a/org.glite.lb.logger/src/send_event.c
+++ /dev/null
@@ -1,325 +0,0 @@
-#ident "$Header$"
-
-#include <assert.h>
-#include <errno.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-
-/*
- *   - L/B server protocol handling routines 
- */
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/il_string.h"
-#include "glite/lb/context.h"
-
-#include "interlogd.h"
-
-#if defined(INTERLOGD_EMS) || (defined(INTERLOGD_HANDLE_CMD) && defined(INTERLOGD_FLUSH))
-/* 
- * Send confirmation to client.
- *
- */
-int
-send_confirmation(long lllid, int code)
-{
-  struct sockaddr_un saddr;
-  char sname[256];
-  int  sock, ret;
-
-  if((sock=socket(PF_UNIX, SOCK_STREAM, 0)) < 0) {
-    set_error(IL_SYS, errno, "send_confirmation: error creating socket");
-    return(-1);
-  }
-
-  if(fcntl(sock, F_SETFL, O_NONBLOCK) < 0) {
-         set_error(IL_SYS, errno, "send_confirmation: error setting socket options");
-         return(-1);
-  }
-
-  ret = 0;
-  memset(&saddr, 0, sizeof(saddr));
-  saddr.sun_family = AF_UNIX;
-  snprintf(sname, sizeof(sname), "/tmp/dglogd_sock_%ld", lllid);
-  strcpy(saddr.sun_path, sname);
-  if(connect(sock, (struct sockaddr *)&saddr, sizeof(saddr.sun_path)) < 0) {
-    set_error(IL_SYS, errno, "send_confirmation: error connecting socket");
-    goto out;
-  }
-
-  if(send(sock, &code, sizeof(code), MSG_NOSIGNAL) < 0) {
-    set_error(IL_SYS, errno, "send_confirmation: error sending data");
-    goto out;
-  }
-  ret = 1;
-
-  il_log(LOG_DEBUG, "  sent code %d back to client\n", code);
-
- out:
-  close(sock);
-  return(ret);
-}
-
-
-static 
-int
-confirm_msg(struct server_msg *msg, int code, int code_min)
-{
-       switch(code) {
-       case LB_OK:
-               code_min = 0;
-               break;
-       case LB_DBERR:
-               /* code_min already contains apropriate error code */
-               break;
-       case LB_PROTO:
-               code_min = EDG_WLL_IL_PROTO;
-               break;
-       default:
-               code_min = EDG_WLL_IL_SYS;
-               break;
-       }
-  
-       return(send_confirmation(msg->receipt_to, code_min));
-}
-#endif
-
-
-/*
- * Read reply from server.
- *  Returns: -1 - error reading message, 
- *         code > 0 - error code from server
- */
-static
-int 
-get_reply(struct event_queue *eq, char **buf, int *code_min)
-{
-  char buffer[17];
-  char *msg, *p;
-  int len, code, l;
-  edg_wll_GssConnection *gss;
-  struct timeval tv;
-  edg_wll_GssStatus gss_stat;
-
-  gss = &eq->gss;
-
-  /* get message header */
-  tv.tv_sec = TIMEOUT;
-  tv.tv_usec = 0;
-  code = edg_wll_gss_read_full(gss, buffer, 17, &tv, &len, &gss_stat);
-  if(code < 0) {
-    char *gss_err = NULL;
-
-    if (code == EDG_WLL_GSS_ERROR_GSS)
-       edg_wll_gss_get_error(&gss_stat, "get_reply (header)", &gss_err);
-    set_error(IL_DGGSS, code,
-             (code == EDG_WLL_GSS_ERROR_GSS) ? gss_err : "get_reply (header)");
-    if (gss_err) free(gss_err);
-    return(-1);
-  }
-    
-  buffer[16] = 0;
-
-  sscanf(buffer, "%d", &len);
-  if(len > MAXLEN) {
-    set_error(IL_PROTO, LB_NOMEM, "get_reply: error reading reply length");
-    return(-1);
-  }
-
-  /* allocate room for message body */
-  if((msg = malloc(len)) == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "get_reply: no room for message body");
-    return(-1);
-  }
-
-  /* read all the data */
-  tv.tv_sec = TIMEOUT;
-  tv.tv_usec = 0;
-  code = edg_wll_gss_read_full(gss, msg, len, &tv, &l, &gss_stat);
-  if(code < 0) {
-    char *gss_err = NULL;
-
-    if (code == EDG_WLL_GSS_ERROR_GSS)
-       edg_wll_gss_get_error(&gss_stat, "get_reply (body)", &gss_err);
-    set_error(IL_DGGSS, code,
-             (code == EDG_WLL_GSS_ERROR_GSS) ? gss_err : "get_reply (body)"); 
-    if (gss_err) free(gss_err);
-    return(-1);
-  }
-
-  p = msg;
-  p = get_int(p, &code);
-  if(p == NULL) {
-    set_error(IL_PROTO, LB_PROTO, "get_reply: error receiving result code");
-    free(msg);
-    return(-1);
-  }
-  p = get_int(p, code_min);
-  if(p == NULL) {
-    set_error(IL_PROTO, LB_PROTO, "get_reply: error receiving result code minor");
-    free(msg);
-    return(-1);
-  }
-  p = get_string(p, buf);
-  if(p == NULL) {
-    if(*buf) {
-      free(*buf);
-      *buf = NULL;
-    }
-    free(msg);
-    set_error(IL_PROTO, LB_PROTO, "get_reply: error receiving result string");
-    return(-1);
-  }
-  free(msg);
-  return(code);
-}
-
-
-
-/*
- *  Returns: 0 - not connected, timeout set, 1 - OK
- */
-int 
-event_queue_connect(struct event_queue *eq)
-{
-  int ret;
-  struct timeval tv;
-  edg_wll_GssStatus gss_stat;
-
-  assert(eq != NULL);
-
-  if(eq->gss.context == GSS_C_NO_CONTEXT) {
-
-    tv.tv_sec = TIMEOUT;
-    tv.tv_usec = 0;
-    if(pthread_mutex_lock(&cred_handle_lock) < 0)
-           abort();
-    il_log(LOG_DEBUG, "    trying to connect to %s:%d\n", eq->dest_name, eq->dest_port);
-    ret = edg_wll_gss_connect(cred_handle, eq->dest_name, eq->dest_port, &tv, &eq->gss, &gss_stat);
-    if(pthread_mutex_unlock(&cred_handle_lock) < 0)
-           abort();
-    if(ret < 0) {
-      char *gss_err = NULL;
-
-      if (ret == EDG_WLL_GSS_ERROR_GSS)
-        edg_wll_gss_get_error(&gss_stat, "event_queue_connect: edg_wll_gss_connect", &gss_err);
-      set_error(IL_DGGSS, ret,
-               (ret == EDG_WLL_GSS_ERROR_GSS) ? gss_err : "event_queue_connect: edg_wll_gss_connect");
-      if (gss_err) free(gss_err);
-      eq->gss.context = GSS_C_NO_CONTEXT;
-      eq->timeout = TIMEOUT;
-      return(0);
-    }
-  }
-
-  return(1);
-}
-
-
-int
-event_queue_close(struct event_queue *eq)
-{
-  assert(eq != NULL);
-
-  if(eq->gss.context != GSS_C_NO_CONTEXT) {
-    edg_wll_gss_close(&eq->gss, NULL);
-    eq->gss.context = GSS_C_NO_CONTEXT;
-  }
-  return(0);
-}
-
-
-/* 
- * Send all events from the queue.
- *   Returns: -1 - system error, 0 - not send, 1 - queue empty
- */
-int 
-event_queue_send(struct event_queue *eq)
-{
-  assert(eq != NULL);
-
-  if(eq->gss.context == GSS_C_NO_CONTEXT)
-    return(0);
-
-  /* feed the server with events */
-  while (!event_queue_empty(eq)) {
-    struct server_msg *msg;
-    char *rep;
-    int  ret, code, code_min, bytes_sent;
-    struct timeval tv;
-    edg_wll_GssStatus gss_stat;
-
-    clear_error();
-
-    if(event_queue_get(eq, &msg) < 0) 
-      return(-1);
-
-    il_log(LOG_DEBUG, "    trying to deliver event at offset %d for job %s\n", msg->offset, msg->job_id_s);
-
-    tv.tv_sec = TIMEOUT;
-    tv.tv_usec = 0;
-    ret = edg_wll_gss_write_full(&eq->gss, msg->msg, msg->len, &tv, &bytes_sent, &gss_stat);
-    if(ret < 0) {
-      eq->timeout = TIMEOUT;
-      return(0);
-    }
-    
-    if((code = get_reply(eq, &rep, &code_min)) < 0) {
-      /* could not get the reply properly, so try again later */
-      il_log(LOG_ERR, "  error reading server %s reply:\n    %s\n", eq->dest_name, error_get_msg());
-      eq->timeout = TIMEOUT;
-      return(0);
-    }
-    
-    il_log(LOG_DEBUG, "    event sent, server %s replied with %d, %s\n", eq->dest_name, code, rep);
-    free(rep);
-
-    /* the reply is back here */
-    switch(code) {
-      
-           /* NOT USED: case LB_TIME: */
-    case LB_NOMEM:
-           /* NOT USED: case LB_SYS:  */
-           /* NOT USED: case LB_AUTH: */
-      /* non fatal errors (for us) */
-      eq->timeout = TIMEOUT;
-      return(0);
-       
-    case LB_OK:
-      /* event succesfully delivered */
-      
-    default: /* LB_DBERR, LB_PROTO */
-      /* the event was not accepted by the server */
-      /* update the event pointer */
-      if(event_store_commit(msg->es, msg->ev_len, queue_list_is_log(eq)) < 0) 
-       /* failure committing message, this is bad */
-       return(-1);
-      /* if we have just delivered priority message from the queue, send confirmation */
-      ret = 1;
-#if defined(INTERLOGD_EMS)
-      if(server_msg_is_priority(msg) &&
-        ((ret=confirm_msg(msg, code, code_min)) < 0))
-       return(ret);
-#endif
-
-      if((ret == 0) &&
-        (error_get_maj() != IL_OK))
-         il_log(LOG_ERR, "send_event: %s\n", error_get_msg());
-       
-      event_queue_remove(eq);
-      break;
-      
-    } /* switch */
-  } /* while */
-
-  return(1);
-
-} /* send_events */
-
-
diff --git a/org.glite.lb.logger/src/server_msg.c b/org.glite.lb.logger/src/server_msg.c

deleted file mode 100644 (file)

index aa7e75c..0000000
--- a/org.glite.lb.logger/src/server_msg.c
+++ /dev/null
@@ -1,217 +0,0 @@
-#ident "$Header$"
-
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-
-#include "interlogd.h"
-#include "glite/lb/il_string.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/context.h"
-
-static
-int 
-create_msg(char *event, char **buffer, long *receipt)
-{
-  char *p;  int  len;
-  char *ucs = "michal";
-  
-  *receipt = 0;
-
-#if defined(INTERLOGD_EMS)
-  /* find DG.LLLID */
-  if(strncmp(event, "DG.LLLID",8) == 0 ||
-       strncmp(event, "DG.LLPID",8) == 0) { /* 8 == strlen("DG.LLLID") */
-
-    /* skip the key */
-    event += 9;  /* 9 = strlen("DG.LLLID=") */
-    *receipt = atol(event);
-    p = strchr(event, ' ');
-    if(!p) {
-      set_error(IL_LBAPI, EDG_WLL_ERROR_PARSE_BROKEN_ULM, 
-               "create_msg: error parsing locallogger PID");
-      return(-1);
-    }
-    /* skip the value */
-    event = p + 1;
-
-    /* find DG.PRIORITY */
-    p = strstr(event, "DG.PRIORITY");
-    if(p) {
-      int n;
-      
-      p += 12; /* skip the key and = */
-      if((n = atoi(p)) == 0) {
-       /* normal asynchronous message */
-       *receipt = 0;
-      }
-    } else {
-      /* could not find priority key */
-      *receipt = 0;
-    }
-    
-  } else {
-    /* could not find local logger PID, confirmation can not be sent */
-    *receipt = 0;
-  }
-#endif
-
-  /* allocate enough room to hold the message */
-  len = 17 + len_string(ucs) + len_string(event);
-  if((*buffer = malloc(len)) == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "create_msg: out of memory allocating message");
-    return(-1);
-  }
-
-  p = *buffer;
-
-  /* write header */
-  sprintf(p, "%16d\n", len - 17);
-  p += 17;
-
-  /* write rest of the message */
-  p = put_string(p, ucs);
-  p = put_string(p, event);
-
-  return(p - *buffer);
-
-}
-
-
-struct server_msg *
-server_msg_create(char *event, long offset)
-{
-  struct server_msg *msg;
-
-  msg = malloc(sizeof(*msg));
-  if(msg == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "server_msg_create: out of memory allocating message");
-    return(NULL);
-  }
-
-  if(server_msg_init(msg, event) < 0) {
-    server_msg_free(msg);
-    return(NULL);
-  }
-  msg->offset = offset;
-
-  return(msg);
-}
-
-
-struct server_msg *
-server_msg_copy(struct server_msg *src)
-{
-  struct server_msg *msg;
-
-  msg = malloc(sizeof(*msg));
-  if(msg == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "server_msg_copy: out of memory allocating message");
-    return(NULL);
-  }
-  
-  msg->msg = malloc(src->len);
-  if(msg->msg == NULL) {
-    set_error(IL_NOMEM, ENOMEM, "server_msg_copy: out of memory allocating server message");
-    server_msg_free(msg);
-    return(NULL);
-  }
-  msg->len = src->len;
-  memcpy(msg->msg, src->msg, src->len);
-
-  msg->job_id_s = strdup(src->job_id_s);
-  msg->ev_len = src->ev_len;
-  msg->es = src->es;
-  msg->receipt_to = src->receipt_to;
-  msg->offset = src->offset;
-#if defined(IL_NOTIFICATIONS)
-  msg->dest_name = strdup(src->dest_name);
-  msg->dest_port = src->dest_port;
-  msg->dest = strdup(src->dest);
-#endif
-  return(msg);
-}
-
-
-int
-server_msg_init(struct server_msg *msg, char *event)
-{
-#if defined(IL_NOTIFICATIONS)
-       edg_wll_Context context;
-       edg_wll_Event *notif_event;
-       int ret;
-#endif
-
-       assert(msg != NULL);
-
-       memset(msg, 0, sizeof(*msg));
-
-
-#if defined(IL_NOTIFICATIONS)
-       edg_wll_InitContext(&context);
-
-       /* parse the notification event */
-       if((ret=edg_wll_ParseNotifEvent(context, event, &notif_event))) {
-               set_error(IL_LBAPI, ret, "server_msg_init: error parsing notification event");
-               return(-1);
-       }
-       /* FIXME: check for allocation error */
-       if(notif_event->notification.dest_host && 
-          (strlen(notif_event->notification.dest_host) > 0)) {
-               msg->dest_name = strdup(notif_event->notification.dest_host);
-               msg->dest_port = notif_event->notification.dest_port;
-               asprintf(&msg->dest, "%s:%d", msg->dest_name, msg->dest_port);
-       }
-       msg->job_id_s = edg_wll_NotifIdUnparse(notif_event->notification.notifId);
-       if(notif_event->notification.jobstat && 
-          (strlen(notif_event->notification.jobstat) > 0)) {
-               msg->len = create_msg(event, &msg->msg, &msg->receipt_to);
-       }
-       edg_wll_FreeEvent(notif_event);
-       free(notif_event);
-       if(msg->len < 0) {
-               return(-1);
-       }
-#else
-       msg->len = create_msg(event, &msg->msg, &msg->receipt_to);
-       if(msg->len < 0) {
-               return(-1);
-       }
-       msg->job_id_s = edg_wll_GetJobId(event);
-#endif
-       /* remember to add event separator to the length */
-       msg->ev_len = strlen(event) + 1;
-
-       if(msg->job_id_s == NULL) {
-               set_error(IL_LBAPI, EDG_WLL_ERROR_PARSE_BROKEN_ULM, "server_msg_init: error getting id");
-               return(-1);
-       }
-       
-       return(0);
-}
-
-
-int
-server_msg_is_priority(struct server_msg *msg)
-{
-  assert(msg != NULL);
-
-  return(msg->receipt_to != 0);
-}
-
-
-int
-server_msg_free(struct server_msg *msg)
-{
-  assert(msg != NULL);
-
-  if(msg->msg) free(msg->msg);
-  if(msg->job_id_s) free(msg->job_id_s);
-#if defined(IL_NOTIFICATIONS)
-  if(msg->dest_name) free(msg->dest_name);
-  if(msg->dest) free(msg->dest);
-#endif
-  free(msg);
-  return 0;
-}
diff --git a/org.glite.lb.logger/test/IlTestBase.cpp b/org.glite.lb.logger/test/IlTestBase.cpp

deleted file mode 100644 (file)

index a6b4624..0000000
--- a/org.glite.lb.logger/test/IlTestBase.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "IlTestBase.h"
-
-#include <string.h>
-
-const char *IlTestBase::msg = "DATE=20040831150159.702224 HOST=\"some.host\" PROG=edg-wms LVL=USAGE DG.PRIORITY=0 DG.SOURCE=\"UserInterface\" DG.SRC_INSTANCE=\"\" DG.EVNT=\"RegJob\" DG.JOBID=\"https://some.host:1234/x67qr549qc\" DG.SEQCODE=\"UI=2:NS=0:WM=0:BH=1:JSS=0:LM=0:LRMS=0:APP=0\" DG.USER=\"/C=CZ/O=Cesnet/CN=Michal Vocu\" DG.REGJOB.JDL=\"\" DG.REGJOB.NS=\"ns address\" DG.REGJOB.PARENT=\"\" DG.REGJOB.JOBTYPE=\"SIMPLE\" DG.REGJOB.NSUBJOBS=\"0\" DG.REGJOB.SEED=\"\"";
-
-const char *IlTestBase::msg_enc = "             429\n6 michal\n415 DATE=20040831150159.702224 HOST=\"some.host\" PROG=edg-wms LVL=USAGE DG.PRIORITY=0 DG.SOURCE=\"UserInterface\" DG.SRC_INSTANCE=\"\" DG.EVNT=\"RegJob\" DG.JOBID=\"https://some.host:1234/x67qr549qc\" DG.SEQCODE=\"UI=2:NS=0:WM=0:BH=1:JSS=0:LM=0:LRMS=0:APP=0\" DG.USER=\"/C=CZ/O=Cesnet/CN=Michal Vocu\" DG.REGJOB.JDL=\"\" DG.REGJOB.NS=\"ns address\" DG.REGJOB.PARENT=\"\" DG.REGJOB.JOBTYPE=\"SIMPLE\" DG.REGJOB.NSUBJOBS=\"0\" DG.REGJOB.SEED=\"\"\n";
-
-const struct server_msg IlTestBase::smsg = {
-       "https://some.host:1234/x67qr549qc",
-       (char*)IlTestBase::msg_enc,
-       strlen(IlTestBase::msg_enc),
-       strlen(IlTestBase::msg) + 1,
-       NULL
-};
diff --git a/org.glite.lb.logger/test/IlTestBase.h b/org.glite.lb.logger/test/IlTestBase.h

deleted file mode 100644 (file)

index 69bf347..0000000
--- a/org.glite.lb.logger/test/IlTestBase.h
+++ /dev/null
@@ -1,10 +0,0 @@
-extern "C" {
-#include "interlogd.h"
-}
-
-class IlTestBase {
-public:
-       static const char *msg;
-       static const char *msg_enc;
-       static const struct server_msg smsg;
-};
diff --git a/org.glite.lb.logger/test/event_queueTest.cpp b/org.glite.lb.logger/test/event_queueTest.cpp

deleted file mode 100644 (file)

index 86a6be1..0000000
--- a/org.glite.lb.logger/test/event_queueTest.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
- 
-#include "IlTestBase.h"
-
-extern "C" {
-struct event_queue_msg {
-  struct server_msg *msg;
-  struct event_queue_msg *prev;
-};
-}
-
-#include <string>
-using namespace std;
-
-class event_queueTest: public CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE( event_queueTest );
-       CPPUNIT_TEST( testEventQueueCreate );
-       CPPUNIT_TEST( testEventQueueInsert );
-       CPPUNIT_TEST( testEventQueueGet );
-       CPPUNIT_TEST( testEventQueueRemove );
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void setUp() {
-               server = strdup("localhost:8080");
-               eq = event_queue_create(server);
-               free(server);
-       }
-
-       void tearDown() {
-               struct event_queue_msg *mp;
-               struct server_msg *m;
-
-               for(mp = eq->head; mp != NULL; ) {
-                       struct event_queue_msg *mq;
-
-                       server_msg_free(mp->msg);
-                       mq = mp;
-                       mp = mp->prev;
-                       free(mq);
-               }
-               eq->head = NULL;
-               event_queue_free(eq);
-       }
-
-       void testEventQueueCreate() {
-               CPPUNIT_ASSERT( eq != NULL );
-               CPPUNIT_ASSERT_EQUAL( string(eq->dest_name), string("localhost") );
-               CPPUNIT_ASSERT_EQUAL( eq->dest_port, 8081 );
-               CPPUNIT_ASSERT( eq->tail == NULL );
-               CPPUNIT_ASSERT( eq->head == NULL );
-               CPPUNIT_ASSERT( eq->tail_ems == NULL );
-               CPPUNIT_ASSERT( eq->mark_this == NULL );
-               CPPUNIT_ASSERT( eq->mark_prev == NULL );
-               CPPUNIT_ASSERT( eq->thread_id == 0 );
-               CPPUNIT_ASSERT( eq->flushing == 0 );
-               CPPUNIT_ASSERT( eq->flush_result == 0 );
-       }
-
-       void testEventQueueInsert() {
-               struct event_queue_msg *mp;
-               struct server_msg *m;
-
-               doSomeInserts();
-               mp = eq->head;
-               m = mp->msg;
-               CPPUNIT_ASSERT_EQUAL( string(m->job_id_s), string("2") );
-               CPPUNIT_ASSERT_EQUAL( mp, eq->tail_ems );
-               mp = mp->prev;
-               m = mp->msg;
-               CPPUNIT_ASSERT_EQUAL( string(m->job_id_s), string("1") );
-               mp = mp->prev;
-               m = mp->msg;
-               CPPUNIT_ASSERT_EQUAL( string(m->job_id_s), string("3") );
-               CPPUNIT_ASSERT_EQUAL( mp, eq->tail );
-               CPPUNIT_ASSERT( mp->prev == NULL );
-       }
-
-       void testEventQueueGet() {
-               struct event_queue_msg *mp;
-               struct server_msg *m,sm;
-               int ret;
-
-               doSomeInserts();
-               mp = eq->head;
-               eq->head = mp->prev;
-               eq->tail_ems = NULL;
-               server_msg_free(mp->msg);
-               free(mp);
-               ret = event_queue_get(eq, &m);
-               CPPUNIT_ASSERT( ret == 0 );
-               CPPUNIT_ASSERT( eq->mark_this == eq->head );
-               CPPUNIT_ASSERT( eq->mark_prev == NULL );
-               CPPUNIT_ASSERT_EQUAL( string("1"), string(m->job_id_s) );
-               sm = IlTestBase::smsg;
-               sm.job_id_s = "4";
-               sm.receipt_to = 1;
-               ret = event_queue_insert(eq, &sm);
-               CPPUNIT_ASSERT( ret == 0 );
-               CPPUNIT_ASSERT( eq->mark_prev == eq->head );
-               CPPUNIT_ASSERT( eq->mark_this == eq->head->prev );
-               ret = event_queue_insert(eq, &sm);
-               CPPUNIT_ASSERT( ret == 0 );
-               CPPUNIT_ASSERT( eq->mark_prev == eq->head->prev );
-               CPPUNIT_ASSERT( eq->mark_this == eq->head->prev->prev );
-       }
-
-       void testEventQueueRemove() {
-               struct event_queue_msg *mp;
-               struct server_msg *m,sm;
-               int ret;
-
-               doSomeInserts();
-               ret = event_queue_get(eq, &m);
-               mp = eq->mark_this->prev;
-               sm = IlTestBase::smsg;
-               sm.job_id_s = "4";
-               sm.receipt_to = 1;
-               event_queue_insert(eq, &sm);
-               ret = event_queue_remove(eq);
-               CPPUNIT_ASSERT( eq->head->prev == mp );
-               CPPUNIT_ASSERT( eq->mark_this == NULL );
-               CPPUNIT_ASSERT( eq->mark_prev == NULL );
-       }
-
-protected:
-       char *server;
-       struct event_queue *eq;
-
-       void doSomeInserts() {
-               struct server_msg m = IlTestBase::smsg;
-
-               m.job_id_s = "1";
-               event_queue_insert(eq, &m);
-               m.receipt_to = 1;
-               m.job_id_s = "2";
-               event_queue_insert(eq, &m);
-               m.job_id_s = "3";
-               m.receipt_to = 0;
-               event_queue_insert(eq, &m);
-       }
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION( event_queueTest );
diff --git a/org.glite.lb.logger/test/event_storeTest.cpp b/org.glite.lb.logger/test/event_storeTest.cpp

deleted file mode 100644 (file)

index 8364cf4..0000000
--- a/org.glite.lb.logger/test/event_storeTest.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
- 
-#include "IlTestBase.h"
-
-class event_storeTest: public CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE( event_storeTest );
-       CPPUNIT_TEST( event_store_recoverTest );
-       CPPUNIT_TEST( event_store_syncTest );
-       CPPUNIT_TEST( event_store_nextTest );
-       CPPUNIT_TEST( event_store_commitTest );
-       CPPUNIT_TEST( event_store_cleanTest );
-       CPPUNIT_TEST( event_store_findTest );
-       CPPUNIT_TEST( event_store_releaseTest );
-       CPPUNIT_TEST( event_store_initTest );
-       CPPUNIT_TEST( event_store_recover_allTest );
-       CPPUNIT_TEST( event_store_cleanupTest );
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void setUp() {
-       }
-
-       void tearDown() {
-       }
-
-       void event_store_recoverTest() {
-       }
-
-       void event_store_syncTest() {
-       }
-
-       void event_store_nextTest() {
-       }
-
-       void event_store_commitTest() {
-       }
-
-       void event_store_cleanTest() {
-       }
-
-       void event_store_findTest() {
-       }
-
-       void event_store_releaseTest() {
-       }
-
-       void event_store_initTest() {
-       }
-
-       void event_store_recover_allTest() {
-       }
-
-       void event_store_cleanupTest() {
-       }
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION( event_storeTest );
diff --git a/org.glite.lb.logger/test/il_test.cpp b/org.glite.lb.logger/test/il_test.cpp

deleted file mode 100644 (file)

index 1bafb04..0000000
--- a/org.glite.lb.logger/test/il_test.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-extern "C" {
-#include <pthread.h>
-#include "glite/wmsutils/tls/ssl_helpers/ssl_inits.h"
-#include "glite/wmsutils/tls/ssl_helpers/ssl_pthreads.h"
-#include "interlogd.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/lb_gss.h"
-}
-
-#if defined(IL_NOTIFICATIONS)
-#define DEFAULT_PREFIX "/tmp/notif_events"
-#define DEFAULT_SOCKET "/tmp/notif_interlogger.sock"
-#else
-#define DEFAULT_PREFIX "/tmp/dglogd.log"
-#define DEFAULT_SOCKET "/tmp/interlogger.sock"
-#endif
-                                                                                
-int TIMEOUT = DEFAULT_TIMEOUT;
-                                                                                
-gss_cred_id_t cred_handle = GSS_C_NO_CREDENTIAL;
-pthread_mutex_t cred_handle_lock = PTHREAD_MUTEX_INITIALIZER;
-                                                                                
-char *file_prefix = DEFAULT_PREFIX;
-int bs_only = 0;
- 
-char *cert_file = NULL;
-char *key_file  = NULL;
-char *CAcert_dir = NULL;
-char *log_server = NULL;
-char *socket_path = DEFAULT_SOCKET;
- 
-
-int 
-main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-       
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.logger/test/input_queue_socketTest.cpp b/org.glite.lb.logger/test/input_queue_socketTest.cpp

deleted file mode 100644 (file)

index d29e2cc..0000000
--- a/org.glite.lb.logger/test/input_queue_socketTest.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
- 
-#include "IlTestBase.h"
-
-extern "C" {
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-
-#include "interlogd.h"
-
-       extern char *socket_path;
-}
-
-#include <string>
-using namespace std;
- 
-class input_queue_socketTest: public CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE( input_queue_socketTest );
-       CPPUNIT_TEST( input_queue_getTest );
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-
-       void setUp() {
-               struct sockaddr_un saddr;
-               int sock;
-               long offset = 0;
-
-               int ret = input_queue_attach();
-               CPPUNIT_ASSERT(ret == 0);
-
-               sock=socket(PF_UNIX, SOCK_STREAM, 0);
-               CPPUNIT_ASSERT(sock >= 0);
-               
-               memset(&saddr, 0, sizeof(saddr));
-               saddr.sun_family = AF_UNIX;
-               strcpy(saddr.sun_path, socket_path);
-               ret = connect(sock, (struct sockaddr *)&saddr, sizeof(saddr.sun_path));
-               CPPUNIT_ASSERT(ret >= 0);
-               
-               ret = write(sock, &offset, sizeof(offset));
-               CPPUNIT_ASSERT( ret == sizeof(offset) );
-               ret = write(sock, IlTestBase::msg, strlen(IlTestBase::msg));
-               CPPUNIT_ASSERT( ret == strlen(IlTestBase::msg) );
-               ret = write(sock, "\n", 1);
-               CPPUNIT_ASSERT( ret == 1 );
-       }
-
-       void tearDown() {
-               input_queue_detach();
-       }
-
-
-       void input_queue_getTest() {
-               char *event;
-               long offset;
-               int ret;
-
-               ret = input_queue_get(&event, &offset, 10);
-               CPPUNIT_ASSERT( ret >= 0 );
-               CPPUNIT_ASSERT_EQUAL( 0L, offset );
-               CPPUNIT_ASSERT_EQUAL( string(IlTestBase::msg), string(event) );
-               free(event);
-       }
-};
-
-CPPUNIT_TEST_SUITE_REGISTRATION(input_queue_socketTest);
diff --git a/org.glite.lb.logger/test/ll_test.cpp b/org.glite.lb.logger/test/ll_test.cpp

deleted file mode 100644 (file)

index 1e8dce6..0000000
--- a/org.glite.lb.logger/test/ll_test.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include <iostream>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/time.h>
-#include <unistd.h>
-#include <errno.h>
-#include <assert.h>
-#include <string.h>
-
-extern "C" {
-#define DEFAULT_SOCKET "/tmp/interlogger.sock"
-char *socket_path = DEFAULT_SOCKET;
-int edg_wll_log_proto_server(int *,char *,char *,int,int);
-void edg_wll_ll_log_init(int);
-}
-
-class LLTest: public  CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(LLTest);
-       CPPUNIT_TEST(testProtoServer);
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-
-  void setUp() {
-    char *msg = "DATE=20040831150159.702224 HOST=\"some.host\" PROG=edg-wms LVL=USAGE DG.PRIORITY=0 DG.SOURCE=\"UserInterface\" DG.SRC_INSTANCE=\"\" DG.EVNT=\"RegJob\" DG.JOBID=\"https://some.host:1234/x67qr549qc\" DG.SEQCODE=\"UI=2:NS=0:WM=0:BH=1:JSS=0:LM=0:LRMS=0:APP=0\" DG.REGJOB.JDL=\"\" DG.REGJOB.NS=\"ns address\" DG.REGJOB.PARENT=\"\" DG.REGJOB.JOBTYPE=\"SIMPLE\" DG.REGJOB.NSUBJOBS=\"0\" DG.REGJOB.SEED=\"\"";
-    pipe(pd);
-    log_proto_client(pd[1], msg);
-    input_queue_attach();
-  }
-
-  void tearDown() {
-    close(pd[0]);
-    close(pd[1]);
-    input_queue_detach();
-  }
-
-  void testProtoServer() {
-    int ret;
-    edg_wll_ll_log_init(255);
-    ret = edg_wll_log_proto_server(&pd[0], 
-                                      "michal",
-                                      "/tmp/dglogd.log",
-                                      0,
-                                      0);
-    CPPUNIT_ASSERT( ret == 0 );
-  }
-
-private:
-  int  pd[2];
-
-  int log_proto_client(int con, char *logline) {
-    char       header[32];
-    int        err;
-    int        size;
-    u_int8_t size_end[4];
-
-    err = 0;
-    size = strlen(logline)+1;
-    size_end[0] = size & 0xff; size >>= 8;
-    size_end[1] = size & 0xff; size >>= 8;
-    size_end[2] = size & 0xff; size >>= 8;
-    size_end[3] = size;
-    size = strlen(logline)+1;
-
-    err = write(con, "DGLOG", 5);
-    CPPUNIT_ASSERT(err == 5);
-    err = write(con, size_end, 4);
-    CPPUNIT_ASSERT(err == 4);
-    err = write(con, logline, size);
-    CPPUNIT_ASSERT( err == size );
-}
-
- int sock;
- int accepted;
-
-int 
-input_queue_attach()
-{ 
-  struct sockaddr_un saddr;
-
-  CPPUNIT_ASSERT((sock=socket(PF_UNIX, SOCK_STREAM, 0)) >= 0);
-
-  memset(&saddr, 0, sizeof(saddr));
-  saddr.sun_family = AF_UNIX;
-  strcpy(saddr.sun_path, socket_path);
-
-  CPPUNIT_ASSERT(bind(sock, (struct sockaddr *)&saddr, sizeof(saddr)) >= 0); 
-  CPPUNIT_ASSERT(listen(sock, 5) >= 0 );
-  return(0);
-}
-
-void input_queue_detach()
-{
-  if (sock >= 0)
-    close(sock);
-  unlink(socket_path);
-}
-
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION( LLTest );
-
-int 
-main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-       
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.logger/test/logd_proto_test.c b/org.glite.lb.logger/test/logd_proto_test.c

deleted file mode 100644 (file)

index 9ee0b44..0000000
--- a/org.glite.lb.logger/test/logd_proto_test.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <string.h>
-#include <syslog.h>
-#include <fcntl.h>
-
-#define edg_wll_gss_read_full(a,b,c,d,e,f)  test_edg_wll_gss_read_full(a,b,c,d,e,f)
-#define edg_wll_gss_write_full(a,b,c,d,e,f) test_edg_wll_gss_write_full(a,b,c,d,e,f)
-#define edg_wll_GssConnection               int
-
-#include "logd_proto.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/events_parse.h"
-
-int
-test_edg_wll_gss_read_full(int *fd,
-                          void *buf,
-                          size_t bufsize,
-                          struct timeval *timeout,
-                          size_t *total,
-                          edg_wll_GssStatus *code) 
-{
-  *total = read(*fd, buf, bufsize);
-  return(*total < 0 ? *total : 0);
-}
-
-int
-test_edg_wll_gss_write_full(int *fd,
-                           const void *buf,
-                           size_t bufsize,
-                           struct timeval *timeout,
-                           size_t *total,
-                           edg_wll_GssStatus *code) 
-{
-  return(0);
-}
-
-#include "logd_proto.c"
diff --git a/org.glite.lb.logger/test/server_msgTest.cpp b/org.glite.lb.logger/test/server_msgTest.cpp

deleted file mode 100644 (file)

index e669ea1..0000000
--- a/org.glite.lb.logger/test/server_msgTest.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <cppunit/extensions/HelperMacros.h>
- 
-#include "IlTestBase.h"
-
-#include <string.h>
-
-using namespace std;
-
-class server_msgTest: public CppUnit::TestFixture 
-{
-       CPPUNIT_TEST_SUITE(server_msgTest);
-       CPPUNIT_TEST( server_msg_createTest );
-       CPPUNIT_TEST( server_msg_copyTest );
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-
-       void setUp() {
-               msg = server_msg_create((char *)IlTestBase::msg);
-       }
-
-       void tearDown() {
-               server_msg_free(msg);
-       }
-
-       void server_msg_createTest() {
-               CPPUNIT_ASSERT( msg != NULL );
-               CPPUNIT_ASSERT_EQUAL( string(msg->job_id_s), string(IlTestBase::smsg.job_id_s) );
-               CPPUNIT_ASSERT_EQUAL( string(msg->msg), string(IlTestBase::smsg.msg) );
-               CPPUNIT_ASSERT_EQUAL( msg->len, IlTestBase::smsg.len );
-               CPPUNIT_ASSERT_EQUAL( msg->ev_len, IlTestBase::smsg.ev_len );
-               CPPUNIT_ASSERT_EQUAL( msg->es, IlTestBase::smsg.es );
-               CPPUNIT_ASSERT( !server_msg_is_priority(msg) );
-       }
-
-       void server_msg_copyTest() {
-               struct server_msg *msg2;
-
-               msg2 = server_msg_copy(msg);
-               CPPUNIT_ASSERT( msg2 != NULL );
-               CPPUNIT_ASSERT( msg2 != msg );
-               CPPUNIT_ASSERT_EQUAL( string(msg->job_id_s), string(msg2->job_id_s) );
-               CPPUNIT_ASSERT( msg->job_id_s != msg2->job_id_s);
-               CPPUNIT_ASSERT_EQUAL( string(msg->msg), string(msg2->msg) );
-               CPPUNIT_ASSERT( msg->msg != msg2->msg );
-               CPPUNIT_ASSERT_EQUAL( msg->len, msg2->len );
-               CPPUNIT_ASSERT_EQUAL( msg->ev_len, msg2->ev_len );
-               CPPUNIT_ASSERT_EQUAL( msg->es, msg2->es );
-               server_msg_free(msg2);
-       }
-
-private:
-       struct server_msg *msg;
-};
-
-
-CPPUNIT_TEST_SUITE_REGISTRATION(server_msgTest);
diff --git a/org.glite.lb.server/.cvsignore b/org.glite.lb.server/.cvsignore

deleted file mode 100644 (file)

index 1df717b..0000000
--- a/org.glite.lb.server/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.lb.server/LICENSE b/org.glite.lb.server/LICENSE

deleted file mode 100644 (file)

index 259a91f..0000000
--- a/org.glite.lb.server/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware\r
-================================\r
-\r
-Copyright (c) 2004 on behalf of the EU EGEE Project: \r
-The European Organization for Nuclear Research (CERN), \r
-Istituto Nazionale di Fisica Nucleare (INFN), Italy\r
-Datamat Spa, Italy\r
-Centre National de la Recherche Scientifique (CNRS), France\r
-CS Systeme d'Information (CSSI), France\r
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden\r
-Universiteit van Amsterdam (UvA), Netherlands\r
-University of Helsinki (UH.HIP), Finlan\r
-University of Bergen (UiB), Norway\r
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom\r
-\r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are\r
-met: \r
-\r
-1. Redistributions of source code must retain the above copyright\r
-notice, this list of conditions and the following disclaimer.\r
-\r
-2. Redistributions in binary form must reproduce the above copyright\r
-notice, this list of conditions and the following disclaimer in the\r
-documentation and/or other materials provided with the distribution.\r
-\r
-3. The end-user documentation included with the redistribution, if\r
-any, must include the following acknowledgment: "This product includes\r
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."\r
-Alternatively, this acknowledgment may appear in the software itself, if\r
-and wherever such third-party acknowledgments normally appear.\r
-\r
-4. The names EGEE and the EU EGEE Project must not be\r
-used to endorse or promote products derived from this software without\r
-prior written permission. For written permission, please contact\r
-<email address>.\r
-\r
-5. You are under no obligation whatsoever to provide anyone with any\r
-bug fixes, patches, or upgrades to the features, functionality or\r
-performance of the Software ("Enhancements") that you may develop over\r
-time; however, if you choose to provide your Enhancements to The EU\r
-EGEE Project, or if you choose to otherwise publish or distribute your\r
-Enhancements, in source code form without contemporaneously requiring\r
-end users of The EU EGEE Proejct to enter into a separate written license\r
-agreement for such Enhancements, then you hereby grant The EU EGEE Project\r
-a non-exclusive, royalty-free perpetual license to install, use, copy,\r
-modify, prepare derivative works, incorporate into the EGEE Middleware\r
-or any other computer software, distribute, and sublicense your\r
-Enhancements or derivative works thereof, in binary and source code\r
-form (if any), whether developed by The EU EGEE Project or third parties.\r
-\r
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\r
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE\r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\r
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\r
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\r
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\r
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
-This software consists of voluntary contributions made by many\r
-individuals on behalf of the EU EGEE Prject. For more information on The\r
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on\r
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/\r
-\r
-\r
diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile

deleted file mode 100644 (file)

index 6c0018d..0000000
--- a/org.glite.lb.server/Makefile
+++ /dev/null
@@ -1,232 +0,0 @@
-# defaults
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-lb-server
-version=0.2.0
-PREFIX=/opt/glite
-
-glite_location=/opt/glite
-globus_prefix=/opt/globus
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-expat_prefix=/opt/expat
-ares_prefix=/opt/ares
-gsoap_prefix=/opt/gsoap
-
--include Makefile.inc
--include ../Makefile.inc
-
-ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
-       WS_CFLAGS=-DGLITE_LB_SERVER_WITH_WS
-else
-       WS_CFLAGS=
-endif
-
-CC=gcc
-
-GSOAP_FILES_PREFIX:= bk_ws_
-
-YACC=bison -y
-CC=gcc
-
-VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/project
-AT3=perl -I${top_srcdir}/project ${top_srcdir}/project/at3
-
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
-
-SUFFIXES = .T 
-
-DEBUG:=-g -O0 -Wall
-# not yet
-#      -I${voms}/include \
-#      -I${gacl}/include \
-#      -I/usr/include/libxml2 \
-
-# -DNO_VOMS -DNO_GACL to be removed when voms/gridsite are available
-CFLAGS:= -DNO_VOMS -DNO_GACL ${WS_CFLAGS} \
-       ${DEBUG} -I${stagedir}/include -I${top_srcdir}/src -I. \
-       -I${expat_prefix}/include \
-       -I${ares_prefix}/include \
-       -I${gsoap_prefix}/include \
-       ${COVERAGE_FLAGS} \
-       -I${mysql_prefix}/include \
-       -I${globus_prefix}/include/${nothrflavour} \
-       -I${gridsite_prefix}/include -I${globus_prefix}/include/${nothrflavour}/openssl
-
-
-TEST_LIBS:=-L${cppunit}/lib -lcppunit
-TEST_INC:=-I${cppunit}/include
-
-LINK:=libtool --mode=link ${CC} ${LDFLAGS} 
-LINKXX:=libtool --mode=link ${CXX} ${LDFLAGS} 
-INSTALL:=libtool --mode=install install
-LINKXX:=libtool --mode=link  ${CXX} -rpath ${stagedir}/lib ${LDFLAGS}
-
-GLOBUS_LIBS:= -L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lglobus_gssapi_gsi_${nothrflavour} \
-
-EXT_LIBS:= -L${ares_prefix}/lib -lares \
-       -L${mysql_prefix}/lib -lmysqlclient -lz\
-       -L${expat_prefix}/lib -lexpat \
-       ${GLOBUS_LIBS}
-
-GSOAP_LIBS:= -L${gsoap_prefix}/lib -lgsoap
-
-SRVBONES_LIB:= -L${stagedir}/lib -lglite_lb_server_bones
-
-COMMON_LIB:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour}
-
-ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
-       SERVER_SOAP_OBJS:=${GSOAP_FILES_PREFIX}C.o ${GSOAP_FILES_PREFIX}Server.o \
-                       ws_plugin.o ws_query.o ws_fault.o ws_typeref.o
-       SERVER_WS_LIBS=${GSOAP_LIBS}
-else
-       SERVER_SOAP_OBJS=
-       SERVER_WS_LIBS=
-endif
-
-SERVER_OBJS:= bkserverd.o get_events.o index.o jobstat.o jobstat_supp.o \
-       write2rgma.o lbs_db.o lb_html.o lb_http.o lb_proto.o lb_xml_parse.o \
-       lb_xml_parse_V21.o \
-       lock.o openserver.o query.o userjobs.o db_store.o request.o store.o \
-       stored_master.o srv_purge.o server_state.o dump.o lb_authz.o load.o \
-       notification.o il_notification.o notif_match.o
-
-INDEX_OBJS:= index.o index_parse.o jobstat_supp.o lbs_db.o openserver.o \
-       jobstat.o query.o lock.o get_events.o write2rgma.o index_lex.o \
-       lb_authz.o store.o bkindex.o
-
-WS_CLIENT_OBJS:= test_ws_plugin.o $(GSOAP_FILES_PREFIX)C.o $(GSOAP_FILES_PREFIX)Client.o ws_fault.o ws_typeref.o
-WS_CLIENT_LIBS:= ${GSOAP_LIBS} -L${stagedir}/lib -lglite_lb_client_${nothrflavour}
-
-
-glite_lb_bkserverd: ${SERVER_OBJS} ${SERVER_SOAP_OBJS}
-       ${LINK} -o $@ ${SERVER_OBJS} ${SERVER_SOAP_OBJS} ${COMMON_LIB} ${SRVBONES_LIB} ${EXT_LIBS} ${SERVER_WS_LIBS}
-
-glite_lb_bkindex: ${INDEX_OBJS}
-       ${LINK} -o $@ ${INDEX_OBJS} ${COMMON_LIB} ${EXT_LIBS}
-
-default all: compile
-
-compile: glite_lb_bkserverd glite_lb_bkindex
-
-check: compile test.xml test.query
-       -echo check.query not complete yet
-
-test_coverage:
-       -mkdir coverage
-       cd coverage && $(MAKE) -f ../Makefile top_srcdir=../../ COVERAGE_FLAGS="-fprofile-arcs -ftest-coverage" check
-       cd coverage && for i in `echo ${INDEX_OBJS} ${SERVER_OBJS} | tr ' ' '\012' | sort -u`; do gcov $$i ; done
-
-lb_xml_parse.c: lb_xml_parse.c.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-${GSOAP_FILES_PREFIX}H.h ${GSOAP_FILES_PREFIX}C.c ${GSOAP_FILES_PREFIX}Server.c ${GSOAP_FILES_PREFIX}Client.c: LB.xh
-       ${gsoap_prefix}/bin/soapcpp2 -w -c -p ${GSOAP_FILES_PREFIX} LB.xh
-
-LB.xh: LB.wsdl ws_typemap.dat
-       cp ${top_srcdir}/project/LB.wsdl .
-       ${gsoap_prefix}/bin/wsdl2h -c -t ${top_srcdir}/src/ws_typemap.dat -o $@ LB.wsdl
-       rm LB.wsdl
-
-test.xml: test_xml
-       ./test_xml
-
-test_xml: test_xml.cpp
-       ${CXX} -c ${CFLAGS} ${TEST_INC} $<
-       ${LINKXX} -o $@ test_xml.o lb_xml_parse.o ${COMMON_LIB} ${TEST_LIBS} ${EXT_LIBS}
-
-test.query: test_query_events
-       ./test_query_events
-
-query_events_objs:=`echo ${SERVER_OBJS} | sed 's/lbs_db\.o//;s/bkserverd\.o//'`
-
-test_query_events: test_query_events.o
-       ${LINKXX} -o $@ test_query_events.o ${query_events_objs} \
-       ${TEST_LIBS} ${COMMON_LIB} ${EXT_LIBS}
-
-test.soapconv: test_soap_conv
-       ./test_soap_conv
-
-test_soap_conv: test_soap_conv.cpp ${WS_CLIENT_OBJS}
-       ${CXX} -c ${CFLAGS} ${TEST_INC} $<
-       ${LINKXX} -o $@ test_soap_conv.o ${WS_CLIENT_OBJS} ${WS_CLIENT_LIBS} ${COMMON_LIB} ${TEST_LIBS}
-
-examples: ws_jobstat ws_query_ex 
-
-ws_jobstat: ws_jobstat.o ${WS_CLIENT_OBJS}
-       ${LINK} -o $@ ws_jobstat.o ${WS_CLIENT_OBJS} ${WS_CLIENT_LIBS} ${EXT_LIBS}
-
-ws_query_ex: ws_query_ex.o ${WS_CLIENT_OBJS}
-       ${LINK} -o $@ ws_query_ex.o ${WS_CLIENT_OBJS} ${WS_CLIENT_LIBS} ${EXT_LIBS}
-
-ws_query_ext: ws_query_ext.o ${WS_CLIENT_OBJS}
-       ${LINK} -o $@ ws_query_ext.o ${WS_CLIENT_OBJS} ${WS_CLIENT_LIBS} ${EXT_LIBS}
-
-test_ws_plugin.o: ws_plugin.c
-       ${CC} ${CFLAGS} -DPLUGIN_TEST -c -o $@ ${top_srcdir}/src/ws_plugin.c
-
-doc:
-
-stage: compile
-       $(MAKE) install PREFIX=${stagedir}
-
-dist: distsrc distbin
-
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir${stagedir}
-       save_dir=`pwd`; cd tmpbuilddir${stagedir} && tar -czf $$save_dir/${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *; cd $$save_dir
-       rm -rf tmpbuilddir
-        
-install:
-       -mkdir -p ${PREFIX}/bin ${PREFIX}/etc ${PREFIX}/etc/init.d
-       -mkdir -p ${PREFIX}/share/doc/${package}-${version}
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       for p in bkserverd bkindex; do \
-               ${INSTALL} -m 755 "glite_lb_$$p" "${PREFIX}/bin/glite-lb-$$p"; \
-       done
-
-       for f in dbsetup.sql index.conf.template; do \
-               ${INSTALL} -m 644 ${top_srcdir}/config/"glite-lb-$$f" ${PREFIX}/etc; \
-       done
-
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/glite-lb-bkserverd
-
-clean:
-
-%.c: %.c.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-%.o: %.y
-       ${YACC} -d ${YFLAGS} $<
-       mv y.tab.c $*.c
-       mv y.tab.h $*.h
-       ${CC} -c ${CFLAGS} $*.c
-       rm $*.c
-
-%.cpp: %.cpp.T
-       rm -f $@
-       ${AT3} $< >$@ || rm -f $@
-       chmod -w $@ >/dev/null
-
-
-test_query_events.o: %.o: %.cpp
-       ${CXX} -c ${CFLAGS} ${GLOBUSINC} ${TEST_INC} $<
-
diff --git a/org.glite.lb.server/build.xml b/org.glite.lb.server/build.xml

deleted file mode 100755 (executable)

index 011bf74..0000000
--- a/org.glite.lb.server/build.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.3  2004/08/05 15:24:32  dimeglio
-       Changed default target from compile to dist
-       
-       Revision 1.2  2004/07/07 12:07:41  akrenek
-       - use nonthr common library
-       - build without VOMS & GACL
-       
-       Revision 1.3  2004/07/06 17:45:30  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.2  2004/06/23 00:29:33  dimeglio
-       Added standard comments and handling of support files
-       
--->
-
-<project name="server" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite LB Client Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                Load configure options (order is important)
-            ========================================= -->
-       <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>
-
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-        <!-- Copy support files from the subsystem project to the component project-->
-               <copy toDir="${module.project.dir}">
-                       <fileset dir="${subsystem.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </copy> 
-               <antcall target="lbmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-               <delete>
-                       <fileset dir="${module.project.dir}">
-                               <include name="at3" />
-                               <include name="*.T" />
-                               <include name="*.pm" />
-                       </fileset>
-               </delete>       
-       </target>
-       
-       <!-- =========================================
-            RPM settings
-            ========================================= -->
-
-       <property name="build.package.summary" value="L&amp;B bookkeeping server" />
-       <property name="build.package.description" value=" The daemon
-installed at the Logging &amp; Bookkeeping (L&amp;B) server
-machine.&#xA;It is responsible for accepting events from locallogger,
-storing them in RDBMS,&#xA;and performing queries on client requests
-(job status, job log etc.).&#xA;Also includes purge utilities
-to remove (and optionally archive) inactive&#xA;data from
-the database and to change database index configuration." />
-
-</project>             
diff --git a/org.glite.lb.server/config/glite-lb-dbsetup.sql b/org.glite.lb.server/config/glite-lb-dbsetup.sql

deleted file mode 100644 (file)

index af04974..0000000
--- a/org.glite.lb.server/config/glite-lb-dbsetup.sql
+++ /dev/null
@@ -1,112 +0,0 @@
-create table jobs (
-       jobid           char(32)        binary not null,
-       dg_jobid        varchar(255)    binary not null,
-       userid          char(32)        binary not null,
-       aclid           char(32)        binary null,
-
-       primary key (jobid),
-       unique (dg_jobid),
-       index (userid)
-);
-
-create table users (
-       userid          char(32)        binary not null,
-       cert_subj       varchar(255)    binary not null,
-
-       primary key (userid),
-       unique (cert_subj)
-);
-
-create table events (
-       jobid           char(32)        binary not null,
-       event           int             not null,
-       code            int             not null,
-       prog            varchar(255)    binary not null,
-       host            varchar(255)    binary not null,
-       time_stamp      datetime        not null,
-       userid          char(32)        binary null,
-       usec            int             null,
-       level           int             null,
-
-       arrived         datetime        not null,
-       
-
-       primary key (jobid,event),
-       index (time_stamp),
-       index (host),
-       index (arrived)
-);
-
-create table short_fields (
-       jobid           char(32)        binary not null,
-       event           int             not null,
-       name            varchar(200)    binary not null,
-       value           varchar(255)    binary null,
-
-       primary key (jobid,event,name)
-);
-
-create table long_fields (
-       jobid           char(32)        binary not null,
-       event           int             not null,
-       name            varchar(200)    binary not null,
-       value           mediumblob      null,
-
-       primary key (jobid,event,name)
-);
-
-create table states (
-       jobid           char(32)        binary not null,
-       status          int             not null,
-       seq             int             not null,
-       int_status      mediumblob      not null,
-       version         varchar(32)     not null,
-       parent_job      varchar(32)     binary not null,
-
-       primary key (jobid),
-       index (parent_job)
-       
-);
-
-create table status_tags (
-       jobid           char(32)        binary not null,
-       seq             int             not null,
-       name            varchar(200)    binary not null,
-       value           varchar(255)    binary null,
-
-       primary key (jobid,seq,name)
-);
-
-create table server_state (
-       prefix          varchar(100)    not null,
-       name            varchar(100)    binary not null,
-       value           varchar(255)    binary not null,
-
-       primary key (prefix,name)
-);
-
-create table acls (
-       aclid           char(32)        binary not null,
-       value           mediumblob      not null,
-       refcnt          int             not null,
-
-       primary key (aclid)
-);
-
-create table notif_registrations (
-       notifid         char(32)        binary not null,
-       destination     varchar(200)    not null,
-       valid           datetime        not null,
-       userid          char(32)        binary not null,
-       conditions      mediumblob      not null,
-
-       primary key (notifid)
-);
-
-create table notif_jobs (
-       notifid         char(32)        binary not null,
-       jobid           char(32)        binary not null,
-
-       primary key (notifid,jobid),
-       index (jobid)
-);
diff --git a/org.glite.lb.server/config/glite-lb-index.conf.template b/org.glite.lb.server/config/glite-lb-index.conf.template

deleted file mode 100644 (file)

index 594681b..0000000
--- a/org.glite.lb.server/config/glite-lb-index.conf.template
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-       JobIndices = {
-               [ type = "system"; name = "owner" ],
-               [ type = "system"; name = "location" ],
-               [ type = "system"; name = "destination" ]
-       }
-]
diff --git a/org.glite.lb.server/config/startup b/org.glite.lb.server/config/startup

deleted file mode 100755 (executable)

index 1b74a0f..0000000
--- a/org.glite.lb.server/config/startup
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-
-GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-GLITE_USER=${GLITE_USER:-glite}
-GLITE_LOCATION_VAR=${GLITE_LOCATION_VAR:-${GLITE_LOCATION}/var}
-
-[ -f /etc/glite.conf ] && . /etc/glite.conf
-[ -f $GLITE_LOCATION/etc/glite-wms.conf ] && . $GLITE_LOCATION/etc/glite-wms.conf
-
-[ -f $GLITE_LOCATION/etc/lb.conf ] && . $GLITE_LOCATION/etc/lb.conf
-[ -f $GLITE_LOCATION_VAR/etc/lb.conf ] && . $GLITE_LOCATION_VAR/etc/lb.conf
-
-[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
-
-[ -n "$GLITE_LB_SERVER_PIDFILE" ] && pidfile=$GLITE_LB_SERVER_PIDFILE ||
-       pidfile=$GLITE_LOCATION_VAR/glite-lb-bkserverd.pid
-
-unset creds port
-
-start()
-{
-       [ -n "$GLITE_HOST_CERT" -a -n "$GLITE_HOST_KEY" ] &&
-               creds="-c $GLITE_HOST_CERT -k $GLITE_HOST_KEY"
-
-       [ -z "$creds" ] && echo $0: WARNING: No credentials specified. Using default lookup which is dangerous. >&2
-
-       [ -n "$GLITE_LB_SERVER_PORT" ] && port="-p $GLITE_LB_SERVER_PORT"
-
-       echo -n Starting glite-lb-bkserver ...
-       su $GLITE_USER -c "$GLITE_LOCATION/bin/glite-lb-bkserverd \
-               $creds -i $pidfile $port" && echo " done"
-}
-
-stop()
-{
-       if [ -f $pidfile ]; then
-               pid=`cat $pidfile`
-               kill $pid
-               echo -n Stopping glite-lb-bkserverd \($pid\) ...
-               try=0
-               while ps p $pid >/dev/null 2>&1; do 
-                       sleep 1;
-                       try=`expr $try + 1`
-                       if [ $try = 20 ]; then
-                               echo " giving up after $try retries"
-                               return 1
-                       fi
-               done
-               echo " done"
-               rm -f $pidfile
-       else
-               echo $pidfile does not exist - glite-lb-bkserverd not running? >&2
-               return 1
-       fi
-}
-
-status()
-{
-       if [ -f $pidfile ]; then
-               pid=`cat $pidfile`
-               if ps p $pid >/dev/null 2>&1; then
-                       echo glite-lb-bkserverd running as $pid 
-                       return 0
-               fi
-       fi
-
-       echo glite-lb-bkserverd not running
-       return 1
-}
-
-case x$1 in
-       xstart) start;;
-       xstop)  stop;;
-       xrestart) stop; start;;
-       xstatus) status;;
-       x*)     echo usage: $0 start,stop,restart,status >&2
-               exit 1;;
-esac
diff --git a/org.glite.lb.server/examples/ws_jobstat.c b/org.glite.lb.server/examples/ws_jobstat.c

deleted file mode 100644 (file)

index 0b64399..0000000
--- a/org.glite.lb.server/examples/ws_jobstat.c
+++ /dev/null
@@ -1,161 +0,0 @@
-#include <getopt.h>
-#include <stdsoap2.h>
-
-#include "glite/lb/consumer.h"
-
-#include "ws_plugin.h"
-#include "bk_ws_H.h"
-
-static struct option opts[] = {
-       {"help",        0,      NULL,   'h'},
-       {"server",      1,      NULL,   'm'},
-       {"jobid",       1,      NULL,   'j'}
-};
-
-static void usage(char *me)
-{
-       fprintf(stderr,"usage: %s [option]\n"
-               "\t-h, --help      Shows this screen.\n"
-               "\t-m, --server    BK server address:port.\n"
-               "\t-j, --jobid     ID of requested job.\n"
-               , me);
-}
-
-static void printstat(edg_wll_JobStat stat, int level);
-
-int main(int argc,char** argv)
-{
-    edg_wll_Context                                            ctx;
-    struct soap                                                   *mydlo = soap_new();
-    struct edgwll2__JobStatusResponse  out;
-    int                                                                        opt, err;
-       char                                                       *server = "http://localhost:8999/",
-                                                                          *jobid = NULL,
-                                                                          *name = NULL;
-
-
-       name = strrchr(argv[0],'/');
-       if (name) name++; else name = argv[0];
-
-       while ((opt = getopt_long(argc, argv, "hm:j:", opts, NULL)) != EOF) switch (opt)
-       {
-       case 'h': usage(name); return 0;
-       case 'm': server = strdup(optarg); break;
-       case 'j': jobid = strdup(optarg); break;
-       case '?': usage(name); return 1;
-       }
-
-       if ( !jobid )
-       {
-               printf("jobid should be given\n");
-               usage(name);
-               return 1;
-       }
-               
-    edg_wll_InitContext(&ctx);
-
-       if ( soap_register_plugin_arg(mydlo, edg_wll_ws_plugin, (void *)ctx) )
-       {
-               soap_print_fault(mydlo, stderr);
-               return 1;
-       }
-
-    switch (err = soap_call_edgwll2__JobStatus(mydlo, server, "", jobid,0,&out))
-       {
-       case SOAP_OK:
-               {
-               edg_wll_JobStat s;
-
-               edg_wll_SoapToStatus(mydlo,out.status,&s);
-               printstat(s, 0);
-               }
-               break;
-       case SOAP_FAULT: 
-       case SOAP_SVR_FAULT:
-               {
-               char    *et,*ed;
-
-               edg_wll_FaultToErr(mydlo,ctx);
-               edg_wll_Error(ctx,&et,&ed);
-               fprintf(stderr,"%s: %s (%s)\n",argv[0],et,ed);
-               exit(1);
-               }
-       default:
-               fprintf(stderr,"err = %d\n",err);
-               soap_print_fault(mydlo,stderr);
-    }
-
-    return 0;
-}
-
-static void printstat(edg_wll_JobStat stat, int level)
-{
-    char        *s, *j, ind[10];
-    int         i;
-
-
-    for (i=0; i < level; i++)
-        ind[i]='\t';
-    ind[i]='\0';
-
-    s = edg_wll_StatToString(stat.state);
-/* print whole flat structure */
-    printf("%sstate : %s\n", ind, s);
-    printf("%sjobId : %s\n", ind, j = edg_wlc_JobIdUnparse(stat.jobId));
-    printf("%sowner : %s\n", ind, stat.owner);
-    printf("%sjobtype : %s\n", ind, (stat.jobtype ? "DAG" : "SIMPLE") );
-    printf("%sparent_job : %s\n", ind,
-            j = edg_wlc_JobIdUnparse(stat.parent_job));
-    if (stat.jobtype) {;
-        printf("%sseed : %s\n", ind, stat.seed);
-        printf("%schildren_num : %d\n", ind, stat.children_num);
-        printf("%schildren :\n", ind);
-        if (stat.children)
-                       for  (i=0; stat.children[i]; i++)
-                printf("%s\tchildren : %s\n", ind, stat.children[i]);
-        printf("%schildren_states :\n", ind);
-        if (stat.children_states)
-            for  (i=0; stat.children_states[i].state; i++)
-                printstat(stat.children_states[i], level+1);
-        printf("%schildren_hist :\n",ind);
-        if (stat.children_hist)
-            for (i=1; i<=stat.children_hist[0]; i++)
-                printf("%s%14s  %d\n", ind, edg_wll_StatToString(i-1),stat.children_hist[i]);
-    }
-    printf("%scondorId : %s\n", ind, stat.condorId);
-    printf("%sglobusId : %s\n", ind, stat.globusId);
-    printf("%slocalId : %s\n", ind, stat.localId);
-    printf("%sjdl : %s\n", ind, stat.jdl);
-    printf("%smatched_jdl : %s\n", ind, stat.matched_jdl);
-    printf("%sdestination : %s\n", ind, stat.destination);
-    printf("%snetwork server : %s\n", ind, stat.network_server);
-    printf("%scondor_jdl : %s\n", ind, stat.condor_jdl);
-    printf("%srsl : %s\n", ind, stat.rsl);
-    printf("%sreason : %s\n", ind, stat.reason);
-    printf("%slocation : %s\n", ind, stat.location);
-       printf("%ssubjob_failed : %d\n", ind, stat.subjob_failed);
-    printf("%sdone_code : %d\n", ind, stat.done_code);
-    printf("%sexit_code : %d\n", ind, stat.exit_code);
-    printf("%sresubmitted : %d\n", ind, stat.resubmitted);
-    printf("%scancelling : %d\n", ind, stat.cancelling);
-    printf("%scancelReason : %s\n", ind, stat.cancelReason);
-    printf("%scpuTime : %d\n", ind, stat.cpuTime);
-    printf("%suser_tags :\n",ind);
-    if (stat.user_tags)
-        for (i=0; stat.user_tags[i].tag; i++) printf("%s%14s = \"%s\"\n", ind,
-                              stat.user_tags[i].tag,stat.user_tags[i].value);
-    printf("%sstateEnterTime : %ld.%06ld\n", ind, stat.stateEnterTime.tv_sec,stat.stateEnterTime.tv_usec);
-    printf("%sstateEnterTimes : \n",ind);
-    if (stat.stateEnterTimes)
-                for (i=1; i<=stat.stateEnterTimes[0]; i++)
-            printf("%s%14s  %s", ind, edg_wll_StatToString(i-1), (stat.stateEnterTimes[i] == 0) ?
-            "    - not available -\n" : ctime((time_t *) &stat.stateEnterTimes[i]));
-    printf("%slastUpdateTime : %ld.%06ld\n", ind, stat.lastUpdateTime.tv_sec,stat.lastUpdateTime.tv_usec);
-       printf("%sexpectUpdate : %d\n", ind, stat.expectUpdate);
-    printf("%sexpectFrom : %s\n", ind, stat.expectFrom);
-    printf("%sacl : %s\n", ind, stat.acl);
-    printf("\n");
-
-    free(j);
-    free(s);
-}
diff --git a/org.glite.lb.server/examples/ws_query_ex.c b/org.glite.lb.server/examples/ws_query_ex.c

deleted file mode 100644 (file)

index a08fe33..0000000
--- a/org.glite.lb.server/examples/ws_query_ex.c
+++ /dev/null
@@ -1,182 +0,0 @@
-#include <getopt.h>
-#include <stdsoap2.h>
-
-#include "glite/lb/consumer.h"
-
-#include "ws_plugin.h"
-#include "bk_ws_H.h"
-
-#include "ws_typeref.h"
-
-
-static struct option opts[] = {
-       {"help",        0,      NULL,   'h'},
-       {"server",      1,      NULL,   'm'}
-};
-
-static void usage(char *me)
-{
-       fprintf(stderr,"usage: %s [option]\n"
-               "\t-h, --help      Shows this screen.\n"
-               "\t-m, --server    BK server address:port.\n"
-               , me);
-}
-
-static void printstat(edg_wll_JobStat stat, int level);
-
-int main(int argc,char** argv)
-{
-    edg_wll_Context                                            ctx;
-       edg_wll_QueryRec                                  **conditions = NULL;
-    struct soap                                                   *soap = soap_new();
-       struct edgwll__QueryConditions     *jconds = NULL;
-       struct edgwll__JobStatFlags                     flags;
-    struct edgwll2__QueryJobsResponse  out;
-    int                                                                        opt, err;
-       char                                                       *server = "http://localhost:8999/",
-                                                                          *name = NULL;
-
-
-       name = strrchr(argv[0],'/');
-       if (name) name++; else name = argv[0];
-
-       while ((opt = getopt_long(argc, argv, "hm:", opts, NULL)) != EOF) switch (opt)
-       {
-       case 'h': usage(name); return 0;
-       case 'm': server = strdup(optarg); break;
-       case '?': usage(name); return 1;
-       }
-
-    edg_wll_InitContext(&ctx);
-
-       if ( soap_register_plugin_arg(soap, edg_wll_ws_plugin, (void *)ctx) )
-       {
-               soap_print_fault(soap, stderr);
-               return 1;
-       }
-
-       conditions = (edg_wll_QueryRec **)calloc(3,sizeof(edg_wll_QueryRec *));
-
-       conditions[0] = (edg_wll_QueryRec *)calloc(2,sizeof(edg_wll_QueryRec));
-       conditions[0][0].attr = EDG_WLL_QUERY_ATTR_STATUS;
-       conditions[0][0].op = EDG_WLL_QUERY_OP_UNEQUAL;
-       conditions[0][0].value.i = EDG_WLL_JOB_DONE;
-
-       conditions[1] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       conditions[1][0].attr = EDG_WLL_QUERY_ATTR_OWNER;
-       conditions[1][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       conditions[1][0].value.c = NULL;
-
-       if (   edg_wll_QueryCondsExtToSoap(soap, (const edg_wll_QueryRec **)conditions, &jconds)
-               || edg_wll_JobStatFlagsToSoap(soap, 0, &flags) ) {
-               char    *et,*ed;
-
-               fprintf(stderr, "%s: soap types conversion error...\n", argv[0]);
-               edg_wll_FaultToErr(soap, ctx);
-               edg_wll_Error(ctx, &et, &ed);
-               fprintf(stderr, "%s: %s (%s)\n", argv[0], et, ed);
-               exit(1);
-       }
-
-    err = soap_call_edgwll2__QueryJobs(soap, server, "", jconds, &flags, &out);
-    switch ( err ) {
-       case SOAP_OK: {
-               int             i;
-
-               printf("Query succesfull...\n");
-               printf("%-65s%s\n\n", "jobid", "state");
-               for ( i = 0; i < out.jobs->__sizejobs; i++ ) {
-                       char *s = edg_wll_StatToString(out.states->states[i]->state);
-                       printf("%-65s%s\n", out.jobs->jobs[i], s);
-                       free(s);
-               }
-               }
-               break;
-       case SOAP_FAULT: 
-       case SOAP_SVR_FAULT: {
-               char    *et,*ed;
-
-               edg_wll_FaultToErr(soap, ctx);
-               edg_wll_Error(ctx,&et,&ed);
-               fprintf(stderr,"%s: %s (%s)\n",argv[0],et,ed);
-               exit(1);
-               }
-       default:
-               fprintf(stderr,"err = %d\n",err);
-               soap_print_fault(soap,stderr);
-    }
-
-    return 0;
-}
-
-static void printstat(edg_wll_JobStat stat, int level)
-{
-    char        *s, *j, ind[10];
-    int         i;
-
-
-    for (i=0; i < level; i++)
-        ind[i]='\t';
-    ind[i]='\0';
-
-    s = edg_wll_StatToString(stat.state);
-/* print whole flat structure */
-    printf("%sstate : %s\n", ind, s);
-    printf("%sjobId : %s\n", ind, j = edg_wlc_JobIdUnparse(stat.jobId));
-    printf("%sowner : %s\n", ind, stat.owner);
-    printf("%sjobtype : %s\n", ind, (stat.jobtype ? "DAG" : "SIMPLE") );
-    printf("%sparent_job : %s\n", ind,
-            j = edg_wlc_JobIdUnparse(stat.parent_job));
-    if (stat.jobtype) {;
-        printf("%sseed : %s\n", ind, stat.seed);
-        printf("%schildren_num : %d\n", ind, stat.children_num);
-        printf("%schildren :\n", ind);
-        if (stat.children)
-                       for  (i=0; stat.children[i]; i++)
-                printf("%s\tchildren : %s\n", ind, stat.children[i]);
-        printf("%schildren_states :\n", ind);
-        if (stat.children_states)
-            for  (i=0; stat.children_states[i].state; i++)
-                printstat(stat.children_states[i], level+1);
-        printf("%schildren_hist :\n",ind);
-        if (stat.children_hist)
-            for (i=1; i<=stat.children_hist[0]; i++)
-                printf("%s%14s  %d\n", ind, edg_wll_StatToString(i-1),stat.children_hist[i]);
-    }
-    printf("%scondorId : %s\n", ind, stat.condorId);
-    printf("%sglobusId : %s\n", ind, stat.globusId);
-    printf("%slocalId : %s\n", ind, stat.localId);
-    printf("%sjdl : %s\n", ind, stat.jdl);
-    printf("%smatched_jdl : %s\n", ind, stat.matched_jdl);
-    printf("%sdestination : %s\n", ind, stat.destination);
-    printf("%snetwork server : %s\n", ind, stat.network_server);
-    printf("%scondor_jdl : %s\n", ind, stat.condor_jdl);
-    printf("%srsl : %s\n", ind, stat.rsl);
-    printf("%sreason : %s\n", ind, stat.reason);
-    printf("%slocation : %s\n", ind, stat.location);
-       printf("%ssubjob_failed : %d\n", ind, stat.subjob_failed);
-    printf("%sdone_code : %d\n", ind, stat.done_code);
-    printf("%sexit_code : %d\n", ind, stat.exit_code);
-    printf("%sresubmitted : %d\n", ind, stat.resubmitted);
-    printf("%scancelling : %d\n", ind, stat.cancelling);
-    printf("%scancelReason : %s\n", ind, stat.cancelReason);
-    printf("%scpuTime : %d\n", ind, stat.cpuTime);
-    printf("%suser_tags :\n",ind);
-    if (stat.user_tags)
-        for (i=0; stat.user_tags[i].tag; i++) printf("%s%14s = \"%s\"\n", ind,
-                              stat.user_tags[i].tag,stat.user_tags[i].value);
-    printf("%sstateEnterTime : %ld.%06ld\n", ind, stat.stateEnterTime.tv_sec,stat.stateEnterTime.tv_usec);
-    printf("%sstateEnterTimes : \n",ind);
-    if (stat.stateEnterTimes)
-                for (i=1; i<=stat.stateEnterTimes[0]; i++)
-            printf("%s%14s  %s", ind, edg_wll_StatToString(i-1), (stat.stateEnterTimes[i] == 0) ?
-            "    - not available -\n" : ctime((time_t *) &stat.stateEnterTimes[i]));
-    printf("%slastUpdateTime : %ld.%06ld\n", ind, stat.lastUpdateTime.tv_sec,stat.lastUpdateTime.tv_usec);
-       printf("%sexpectUpdate : %d\n", ind, stat.expectUpdate);
-    printf("%sexpectFrom : %s\n", ind, stat.expectFrom);
-    printf("%sacl : %s\n", ind, stat.acl);
-    printf("\n");
-
-    free(j);
-    free(s);
-}
diff --git a/org.glite.lb.server/project/LB.wsdl b/org.glite.lb.server/project/LB.wsdl

deleted file mode 100644 (file)

index 33e39d1..0000000
--- a/org.glite.lb.server/project/LB.wsdl
+++ /dev/null
@@ -1,326 +0,0 @@
-<WSDL:definitions
-       xmlns:tns="http://glite.org/wsdl/services/lb"
-       xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-       xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-       xmlns:glitensservices="http://glite.org/wsdl/services/lb"
-       xmlns:glitenstypes="http://glite.org/wsdl/types/lb"
-       xmlns:SOAP="http://schemas.xmlsoap.org/wsdl/soap/"
-       xmlns:WSDL="http://schemas.xmlsoap.org/wsdl/"
-       xmlns="http://schemas.xmlsoap.org/wsdl/"
-       targetNamespace="http://glite.org/wsdl/services/lb"
-       name="LoggingAndBookkeeping">
-
-       <WSDL:types>
-               <schema
-                       targetNamespace="http://glite.org/wsdl/types/lb"
-                       xmlns="http://www.w3.org/2001/XMLSchema"
-                       elementFormDefault="unqualified"
-                       attributeFormDefault="unqualified">
-
-                       <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
-                       <simpleType name="QueryAttr">
-                               <restriction base="xsd:string">
-                                       <enumeration value="UNDEF"/>
-                                       <enumeration value="JOBID"/>
-                                       <enumeration value="OWNER"/>
-                                       <enumeration value="STATUS"/>
-                                       <enumeration value="LOCATION"/>
-                                       <enumeration value="DESTINATION"/>
-                                       <enumeration value="DONECODE"/>
-                                       <enumeration value="USERTAG"/>
-                                       <enumeration value="TIME"/>
-                                       <enumeration value="LEVEL"/>
-                                       <enumeration value="HOST"/>
-                                       <enumeration value="SOURCE"/>
-                                       <enumeration value="INSTANCE"/>
-                                       <enumeration value="EVENT-TYPE"/>
-                                       <enumeration value="CHKPT-TAG"/>
-                                       <enumeration value="RESUBMITTED"/>
-                                       <enumeration value="PARENT"/>
-                                       <enumeration value="EXITCODE"/>
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="QueryOp">
-                               <restriction base="xsd:string">
-                                       <enumeration value="EQUAL"/>
-                                       <enumeration value="LESS"/>
-                                       <enumeration value="GREATER"/>
-                                       <enumeration value="WITHIN"/>
-                                       <enumeration value="UNEQUAL"/>
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="JobStatCode">
-                               <restriction base="xsd:string">
-                                       <enumeration value="UNDEF"/>
-                                       <enumeration value="SUBMITTED"/>
-                                       <enumeration value="WAITING"/>
-                                       <enumeration value="READY"/>
-                                       <enumeration value="SCHEDULED"/>
-                                       <enumeration value="RUNNING"/>
-                                       <enumeration value="DONE"/>
-                                       <enumeration value="CLEARED"/>
-                                       <enumeration value="ABORTED"/>
-                                       <enumeration value="CANCELLED"/>
-                                       <enumeration value="UNKNOWN"/>
-                                       <enumeration value="PURGED"/>
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="StatJobType">
-                               <restriction base="xsd:string">
-                                       <enumeration value="SIMPLE"/>
-                                       <enumeration value="DAG"/>
-                               </restriction>
-                       </simpleType>
-                       <simpleType name="StatDoneCode">
-                               <restriction base="xsd:string">
-                                       <enumeration value="OK"/>
-                                       <enumeration value="FAILED"/>
-                                       <enumeration value="CANCELLED"/>
-                               </restriction>
-                       </simpleType>
-                       <complexType name="timeval">
-                               <sequence>
-                                       <element name="tvSec" type="xsd:long" minOccurs="1" maxOccurs="1"/>
-                                       <element name="tvUsec" type="xsd:long" minOccurs="1" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="QueryRecAttrId">
-                               <sequence>
-                                       <element name="tag" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="state" type="glitenstypes:JobStatCode" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="QueryRecValue">
-                               <sequence>
-                                       <element name="i" type="xsd:int" minOccurs="0" maxOccurs="1"/>
-                                       <element name="c" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="t" type="glitenstypes:timeval" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="QueryRec">
-                               <sequence>
-                                       <element name="op" type="glitenstypes:QueryOp" minOccurs="1" maxOccurs="1"/>
-                                       <element name="attrid" type="glitenstypes:QueryRecAttrId" minOccurs="0" maxOccurs="1"/>
-                                       <element name="value1" type="glitenstypes:QueryRecValue" minOccurs="1" maxOccurs="1"/>
-                                       <element name="value2" type="glitenstypes:QueryRecValue" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="QueryCondition">
-                               <sequence>
-                                       <element name="attr" type="glitenstypes:QueryAttr" minOccurs="1" maxOccurs="1"/>
-                                       <element name="records" type="glitenstypes:QueryRec" minOccurs="1" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="QueryConditions">
-                               <sequence>
-                                       <element name="condition" type="glitenstypes:QueryCondition" minOccurs="1" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType  name="TagValue">
-                               <sequence>
-                                       <element name="tag" type="xsd:string" minOccurs="1" maxOccurs="1" />
-                                       <element name="value" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <simpleType name="JobStatFlag">
-                               <restriction base="xsd:string">
-                                       <enumeration value="CLASSADS"/>
-                                       <enumeration value="CHILDREN"/>
-                                       <enumeration value="CHILDSTAT"/>
-                               </restriction>
-                       </simpleType>
-                       <complexType name="JobStatFlags">
-                               <sequence>
-                                       <element name="flag" type="glitenstypes:JobStatFlag" minOccurs="0" maxOccurs="unbounded"/>
-                               </sequence>
-                       </complexType>
-                       <complexType name="JobStat">
-                               <sequence>
-                                       <element name="state" type="glitenstypes:JobStatCode" minOccurs="1" maxOccurs="1"/>
-                                       <element name="jobId" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="owner" type="xsd:string" minOccurs="0" maxOccurs="1" nillable="true"/>
-                                       <element name="jobtype" type="glitenstypes:StatJobType" minOccurs="1" maxOccurs="1"/>
-                                       <element name="parentJob" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="seed" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="childrenNum" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                                       <element name="children" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
-                                       <element name="childrenHist" type="xsd:int" minOccurs="0" maxOccurs="unbounded"/>
-                                       <element name="childrenStates" type="glitenstypes:JobStat" minOccurs="0" maxOccurs="unbounded"/>
-                                       <element name="condorId" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="globusId" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="localId" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="jdl" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="matchedJdl" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="destination" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="condorJdl" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="rsl" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="reason" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="location" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="ceNode" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="networkServer" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="subjobFailed" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-                                       <element name="doneCode" type="glitenstypes:StatDoneCode" minOccurs="1" maxOccurs="1"/>
-                                       <element name="exitCode" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                                       <element name="resubmitted" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-                                       <element name="cancelling" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-                                       <element name="cancelReason" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="cpuTime" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                                       <element name="userTags" type="glitenstypes:TagValue" minOccurs="0" maxOccurs="unbounded"/>
-                                       <element name="stateEnterTime" type="glitenstypes:timeval" minOccurs="1" maxOccurs="1"/>
-                                       <element name="lastUpdateTime" type="glitenstypes:timeval" minOccurs="1" maxOccurs="1"/>
-                                       <element name="stateEnterTimes" type="xsd:int" minOccurs="0" maxOccurs="unbounded" nillable="true"/>
-                                       <element name="expectUpdate" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
-                                       <element name="expectFrom" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="acl" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <complexType  name="jobsOut">
-                               <sequence>
-                                       <element name="jobs" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
-                               </sequence>
-                       </complexType>
-                       <complexType  name="statesOut">
-                               <sequence>
-                                       <element name="states" type="glitenstypes:JobStat" minOccurs="0" maxOccurs="unbounded" />
-                               </sequence>
-                       </complexType>
-                       <complexType name="GenericLBFaultType">
-                               <sequence>
-                                       <element name="source" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="code" type="xsd:int" minOccurs="1" maxOccurs="1"/>
-                                       <element name="text" type="xsd:string" minOccurs="1" maxOccurs="1"/>
-                                       <element name="description" type="xsd:string" minOccurs="0" maxOccurs="1"/>
-                                       <element name="reason" type="glitenstypes:GenericLBFaultType" minOccurs="0" maxOccurs="1"/>
-                               </sequence>
-                       </complexType>
-                       <element name="GenericLBFault" type="glitenstypes:GenericLBFaultType"/>
-               </schema>
-       </WSDL:types>
-       <message name="JobStatusRequest">
-               <part name="jobid" type="xsd:string"/>
-               <part name="flags" type="glitenstypes:JobStatFlags"/>
-       </message>
-       <message name="JobStatusResponse">
-               <part name="status" type="glitenstypes:JobStat"/>
-       </message>
-       <message name="QueryJobsRequest">
-               <part name="conditions" type="glitenstypes:QueryConditions"/>
-               <part name="flags" type="glitenstypes:JobStatFlags"/>
-       </message>
-       <message name="QueryJobsResponse">
-               <part name="jobs" type="glitenstypes:jobsOut"/>
-               <part name="states" type="glitenstypes:statesOut"/>
-       </message>
-       <message name="UserJobsRequest">
-       </message>
-       <message name="UserJobsResponse">
-               <part name="jobs" type="xsd:string"/>
-               <part name="states" type="glitenstypes:JobStat"/>
-       </message>
-
-       <message name="GenericLBFault">
-               <part name="fault" element="glitenstypes:GenericLBFault"/>
-       </message>
-
-       <portType name="LoggingAndBookkeeping_PortType">
-               <operation name="JobStatus">
-                       <documentation>Retrieve state of a single job.
-
-Given a job id queries LB for detailed state of the job.
-
-
-Input:
-
-jobid: Id of the job
-
-flags: Which fields of the job state should be retrieved: zero or more of CLASSADS, CHILDREN, CHILDSTAT
-
-Output: state of the job
-
-Faults: GenericLBFault
-                       </documentation>
-                       <input name="i" message="tns:JobStatusRequest"/>
-                       <output name="o" message="tns:JobStatusResponse"/>
-                       <fault name="f" message="tns:GenericLBFault"/>
-               </operation>
-               <operation name="QueryJobs">
-                       <documentation>Query for jobs satisfying set of conditions.
-
-Intput:
-
-conditions: list of lists of query conditions. 
-       Elements of the inner lists refer to a single job attribute, the conditions are or-ed.
-       Elements of the outer list may refer to different job attributes, they are and-ed.
-
-flags: Which fields of the job state should be retrieved: see JobStatus
-
-Output: list of mathching jobs, including their states
-
-Faults: GenericLBFault
-                       </documentation>
-                       <input name="i" message="tns:QueryJobsRequest"/>
-                       <output name="o" message="tns:QueryJobsResponse"/>
-                       <fault name="f" message="tns:GenericLBFault"/>
-               </operation>
-               <operation name="UserJobs">
-                       <documentation>Query all jobs of the current user.
-
-Input: no input
-
-Output: list of all user's jobs, including their states
-
-Faults: GenericLBFault
-                       </documentation>
-                       <input name="i" message="tns:UserJobsRequest"/>
-                       <output name="o" message="tns:UserJobsResponse"/>
-                       <fault name="f" message="tns:GenericLBFault"/>
-               </operation>
-       </portType>
-       <binding name="LoggingAndBookkeeping" type="tns:LoggingAndBookkeeping_PortType">
-               <SOAP:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-               <operation name="JobStatus">
-                       <SOAP:operation style="rpc"/>
-                       <input name="i">
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/lb"/>
-                       </input>
-                       <output name="o">
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/lb"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="QueryJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/lb"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/lb"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-               <operation name="UserJobs">
-                       <SOAP:operation style="rpc"/>
-                       <input>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/lb"/>
-                       </input>
-                       <output>
-                               <SOAP:body use="literal" namespace="http://glite.org/wsdl/services/lb"/>
-                       </output>
-                       <fault name="f">
-                               <SOAP:fault name="f" use="literal"/>
-                       </fault>
-               </operation>
-       </binding>
-       <service name="LoggingAndBookkeeping">
-               <documentation>Logging and Bookkeeping service</documentation>
-               <port name="LoggingAndBookkeeping" binding="tns:LoggingAndBookkeeping">
-                       <SOAP:address location="http://test.glite.org/lb:8080"/>
-               </port>
-       </service>
-</WSDL:definitions>
diff --git a/org.glite.lb.server/project/build.properties b/org.glite.lb.server/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.lb.server/project/configure.properties.xml b/org.glite.lb.server/project/configure.properties.xml

deleted file mode 100644 (file)

index cbf186d..0000000
--- a/org.glite.lb.server/project/configure.properties.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.3  2004/10/06 08:14:36  dkouril
-       Support for VOMS and GACL (gridsite) from SCM CVS
-       - legacy names of GACL routines changed to new ones, which also prevents from
-         conflicts with a few older routine names being badly redefined to new ones
-       - VOMS and GACL are still commented out in the Makefile until a correct way
-         of defining dependencies is negotiated.
-       
-       Revision 1.2.2.1  2004/09/21 07:39:45  akrenek
-       
-       - First version of BK server using "server bones" library and WS protocol.
-       - Under hard development - unstable & buggy
-       
-       Revision 1.2  2004/09/08 13:38:03  akrenek
-       query event unit test (not complete yet)
-       
-       Revision 1.1  2004/07/07 12:08:09  akrenek
-       *** empty log message ***
-       
-       Revision 1.2  2004/07/06 20:47:11  flammer
-       Moved to configure.properties.xml
-       
-       
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="LB Client configuration options">                                                                        
-               <target name="lbmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-lbprefix=${subsystem.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-expat_prefix=${with.expat.prefix}
-ares_prefix=${with.ares.prefix}
-mysql_prefix=${with.mysql.prefix}
-cppunit=${with.cppunit.prefix}
-gridsite_prefix=${with.gridsite.prefix}
-gsoap_prefix=${with.gsoap.prefix}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.lb.server/project/properties.xml b/org.glite.lb.server/project/properties.xml

deleted file mode 100755 (executable)

index 781ad01..0000000
--- a/org.glite.lb.server/project/properties.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite LB Server component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
--->
-
-<project name="LB Server component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${lb.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${lb.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="server" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
-\ No newline at end of file
diff --git a/org.glite.lb.server/project/tar_exclude b/org.glite.lb.server/project/tar_exclude

deleted file mode 100644 (file)

index b3133e4..0000000
--- a/org.glite.lb.server/project/tar_exclude
+++ /dev/null
@@ -1,10 +0,0 @@
-tar_exclude
-CVS
-build.xml
-build
-build.properties
-properties.xml
-configure-options.xml
-.cvsignore
-.project
-.cdtproject
diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties

deleted file mode 100644 (file)

index c422195..0000000
--- a/org.glite.lb.server/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:12:36 CEST 2004
-module.version=0.3.2
-module.build=47
-module.age=1
diff --git a/org.glite.lb.server/src/bkindex.c b/org.glite.lb.server/src/bkindex.c

deleted file mode 100644 (file)

index fe8014e..0000000
--- a/org.glite.lb.server/src/bkindex.c
+++ /dev/null
@@ -1,305 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <sysexits.h>
-#include <assert.h>
-
-#include "glite/wmsutils/jobid/strmd5.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "index.h"
-#include "lbs_db.h"
-#include "jobstat.h"
-
-static struct option opts[] = {
-       { "mysql",1,NULL,'m' },
-       { "remove",0,NULL,'R' },
-       { "really",0,NULL,'r' },
-       { "dump",0,NULL,'d' },
-       { "verbose",0,NULL,'v' },
-       { NULL, 0, NULL, 0 }
-};
-
-static void usage(const char *);
-static void do_exit(edg_wll_Context,int);
-static char *col_list(const edg_wll_QueryRec *);
-static char *db_col_type(const edg_wll_QueryRec *);
-
-/* XXX: don't bother with malloc() of arrays that are tiny in real life */
-#define CI_MAX 200
-
-int debug;
-
-int main(int argc,char **argv)
-{
-       int     opt;
-       char    *dbstring = getenv("LBDB");
-       char    *fname = "-";
-       int     dump = 0, really = 0, verbose = 0, remove_all = 0;
-       edg_wll_Context ctx;
-       edg_wll_QueryRec        **old_indices,**new_indices;
-       edg_wll_QueryRec        *new_columns[CI_MAX],*old_columns[CI_MAX];
-       int     add_columns[CI_MAX],drop_columns[CI_MAX];
-       int     add_indices[CI_MAX],drop_indices[CI_MAX];
-       edg_wll_IColumnRec *added_icols;
-       int     nadd_icols;
-       char    **index_names;
-       int     i,j,k;
-       int     nnew,nold,nadd,ndrop;
-       char    *stmt;
-
-       for (i=0; i<CI_MAX; i++) add_indices[i] = drop_indices[i] = -1;
-       memset(new_columns,0,sizeof new_columns);
-       memset(old_columns,0,sizeof old_columns);
-       memset(add_columns,0,sizeof add_columns);
-       memset(drop_columns,0,sizeof drop_columns);
-
-       while ((opt = getopt_long(argc,argv,"m:rRdv",opts,NULL)) != EOF) switch (opt) {
-               case 'm': dbstring = optarg; break;
-               case 'r': really = 1; break;
-               case 'R': remove_all = 1; break;
-               case 'd': dump = 1; break;
-               case 'v': verbose++; break;
-               case '?': usage(argv[0]); exit(EX_USAGE);
-       }
-
-       if (really && dump) { usage(argv[0]); exit(EX_USAGE); }
-       if (really && remove_all) { usage(argv[0]); exit(EX_USAGE); }
-       if (optind < argc) {
-               if (dump || remove_all) { usage(argv[0]); exit(EX_USAGE); }
-               else fname = argv[optind];
-       }
-
-       edg_wll_InitContext(&ctx);
-       if (edg_wll_Open(ctx,dbstring)) do_exit(ctx,EX_UNAVAILABLE);
-       if (edg_wll_DBCheckVersion(ctx)) do_exit(ctx,EX_SOFTWARE);
-       if (edg_wll_QueryJobIndices(ctx,&old_indices,&index_names)) do_exit(ctx,EX_SOFTWARE);
-
-       if (dump) {
-               if (edg_wll_DumpIndexConfig(ctx,fname,old_indices)) do_exit(ctx,EX_SOFTWARE);
-               else if ( !remove_all ) return 0;
-       }
-
-       if (remove_all) {
-               if (verbose) printf("Dropping all indices");
-               for (i=0; index_names && index_names[i]; i++) {
-                       asprintf(&stmt,"alter table states drop index `%s`",index_names[i]);
-                       if (verbose) putchar('.');
-                       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) do_exit(ctx,EX_SOFTWARE);
-                       free(stmt);
-               }
-               if (verbose) puts(" done");
-               if (verbose) printf("Dropping index columns");
-               for (i=0; old_indices && old_indices[i]; i++) {
-                       char *cname = edg_wll_QueryRecToColumn(old_indices[i]);
-                       asprintf(&stmt,"alter table states drop column `%s`",cname);
-                       if (verbose) putchar('.');
-                       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) do_exit(ctx,EX_SOFTWARE);
-                       free(stmt);
-                       free(cname);
-               }
-               if (verbose) puts(" done");
-               return 0;
-       }
-
-       if (edg_wll_ParseIndexConfig(ctx,fname,&new_indices))
-               do_exit(ctx,edg_wll_Error(ctx,NULL,NULL) == EINVAL ? EX_DATAERR : EX_IOERR);
-
-       /* FIXME: check duplicate columns in indices */
-
-/* indices to add & drop */
-       nadd = ndrop = 0;
-       if (old_indices && new_indices) {
-               for (i=0; old_indices[i]; i++) {
-                       for (j=0; new_indices[j]; j++) {
-                               for (k=0; old_indices[i][k].attr &&
-                                       !edg_wll_CmpColumn(&old_indices[i][k],&new_indices[j][k]);
-                                       k++);
-                               if (!old_indices[i][k].attr && !new_indices[j][k].attr) break;
-                       }
-                       if (!new_indices[j]) drop_indices[ndrop++] = i;
-               }
-                                       
-               for (i=0; new_indices[i]; i++) {
-                       for (j=0; old_indices[j]; j++) {
-                               for (k=0; new_indices[i][k].attr &&
-                                       !edg_wll_CmpColumn(&new_indices[i][k],&old_indices[j][k]);
-                                       k++);
-                               if (!new_indices[i][k].attr && !old_indices[j][k].attr) break;
-                       }
-                       if (!old_indices[j]) add_indices[nadd++] = i;
-               }
-       }
-       else if (new_indices) for (i=0; new_indices[i]; i++) add_indices[i] = i;
-       else if (old_indices) for (i=0; old_indices[i]; i++) drop_indices[i] = i;
-
-/* old and new column sets */
-       nold = nnew = 0;
-       if (old_indices) for (i=0; old_indices[i]; i++) 
-               for (j=0; old_indices[i][j].attr; j++) {
-                       for (k=0; k<nold && edg_wll_CmpColumn(old_columns[k],&old_indices[i][j]); k++);
-                       if (k == nold) {
-                               assert(nold < CI_MAX);
-                               old_columns[nold++] = &old_indices[i][j];
-                       }
-               }
-
-       if (new_indices) for (i=0; new_indices[i]; i++) 
-               for (j=0; new_indices[i][j].attr; j++) {
-                       for (k=0; k<nnew && edg_wll_CmpColumn(new_columns[k],&new_indices[i][j]); k++);
-                       if (k == nnew) {
-                               assert(nnew < CI_MAX);
-                               new_columns[nnew++] = &new_indices[i][j];
-                       }
-               }
-
-/* go! */
-       if (!really) puts("\n** Dry run, no actual actions performed **\n");
-
-       if (verbose) puts("Dropping indices ...");
-       for (i=0; drop_indices[i] >= 0; i++) {
-               if (verbose) { 
-                       char    *n = col_list(old_indices[drop_indices[i]]);
-                       printf("\t%s(%s) ... ",index_names[drop_indices[i]],n); fflush(stdout);
-                       free(n);
-               }
-               if (really) {
-                       asprintf(&stmt,"alter table states drop index `%s`",index_names[drop_indices[i]]);
-                       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) do_exit(ctx,EX_SOFTWARE);
-                       free(stmt);
-               }
-               if (verbose) puts(really ? "done" : "");
-       }
-
-       if (verbose) puts("Dropping columns ...");
-       for (i=0; i<nold; i++) {
-               for (j=0; j<nnew && edg_wll_CmpColumn(old_columns[i],new_columns[j]); j++);
-               if (j == nnew) {
-                       char    *cname = edg_wll_QueryRecToColumn(old_columns[i]);
-                       if (verbose) printf("\t%s\n",cname); 
-                       if (really) {
-                               asprintf(&stmt,"alter table states drop column `%s`",cname);
-                               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) do_exit(ctx,EX_SOFTWARE);
-                               free(stmt);
-                       }
-                       free(cname);
-               }
-       }
-
-       added_icols = calloc(nnew+1, sizeof(edg_wll_IColumnRec));
-       nadd_icols = 0;
-       if (verbose) puts("Adding columns ...");
-       for (i=0; i<nnew; i++) {
-               for (j=0; j<nold && edg_wll_CmpColumn(new_columns[i],old_columns[j]); j++);
-               if (j == nold) {
-                       char    *cname = edg_wll_QueryRecToColumn(new_columns[i]);
-                       if (verbose) printf("\t%s\n",cname); 
-                       if (really) {
-                               char    *ctype = db_col_type(new_columns[i]);
-                               asprintf(&stmt,"alter table states add `%s` %s",cname,ctype);
-                               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) do_exit(ctx,EX_SOFTWARE);
-                               free(stmt);
-                       }
-                       memcpy(&added_icols[nadd_icols].qrec, new_columns[i], sizeof(edg_wll_QueryRec));
-                       added_icols[nadd_icols].colname = strdup(cname);
-                       if (new_columns[i]->attr == EDG_WLL_QUERY_ATTR_USERTAG)
-                               added_icols[nadd_icols].qrec.attr_id.tag =
-                                       strdup(new_columns[i]->attr_id.tag);
-                       nadd_icols++;
-                       free(cname);
-               }
-       }
-
-       if (nadd_icols) {
-               added_icols[nadd_icols].qrec.attr = EDG_WLL_QUERY_ATTR_UNDEF;
-               added_icols[nadd_icols].colname = NULL;
-               if (verbose) puts("Refreshing data ...");
-               if (really && edg_wll_RefreshIColumns(ctx, (void*) added_icols)) do_exit(ctx,EX_SOFTWARE);
-       }
-       else if (verbose) puts("No data refresh required");
-
-       for (nadd_icols--; nadd_icols >= 0; nadd_icols--)
-               edg_wll_FreeIColumnRec(&added_icols[nadd_icols]);
-       free(added_icols);
-
-       if (verbose) puts("Creating indices ...");
-       for (i=0; add_indices[i] >= 0; i++) {
-               char    *l = col_list(new_indices[add_indices[i]]);
-               char    *n = str2md5base64(l);
-               if (verbose) { printf("\t%s(%s) ... ",n,l); fflush(stdout); }
-               if (really) {
-                       asprintf(&stmt,"create index `%s` on states(%s)",n,l);
-                       free(n); free(l);
-                       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) do_exit(ctx,EX_SOFTWARE);
-                       free(stmt);
-               }
-               if (verbose) puts(really ? "done" : "");
-       }
-
-       return 0;
-}
-
-static char *col_list(const edg_wll_QueryRec *ind)
-{
-       char    *ret,*aux,size[50] = "";
-       int     j;
-
-       aux = edg_wll_QueryRecToColumn(ind);
-       if (ind->value.i) sprintf(size,"(%d)",ind->value.i);
-       asprintf(&ret,"`%s`%s",aux,size);
-       free(aux);
-
-       for (j=1; ind[j].attr; j++) {
-               char    *n = edg_wll_QueryRecToColumn(ind+j),size[50] = "";
-               if (ind[j].value.i) sprintf(size,"(%d)",ind[j].value.i);
-               aux = ret;
-               asprintf(&ret,"%s,`%s`%s",aux,n,size);
-               free(n); free(aux);
-       }
-       return ret;
-}
-
-static char *db_col_type(const edg_wll_QueryRec *r)
-{
-       switch (r->attr) {
-               case EDG_WLL_QUERY_ATTR_OWNER:
-               case EDG_WLL_QUERY_ATTR_LOCATION:
-               case EDG_WLL_QUERY_ATTR_DESTINATION:
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-               case EDG_WLL_QUERY_ATTR_HOST:
-               case EDG_WLL_QUERY_ATTR_CHKPT_TAG:
-                       return "char(250) binary null";
-
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       return "datetime null";
-               default:
-                       return NULL;
-       }
-}
-
-static void do_exit(edg_wll_Context ctx,int code)
-{
-       char    *et,*ed;
-
-       edg_wll_Error(ctx,&et,&ed);
-       fprintf(stderr,"edg-bkindex: %s (%s)\n",et,ed);
-       exit(code);
-}
-
-static void usage(const char *me)
-{
-       fprintf(stderr,"usage: %s <options> [file]\n"
-                       "       -m,--mysql <dbstring>   use non-default database connection\n"
-                       "       -r,--really             really perform reindexing\n"
-                       "       -R,--remove             remove all indexes from server\n"
-                       "       -d,--dump               dump current setup\n"
-                       "       -v,--verbose            increase verbosity (2 levels)\n"
-                       "\n     -r and -d are mutually exlusive\n"
-                       "\n     -r and -R are mutually exlusive\n"
-                       "       [file] is applicable only without -d and -R\n",
-                       me);
-}
diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c

deleted file mode 100644 (file)

index 65f334f..0000000
--- a/org.glite.lb.server/src/bkserverd.c
+++ /dev/null
@@ -1,1351 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <getopt.h>
-#include <linux/limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <netinet/in.h>
-#include <signal.h>
-#include <errno.h>
-#include <netdb.h>
-#include <limits.h>
-#include <assert.h>
-#include <syslog.h>
-#include <sys/time.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
-#include <resolv.h>
-#include <ares.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-
-#include <globus_common.h>
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-#include <stdsoap2.h>
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-#include "glite/lb/srvbones.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/context.h"
-#include "glite/lb/mini_http.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/lb_gss.h"
-
-#include "lb_http.h"
-#include "lb_proto.h"
-#include "index.h"
-#include "lbs_db.h"
-#include "lb_authz.h"
-#include "il_notification.h"
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-#include "ws_plugin.h"
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-extern int edg_wll_StoreProto(edg_wll_Context ctx);
-extern edg_wll_ErrorCode edg_wll_Open(edg_wll_Context ctx, char *cs);
-extern edg_wll_ErrorCode edg_wll_Close(edg_wll_Context);
-
-
-
-
-#define CON_QUEUE              20      /* accept() */
-#define SLAVE_OVERLOAD         10      /* queue items per slave */
-#define CLNT_TIMEOUT           10      /* keep idle connection that many seconds */
-#define TOTAL_CLNT_TIMEOUT     60      /* one client may ask one slave multiple times */
-                                       /* but only limited time to avoid DoS attacks */
-#define CLNT_REJECT_TIMEOUT    100000  /* time limit for client rejection in !usec! */
-#define DNS_TIMEOUT            5       /* how long wait for DNS lookup */
-#define SLAVE_CONNS_MAX                500     /* commit suicide after that many connections */
-#define MASTER_TIMEOUT         30      /* maximal time of one-round of master network communication */
-#define SLAVE_TIMEOUT          30      /* maximal time of one-round of slave network communication */
-
-#ifndef EDG_PURGE_STORAGE
-#define EDG_PURGE_STORAGE      "/tmp/purge"
-#endif
-
-#ifndef EDG_DUMP_STORAGE
-#define EDG_DUMP_STORAGE       "/tmp/dump"
-#endif
-
-/* file to store pid and generate semaphores key */
-#ifndef EDG_BKSERVERD_PIDFILE
-#define EDG_BKSERVERD_PIDFILE  "/var/run/edg-bkserverd.pid"
-#endif
-
-#ifndef dprintf
-#define dprintf(x)             { if (debug) printf x; }
-#endif
-
-#define sizofa(a)              (sizeof(a)/sizeof((a)[0]))
-
-
-int                                            debug  = 0;
-int                                            rgma_export = 0;
-static const int               one = 1;
-static int                             noAuth = 0;
-static int                             noIndex = 0;
-static int                             strict_locking = 0;
-static int                             hardJobsLimit = 0;
-static int                             hardEventsLimit = 0;
-static int                             hardRespSizeLimit = 0;
-static char                       *dbstring = NULL,*fake_host = NULL;
-static int                             fake_port = 0;
-static char                      **super_users = NULL;
-static int                             slaves = 10,
-                                               semaphores = -1,
-                                               semset;
-static char                       *purgeStorage = EDG_PURGE_STORAGE;
-static char                       *dumpStorage = EDG_DUMP_STORAGE;
-
-
-static time_t                  purge_timeout[EDG_WLL_NUMBER_OF_STATCODES];
-static time_t                  notif_duration = 60*60*24*7;
-
-static gss_cred_id_t   mycred = GSS_C_NO_CREDENTIAL;
-char                              *cadir = NULL,
-                                          *vomsdir = NULL;
-
-
-static struct option opts[] = {
-       {"cert",        1, NULL,        'c'},
-       {"key",         1, NULL,        'k'},
-       {"CAdir",       1, NULL,        'C'},
-       {"VOMSdir",     1, NULL,        'V'},
-       {"port",        1, NULL,        'p'},
-#ifdef GLITE_LB_SERVER_WITH_WS
-       {"wsport",  1, NULL,    'w'},
-#endif /* GLITE_LB_SERVER_WITH_WS */
-       {"address",     1, NULL,        'a'},
-       {"debug",       0, NULL,        'd'},
-       {"rgmaexport",  0, NULL,        'r'},
-       {"mysql",       1, NULL,        'm'},
-       {"noauth",      0, NULL,        'n'},
-       {"slaves",      1, NULL,        's'},
-       {"semaphores",  1, NULL,        'l'},
-       {"pidfile",     1, NULL,        'i'},
-       {"purge-prefix",        1, NULL,        'S'},
-       {"dump-prefix", 1, NULL,        'D'},
-       {"super-user",  1, NULL,        'R'},
-       {"super-users-file",    1, NULL,'F'},
-       {"no-index",    1, NULL,        'x'},
-       {"strict-locking",0, NULL,      'P'},
-       {"limits",      1, NULL,        'L'},
-       {"notif-dur",   1, NULL,        'N'},
-       {"notif-il-sock",       1, NULL,        'X'},
-       {"notif-il-fprefix",    1, NULL,        'Y'},
-       {NULL,0,NULL,0}
-};
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-static const char *get_opt_string = "a:c:k:C:V:p:w:drm:ns:l:L:N:i:S:D:X:Y:";
-#else
-static const char *get_opt_string = "a:c:k:C:V:p:drm:ns:l:L:N:i:S:D:X:Y:";
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-static void usage(char *me) 
-{
-       fprintf(stderr,"usage: %s [option]\n"
-               "\t-a, --address\t use this server address (may be faked for debugging)\n"
-               "\t-k, --key\t private key file\n"
-               "\t-c, --cert\t certificate file\n"
-               "\t-C, --CAdir\t trusted certificates directory\n"
-               "\t-V, --VOMSdir\t trusted VOMS servers certificates directory\n"
-               "\t-p, --port\t port to listen\n"
-#ifdef GLITE_LB_SERVER_WITH_WS
-               "\t-w, --wsport\t port to serve the web services requests\n"
-#endif /* GLITE_LB_SERVER_WITH_WS */
-               "\t-m, --mysql\t database connect string\n"
-               "\t-d, --debug\t don't run as daemon, additional diagnostics\n"
-               "\t-r, --rgmaexport write state info to RGMA interface\n"
-               "\t-n, --noauth\t don't check user identity with result owner\n"
-               "\t-s, --slaves\t number of slave servers to fork\n"
-               "\t-l, --semaphores number of semaphores (job locks) to use\n"
-               "\t-i, --pidfile\t file to store master pid\n"
-               "\t-L, --limits\t query limits numbers in format \"events_limit:jobs_limit:size_limit\"\n"
-               "\t-N, --notif-dur\t Maximal duration of notification registrations in hours\n"
-               "\t-S, --purge-prefix\t purge files full-path prefix\n"
-               "\t-D, --dump-prefix\t dump files full-path prefix\n"
-               "\t--super-user\t user allowed to bypass authorization and indexing\n"
-               "\t--super-users-file\t the same but read the subjects from a file\n"
-               "\t--no-index=1\t don't enforce indices for superusers\n"
-               "\t          =2\t don't enforce indices at all\n"
-               "\t--strict-locking=1\t lock jobs also on storing events (may be slow)\n"
-               "\t--notif-il-sock\t socket to send notifications\n"
-               "\t--notif-il-fprefix\t file prefix for notifications\n"
-       ,me);
-}
-
-static void wait_for_open(edg_wll_Context,const char *);
-static int decrement_timeout(struct timeval *, struct timeval, struct timeval);
-static int read_roots(const char *);
-static int asyn_gethostbyaddr(char **, const char *, int, int, struct timeval *);
-static int amIroot(const char *);
-static int parse_limits(char *, int *, int *, int *);
-static int check_mkdir(const char *);
-
-
-/*
- *     SERVER BONES structures and handlers
- */
-int bk_clnt_data_init(void **);
-
-       /*
-        *      Serve & Store handlers
-        */
-int bk_clnt_reject(int);
-int bk_handle_connection(int, struct timeval, void *);
-int bk_accept_serve(int, void *);
-int bk_accept_store(int, void *);
-int bk_clnt_disconnect(int, void *);
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-       /*
-        *      WS handlers
-        */
-int bk_handle_ws_connection(int, struct timeval, void *);
-int bk_accept_ws(int, void *);
-int bk_ws_clnt_reject(int);
-int bk_ws_clnt_disconnect(int, void *);
-#endif         /*GLITE_LB_SERVER_WITH_WS */
-
-#define SRV_SERVE              0
-#define SRV_STORE              1
-#ifdef GLITE_LB_SERVER_WITH_WS
-#define SRV_WS                 2
-#endif /* GLITE_LB_SERVER_WITH_WS */
-static struct glite_srvbones_service service_table[] = {
-       { "serve",      -1, bk_handle_connection, bk_accept_serve, bk_clnt_reject, bk_clnt_disconnect },
-       { "store",      -1, bk_handle_connection, bk_accept_store, bk_clnt_reject, bk_clnt_disconnect },
-#ifdef GLITE_LB_SERVER_WITH_WS
-       { "WS",         -1, bk_handle_ws_connection, bk_accept_ws, bk_ws_clnt_reject, bk_ws_clnt_disconnect }
-#endif /* GLITE_LB_SERVER_WITH_WS */
-};
-
-struct clnt_data_t {
-       edg_wll_Context                 ctx;
-#ifdef GLITE_LB_SERVER_WITH_WS
-       struct soap                        *soap;
-#endif /* GLITE_LB_SERVER_WITH_WS */
-       void                               *mysql;
-       edg_wll_QueryRec          **job_index;
-       edg_wll_IColumnRec         *job_index_cols;
-};
-
-
-
-int main(int argc, char *argv[])
-{
-       int                                     fd, i;
-       struct sockaddr_in      a;
-       char                       *mysubj = NULL;
-       int                                     opt;
-       char                            pidfile[PATH_MAX] = EDG_BKSERVERD_PIDFILE,
-                                          *port,
-                                          *name,
-                                          *cert, *key;
-#ifdef GLITE_LB_SERVER_WITH_WS
-       char                       *ws_port;
-#endif /* GLITE_LB_SERVER_WITH_WS */
-       FILE                       *fpid;
-       key_t                           semkey;
-       edg_wll_Context         ctx;
-       OM_uint32                       min_stat;
-       edg_wll_GssStatus       gss_code;
-       struct timeval          to;
-
-
-
-       name = strrchr(argv[0],'/');
-       if (name) name++; else name = argv[0];
-
-       asprintf(&port, "%d", GLITE_WMSC_JOBID_DEFAULT_PORT);
-#ifdef GLITE_LB_SERVER_WITH_WS
-       asprintf(&ws_port, "%d", GLITE_WMSC_JOBID_DEFAULT_PORT+2);
-#endif         /* GLITE_LB_SERVER_WITH_WS */
-       cert = key = cadir = vomsdir = NULL;
-
-/* no magic here: 1 month, 3 and 7 days */
-       purge_timeout[EDG_WLL_PURGE_JOBSTAT_OTHER] = 60*60*24*31;       
-       purge_timeout[EDG_WLL_JOB_CLEARED] = 60*60*24*3;
-       purge_timeout[EDG_WLL_JOB_ABORTED] = 60*60*24*7;
-       purge_timeout[EDG_WLL_JOB_CANCELLED] = 60*60*24*7;
-
-/* no magic here: 1 month, 3 and 7 days */
-       purge_timeout[EDG_WLL_PURGE_JOBSTAT_OTHER] = 60*60*24*31;       
-       purge_timeout[EDG_WLL_JOB_CLEARED] = 60*60*24*3;
-       purge_timeout[EDG_WLL_JOB_ABORTED] = 60*60*24*7;
-       purge_timeout[EDG_WLL_JOB_CANCELLED] = 60*60*24*7;
-
-/* no magic here: 1 month, 3 and 7 days */
-       purge_timeout[EDG_WLL_PURGE_JOBSTAT_OTHER] = 60*60*24*31;       
-       purge_timeout[EDG_WLL_JOB_CLEARED] = 60*60*24*3;
-       purge_timeout[EDG_WLL_JOB_ABORTED] = 60*60*24*7;
-       purge_timeout[EDG_WLL_JOB_CANCELLED] = 60*60*24*7;
-
-       if (geteuid()) snprintf(pidfile,sizeof pidfile,"%s/edg-bkserverd.pid",
-                       getenv("HOME"));
-
-       while ((opt = getopt_long(argc,argv,get_opt_string,opts,NULL)) != EOF) switch (opt) {
-               case 'a': fake_host = strdup(optarg); break;
-               case 'c': cert = optarg; break;
-               case 'k': key = optarg; break;
-               case 'C': cadir = optarg; break;
-               case 'V': vomsdir = optarg; break;
-               case 'p': free(port); port = strdup(optarg); break;
-#ifdef GLITE_LB_SERVER_WITH_WS
-               case 'w': free(ws_port); ws_port = strdup(optarg); break;
-#endif /* GLITE_LB_SERVER_WITH_WS */
-               case 'd': debug = 1; break;
-               case 'r': rgma_export = 1; break;
-               case 'm': dbstring = optarg; break;
-               case 'n': noAuth = 1; break;
-               case 's': slaves = atoi(optarg); break;
-               case 'l': semaphores = atoi(optarg); break;
-               case 'S': purgeStorage = optarg; break;
-               case 'D': dumpStorage = optarg; break;
-               case 'L':
-                       if ( !parse_limits(optarg, &hardJobsLimit, &hardEventsLimit, &hardRespSizeLimit) )
-                       {
-                               usage(name);
-                               return 1;
-                       }
-                       break;
-               case 'N': notif_duration = atoi(optarg) * (60*60); break;
-               case 'X': notif_ilog_socket_path = strdup(optarg); break;
-               case 'Y': notif_ilog_file_prefix = strdup(optarg); break;
-               case 'i': strcpy(pidfile,optarg); break;
-               case 'R': if (super_users) {
-                                 fprintf(stderr,"%s: super-users already defined, second occurence ignored\n",
-                                                 argv[0]);
-                                 break;
-                         }
-                         super_users = malloc(2 * sizeof super_users[0]);
-                         super_users[0] = optarg;
-                         super_users[1] = NULL;
-                         break;
-               case 'F': if (super_users) {
-                                 fprintf(stderr,"%s: super-users already defined, second occurence ignored\n",
-                                                 argv[0]);
-                                 break;
-                         }
-                         if (read_roots(optarg)) return 1;
-                         break;
-               case 'x': noIndex = atoi(optarg);
-                         if (noIndex < 0 || noIndex > 2) { usage(name); return 1; }
-                         break;
-               case 'P': strict_locking = 1;
-                         break;
-               case '?': usage(name); return 1;
-       }
-
-       if ( optind < argc ) { usage(name); return 1; }
-
-       setlinebuf(stdout);
-       setlinebuf(stderr);
-
-       fpid = fopen(pidfile,"r");
-       if ( fpid )
-       {
-               int     opid = -1;
-
-               if ( fscanf(fpid,"%d",&opid) == 1 )
-               {
-                       if ( !kill(opid,0) )
-                       {
-                               fprintf(stderr,"%s: another instance running, pid = %d\n",argv[0],opid);
-                               return 1;
-                       }
-                       else if (errno != ESRCH) { perror("kill()"); return 1; }
-               }
-               fclose(fpid);
-       } else if (errno != ENOENT) { perror(pidfile); return 1; }
-
-       fpid = fopen(pidfile, "w");
-       if (!fpid) { perror(pidfile); return 1; }
-       fprintf(fpid, "%d", getpid());
-       fclose(fpid);
-
-       semkey = ftok(pidfile,0);
-
-       if (!debug) for (fd=3; fd<OPEN_MAX; fd++) close(fd);
-
-       if (check_mkdir(dumpStorage)) exit(1);
-       if (check_mkdir(purgeStorage)) exit(1);
-
-       if (semaphores == -1) semaphores = slaves;
-       semset = semget(semkey, 0, 0);
-       if (semset >= 0) semctl(semset, 0, IPC_RMID);
-       semset = semget(semkey, semaphores, IPC_CREAT | 0600);
-       if (semset < 0) { perror("semget()"); return 1; }
-       dprintf(("Using %d semaphores, set id %d\n",semaphores,semset));
-       for (i=0; i<semaphores; i++)
-       {
-               struct sembuf   s;
-
-               s.sem_num = i; s.sem_op = 1; s.sem_flg = 0;
-               if (semop(semset,&s,1) == -1) { perror("semop()"); return 1; }
-       }
-
-       if ( fake_host )
-       {
-               char    *p = strchr(fake_host,':');
-
-               if (p)
-               {
-                       *p = 0;
-                       fake_port = atoi(p+1);
-               }
-               else fake_port = atoi(port);
-       }
-       else
-       {
-               char    buf[300];
-
-               if ( globus_module_activate(GLOBUS_COMMON_MODULE) != GLOBUS_SUCCESS )
-               {
-                       dprintf(("[%d]: Unable to initialize Globus common module\n",getpid()));
-                       if (!debug) syslog(LOG_CRIT,"Unable to initialize Globus common module\n");
-               }
-
-               globus_libc_gethostname(buf,sizeof buf);
-               buf[sizeof buf - 1] = 0;
-               fake_host = strdup(buf);
-               fake_port = atoi(port); 
-       }
-
-       dprintf(("server address: %s:%d\n", fake_host, fake_port));
-
-       service_table[SRV_SERVE].conn = socket(PF_INET, SOCK_STREAM, 0);
-       if ( service_table[SRV_SERVE].conn < 0 ) { perror("socket()"); return 1; }
-       a.sin_family = AF_INET;
-       a.sin_port = htons(atoi(port));
-       a.sin_addr.s_addr = INADDR_ANY;
-       setsockopt(service_table[SRV_SERVE].conn, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-       if ( bind(service_table[SRV_SERVE].conn, (struct sockaddr *) &a, sizeof(a)) )
-       { 
-               char    buf[100];
-
-               snprintf(buf,sizeof(buf),"bind(%d)",atoi(port));
-               perror(buf);
-               return 1;
-       }
-       if ( listen(service_table[SRV_SERVE].conn, CON_QUEUE) ) { perror("listen()"); return 1; }
-
-       service_table[SRV_STORE].conn = socket(PF_INET, SOCK_STREAM, 0);
-       if ( service_table[SRV_STORE].conn < 0) { perror("socket()"); return 1; }
-       a.sin_family = AF_INET;
-a.sin_port = htons(atoi(port)+1);
-a.sin_addr.s_addr = INADDR_ANY;
-       setsockopt(service_table[SRV_STORE].conn, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-       if ( bind(service_table[SRV_STORE].conn, (struct sockaddr *) &a, sizeof(a)))
-       {
-               char    buf[100];
-
-               snprintf(buf,sizeof(buf), "bind(%d)", atoi(port)+1);
-               perror(buf);
-               return 1;
-       }
-       if ( listen(service_table[SRV_STORE].conn, CON_QUEUE) ) { perror("listen()"); return 1; }
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-       service_table[SRV_WS].conn = socket(PF_INET, SOCK_STREAM, 0);
-       if ( service_table[SRV_WS].conn < 0) { perror("socket()"); return 1; }
-       a.sin_family = AF_INET;
-       a.sin_port = htons(atoi(ws_port));
-       a.sin_addr.s_addr = INADDR_ANY;
-       setsockopt(service_table[SRV_WS].conn, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
-       if ( bind(service_table[SRV_WS].conn, (struct sockaddr *) &a, sizeof(a)))
-       {
-               char    buf[100];
-
-               snprintf(buf, sizeof(buf), "bind(%d)", atoi(ws_port));
-               perror(buf);
-               return 1;
-       }
-       if ( listen(service_table[SRV_WS].conn, CON_QUEUE) ) { perror("listen()"); return 1; }
-
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-       if (!cert || !key)
-               fprintf(stderr, "%s: key or certificate file not specified"
-                                               " - unable to watch them for changes!\n", argv[0]);
-
-       if ( cadir ) setenv("X509_CERT_DIR", cadir, 1);
-       if ( !edg_wll_gss_acquire_cred_gsi(cert, key, &mycred, &mysubj, &gss_code) )
-       {
-               int     i;
-
-               dprintf(("Server identity: %s\n",mysubj));
-               for ( i = 0; super_users && super_users[i]; i++ ) ;
-               super_users = realloc(super_users, (i+2)*sizeof(*super_users));
-               super_users[i] = mysubj;
-               super_users[i+1] = NULL;
-       }
-       else dprintf(("Running unauthenticated\n"));
-
-       if ( noAuth ) dprintf(("Promiscuous mode\n"));
-       dprintf(("Listening at %d,%d (accepting protocols: " COMP_PROTO " and compatible) ...\n",atoi(port),atoi(port)+1));
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-       dprintf(("Listening at %d (accepting web service protocol) ...\n", atoi(ws_port)));
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-       if (!dbstring) dbstring = getenv("LBDB");
-
-       /* Just check the database and let it be. The slaves do the job. */
-       edg_wll_InitContext(&ctx);
-       wait_for_open(ctx, dbstring);
-
-       if (edg_wll_DBCheckVersion(ctx))
-       {
-               char    *et,*ed;
-               edg_wll_Error(ctx,&et,&ed);
-
-               fprintf(stderr,"%s: open database: %s (%s)\n",argv[0],et,ed);
-               return 1;
-       }
-       edg_wll_Close(ctx);
-       edg_wll_FreeContext(ctx);
-
-       if ( !debug ) {
-               if (daemon(1,0) == -1) {
-                       perror("deamon()");
-                       exit(1);
-               }
-
-               fpid = fopen(pidfile,"w");
-               if (!fpid) { perror(pidfile); return 1; }
-               fprintf(fpid,"%d",getpid());
-               fclose(fpid);
-
-               openlog(name,LOG_PID,LOG_DAEMON);
-       } else {
-               setpgid(0, getpid());
-       }
-
-
-       glite_srvbones_set_param(GLITE_SBPARAM_SLAVES_CT, slaves);
-       glite_srvbones_set_param(GLITE_SBPARAM_SLAVE_OVERLOAD, SLAVE_OVERLOAD);
-       glite_srvbones_set_param(GLITE_SBPARAM_SLAVE_CONNS_MAX, SLAVE_CONNS_MAX);
-       to = (struct timeval){CLNT_TIMEOUT, 0};
-       glite_srvbones_set_param(GLITE_SBPARAM_CLNT_TIMEOUT, &to);
-       to = (struct timeval){TOTAL_CLNT_TIMEOUT, 0};
-       glite_srvbones_set_param(GLITE_SBPARAM_TOTAL_CLNT_TIMEOUT, &to);
-
-       glite_srvbones_run(bk_clnt_data_init, service_table, sizofa(service_table), debug);
-
-
-       semctl(semset, 0, IPC_RMID, 0);
-       unlink(pidfile);
-       free(port);
-       gss_release_cred(&min_stat, &mycred);
-
-
-       return 0;
-}
-
-
-int bk_clnt_data_init(void **data)
-{
-       edg_wll_Context                 ctx;
-       struct clnt_data_t         *cdata;
-       edg_wll_QueryRec          **job_index;
-       edg_wll_IColumnRec         *job_index_cols;
-
-
-       if ( !(cdata = calloc(1, sizeof(*cdata))) )
-               return -1;
-
-       if ( edg_wll_InitContext(&ctx) ) 
-       {
-               free(cdata);
-               return -1;
-       }
-
-       dprintf(("[%d] opening database ...\n", getpid()));
-       if ( !dbstring ) dbstring = getenv("LBDB");
-       wait_for_open(ctx, dbstring);
-       cdata->mysql = ctx->mysql;
-
-       if ( edg_wll_QueryJobIndices(ctx, &job_index, NULL) )
-       {
-               char       *et, *ed;
-
-               edg_wll_Error(ctx,&et,&ed);
-               dprintf(("[%d]: query_job_indices(): %s: %s, no custom indices available\n",getpid(),et,ed));
-               if (!debug) syslog(LOG_ERR,"[%d]: query_job_indices(): %s: %s, no custom indices available\n",getpid(),et,ed);
-               free(et);
-               free(ed);
-       }
-       edg_wll_FreeContext(ctx);
-       cdata->job_index = job_index;
-
-       if ( job_index )
-       {
-               int i,j, k, maxncol, ncol;
-
-               ncol = maxncol = 0;
-               for ( i = 0; job_index[i]; i++ )
-                       for ( j = 0; job_index[i][j].attr; j++ )
-                               maxncol++;
-
-               job_index_cols = calloc(maxncol+1, sizeof(edg_wll_IColumnRec));
-               for ( i = 0; job_index[i]; i++ )
-               {
-                       for ( j = 0; job_index[i][j].attr; j++)
-                       {
-                               for ( k = 0;
-                                         k < ncol && edg_wll_CmpColumn(&job_index_cols[k].qrec, &job_index[i][j]);
-                                         k++);
-
-                               if ( k == ncol)
-                               {
-                                       job_index_cols[ncol].qrec = job_index[i][j];
-                                       if ( job_index[i][j].attr == EDG_WLL_QUERY_ATTR_USERTAG )
-                                       {
-                                               job_index_cols[ncol].qrec.attr_id.tag =
-                                                               strdup(job_index[i][j].attr_id.tag);
-                                       }
-                                       job_index_cols[ncol].colname =
-                                                       edg_wll_QueryRecToColumn(&job_index_cols[ncol].qrec);
-                                       ncol++;
-                               }
-                       }
-               }
-               job_index_cols[ncol].qrec.attr = EDG_WLL_QUERY_ATTR_UNDEF;
-               job_index_cols[ncol].colname = NULL;
-               cdata->job_index_cols = job_index_cols;
-       }
-
-       *data = cdata;
-       return 0;
-}
-
-       
-/*
- *     Creates context (initializes it from global vatiables and data given
- *     from server_bones)
- *     gets the connection info
- *     and accepts the gss connection
- */
-int bk_handle_connection(int conn, struct timeval client_start, void *data)
-{
-       struct clnt_data_t *cdata = (struct clnt_data_t *)data;
-       edg_wll_Context         ctx;
-       gss_name_t                      client_name = GSS_C_NO_NAME;
-       gss_buffer_desc         token = GSS_C_EMPTY_BUFFER;
-       edg_wll_GssStatus       gss_code;
-       OM_uint32                       min_stat,
-                                               maj_stat;
-       struct timeval          dns_to = {DNS_TIMEOUT, 0},
-                                               total_to = { TOTAL_CLNT_TIMEOUT,0 },
-                                               now;
-       struct sockaddr_in      a;
-       int                                     alen;
-       char                       *server_name = NULL,
-                                          *name = NULL;
-       int                                     h_errno;
-
-
-
-       if ( edg_wll_InitContext(&ctx) )
-       {
-               fprintf(stderr, "Couldn't create context");
-               return -1;
-       }
-       cdata->ctx = ctx;
-
-       /* Shared structures (pointers)
-        */
-       ctx->mysql = cdata->mysql;
-       ctx->job_index_cols = cdata->job_index_cols;
-       ctx->job_index = cdata->job_index; 
-       
-       /*      set globals
-        */
-       ctx->notifDuration = notif_duration;
-       ctx->purgeStorage = strdup(purgeStorage);
-       ctx->dumpStorage = strdup(dumpStorage);
-       ctx->hardJobsLimit = hardJobsLimit;
-       ctx->hardEventsLimit = hardEventsLimit;
-       ctx->semset = semset;
-       ctx->semaphores = semaphores;
-       if ( noAuth ) ctx->noAuth = 1;
-       ctx->rgma_export = rgma_export;
-       memcpy(ctx->purge_timeout, purge_timeout, sizeof(ctx->purge_timeout));
-
-       ctx->p_tmp_timeout.tv_sec = SLAVE_TIMEOUT;
-       ctx->p_tmp_timeout.tv_usec = 0;
-       if ( total_to.tv_sec < ctx->p_tmp_timeout.tv_sec )
-       {
-               ctx->p_tmp_timeout.tv_sec = total_to.tv_sec;
-               ctx->p_tmp_timeout.tv_usec = total_to.tv_usec;
-       }
-       
-       ctx->poolSize = 1;
-       ctx->connPool = calloc(1, sizeof(edg_wll_ConnPool));
-       ctx->connToUse = 0;
-
-       alen = sizeof(a);
-       getpeername(conn, (struct sockaddr *)&a, &alen);
-       ctx->connPool[ctx->connToUse].peerName = strdup(inet_ntoa(a.sin_addr));
-       ctx->connPool[ctx->connToUse].peerPort = ntohs(a.sin_port);
-
-       /* not a critical operation, do not waste all SLAVE_TIMEOUT */
-       h_errno = asyn_gethostbyaddr(&name, (char *)&a.sin_addr.s_addr,sizeof(a.sin_addr.s_addr), AF_INET, &dns_to);
-       switch ( h_errno )
-       {
-       case NETDB_SUCCESS:
-               if (name) dprintf(("[%d] connection from %s:%d (%s)\n",
-                                       getpid(), inet_ntoa(a.sin_addr), ntohs(a.sin_port), name));
-               free(ctx->connPool[ctx->connToUse].peerName);
-               ctx->connPool[ctx->connToUse].peerName = name;
-               name = NULL;
-               break;
-
-       default:
-               if (debug) fprintf(stderr, "gethostbyaddr(%s): %s", inet_ntoa(a.sin_addr), hstrerror(h_errno));
-               dprintf(("[%d] connection from %s:%d\n", getpid(), inet_ntoa(a.sin_addr), ntohs(a.sin_port)));
-               break;
-       }
-       
-       gettimeofday(&now,0);
-       if ( decrement_timeout(&ctx->p_tmp_timeout, client_start, now) )
-       {
-               if (debug) fprintf(stderr, "gethostbyaddr() timeout");
-               else syslog(LOG_ERR, "gethostbyaddr(): timeout");
-               free(name);
-
-               return -1;
-       }
-                               
-       if (fake_host)
-       {
-               ctx->srvName = strdup(fake_host);
-               ctx->srvPort = fake_port;
-       }
-       else
-       {
-               alen = sizeof(a);
-               getsockname(conn,(struct sockaddr *) &a,&alen);
-       
-               dns_to.tv_sec = DNS_TIMEOUT;
-               dns_to.tv_usec = 0;
-               h_errno = asyn_gethostbyaddr(&name,
-                                               (char *) &a.sin_addr.s_addr,sizeof(a.sin_addr.s_addr),
-                                               AF_INET,&dns_to);
-
-               switch ( h_errno )
-               {
-               case NETDB_SUCCESS:
-                       ctx->srvName = name;
-                       if ( server_name != NULL )
-                       {
-                               if ( strcmp(name, server_name))
-                               {
-                                       if (debug) fprintf(stderr, "different server endpoint names (%s,%s),"
-                                                                                       " check DNS PTR records\n", name, server_name);
-                                       else syslog(LOG_ERR,"different server endpoint names (%s,%s),"
-                                                                                       " check DNS PTR records\n", name, server_name);
-                               }
-                       }
-                       else server_name = strdup(name);
-                       break;
-
-               default:
-                       if ( debug )
-                               fprintf(stderr, "gethostbyaddr(%s): %s", inet_ntoa(a.sin_addr), hstrerror(h_errno));
-                       else
-                               syslog(LOG_ERR,"gethostbyaddr(%s): %s", inet_ntoa(a.sin_addr), hstrerror(h_errno));
-                       if ( server_name != NULL )
-                               ctx->srvName = strdup(server_name);
-                       break;
-               }
-               ctx->srvPort = ntohs(a.sin_port);
-       }
-
-       if ( edg_wll_gss_accept(mycred, conn, &ctx->p_tmp_timeout, &ctx->connPool[ctx->connToUse].gss, &gss_code) )
-       {
-               dprintf(("[%d] Client authentication failed, closing.\n", getpid()));
-               if (!debug) syslog(LOG_ERR, "Client authentication failed");
-               edg_wll_FreeContext(ctx);
-               return 1;
-       } 
-
-       maj_stat = gss_inquire_context(&min_stat, ctx->connPool[ctx->connToUse].gss.context,
-                                                       &client_name, NULL, NULL, NULL, NULL, NULL, NULL);
-       if ( !GSS_ERROR(maj_stat) )
-               maj_stat = gss_display_name(&min_stat, client_name, &token, NULL);
-
-       if ( !GSS_ERROR(maj_stat) )
-       {
-               if (ctx->peerName) free(ctx->peerName);
-               ctx->peerName = (char *)token.value;
-               memset(&token, 0, sizeof(token));
-               /* XXX DK: pujde pouzit lifetime z inquire_context()?
-                *
-               ctx->peerProxyValidity = ASN1_UTCTIME_mktime(X509_get_notAfter(peer));
-                */
-  
-               dprintf(("[%d] client DN: %s\n",getpid(),ctx->peerName));
-       }
-       else
-               /* XXX DK: Check if the ANONYMOUS flag is set ?
-                */
-               dprintf(("[%d] annonymous client\n",getpid()));
-                 
-       if ( client_name != GSS_C_NO_NAME )
-               gss_release_name(&min_stat, &client_name);
-       if ( token.value )
-               gss_release_buffer(&min_stat, &token);
-
-       edg_wll_SetVomsGroups(ctx, &ctx->connPool[ctx->connToUse].gss, vomsdir, cadir);
-       if (debug && ctx->vomsGroups.len > 0)
-       {
-               int i;
-  
-               dprintf(("[%d] client's VOMS groups:\n",getpid()));
-               for ( i = 0; i < ctx->vomsGroups.len; i++ )
-                       dprintf(("\t%s:%s\n", ctx->vomsGroups.val[i].vo, ctx->vomsGroups.val[i].name));
-       }
-       
-       /* used also to reset start_time after edg_wll_ssl_accept! */
-       /* gettimeofday(&start_time,0); */
-       
-       ctx->noAuth = noAuth || amIroot(ctx->peerName);
-       switch ( noIndex )
-       {
-       case 0: ctx->noIndex = 0; break;
-       case 1: ctx->noIndex = amIroot(ctx->peerName); break;
-       case 2: ctx->noIndex = 1; break;
-       }
-       ctx->strict_locking = strict_locking;
-
-
-       return 0;
-}
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-int bk_handle_ws_connection(int conn, struct timeval client_start, void *data)
-{
-    struct clnt_data_t    *cdata = (struct clnt_data_t *) data;
-       struct soap                        *soap;
-       int                                             rv;
-
-
-       if ( !(soap = soap_new()) )
-       {
-               fprintf(stderr, "Couldn't create soap environment");
-               return -1;
-       }
-
-       if ( (rv = bk_handle_connection(conn, client_start, data)) )
-       {
-               soap_destroy(soap);
-               return rv;
-       }
-
-       cdata->soap = soap;
-
-       soap_init(soap);
-    soap_set_namespaces(soap, namespaces);
-    soap_register_plugin_arg(soap, edg_wll_ws_plugin, cdata->ctx);
-
-
-       return 0;
-}
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-int bk_accept_store(int conn, void *cdata)
-{
-       edg_wll_Context         ctx = ((struct clnt_data_t *) cdata)->ctx;
-
-       /*
-        *      serve the request
-        */
-       if ( edg_wll_StoreProto(ctx) )
-       { 
-               char    *errt, *errd;
-
-               
-               errt = errd = NULL;
-               switch ( edg_wll_Error(ctx, &errt, &errd) )
-               {
-               case ETIMEDOUT:
-               case EDG_WLL_ERROR_GSS:
-               case EPIPE:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if (!debug) syslog(LOG_ERR,"%s (%s)", errt, errd);
-                       /*      fallthrough
-                        */
-               case ENOTCONN:
-                       edg_wll_gss_close(&ctx->connPool[ctx->connToUse].gss, NULL);
-                       edg_wll_FreeContext(ctx);
-                       ctx = NULL;
-                       free(errt); free(errd);
-                       dprintf(("[%d] Connection closed\n", getpid()));
-                       /*
-                        *      "recoverable" error - return (>0)
-                        */
-                       return 1;
-                       break;
-
-               case ENOENT:
-               case EINVAL:
-               case EPERM:
-               case EEXIST:
-               case EDG_WLL_ERROR_NOINDEX:
-               case E2BIG:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if ( !debug ) syslog(LOG_ERR,"%s (%s)", errt, errd);
-                       /*
-                        *      no action for non-fatal errors
-                        */
-                       break;
-                       
-               default:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if (!debug) syslog(LOG_CRIT,"%s (%s)",errt,errd);
-                       /*
-                        *      unknown error - do rather return (<0) (slave will be killed)
-                        */
-                       return -1;
-               } 
-               free(errt); free(errd);
-       }
-
-       return 0;
-}
-
-int bk_accept_serve(int conn, void *cdata)
-{
-       edg_wll_Context         ctx = ((struct clnt_data_t *) cdata)->ctx;
-
-       /*
-        *      serve the request
-        */
-       if ( edg_wll_ServerHTTP(ctx) )
-       { 
-               char    *errt, *errd;
-
-               
-               errt = errd = NULL;
-               switch ( edg_wll_Error(ctx, &errt, &errd) )
-               {
-               case ETIMEDOUT:
-               case EDG_WLL_ERROR_GSS:
-               case EPIPE:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if (!debug) syslog(LOG_ERR,"%s (%s)", errt, errd);
-                       /*      fallthrough
-                        */
-               case ENOTCONN:
-                       edg_wll_gss_close(&ctx->connPool[ctx->connToUse].gss, NULL);
-                       edg_wll_FreeContext(ctx);
-                       ctx = NULL;
-                       free(errt); free(errd);
-                       dprintf(("[%d] Connection closed\n", getpid()));
-                       /*
-                        *      "recoverable" error - return (>0)
-                        */
-                       return 1;
-                       break;
-
-               case ENOENT:
-               case EINVAL:
-               case EPERM:
-               case EEXIST:
-               case EDG_WLL_ERROR_NOINDEX:
-               case E2BIG:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if ( !debug ) syslog(LOG_ERR,"%s (%s)", errt, errd);
-                       /*
-                        *      no action for non-fatal errors
-                        */
-                       break;
-                       
-               default:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if (!debug) syslog(LOG_CRIT,"%s (%s)",errt,errd);
-                       /*
-                        *      unknown error - do rather return (<0) (slave will be killed)
-                        */
-                       return -1;
-               } 
-               free(errt); free(errd);
-       }
-
-       return 0;
-}
-
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-int bk_accept_ws(int conn, void *cdata)
-{
-       struct soap                *soap = ((struct clnt_data_t *) cdata)->soap;
-       edg_wll_Context         ctx = ((struct clnt_data_t *) cdata)->ctx;
-
-
-       /*      XXX: Is it neccessary?
-        *
-        *      BEWARE: gSoap is trying to handle this connection -> closes the
-        *      socket after then query is served (or something like that :)
-        *
-       soap->socket = conn;
-        */
-       if ( soap_serve(soap) )
-       {
-               char    *errt, *errd;
-
-               
-               errt = errd = NULL;
-               switch ( edg_wll_Error(ctx, &errt, &errd) )
-               {
-               case ETIMEDOUT:
-               case EDG_WLL_ERROR_GSS:
-               case EPIPE:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if (!debug) syslog(LOG_ERR,"%s (%s)", errt, errd);
-                       /*      fallthrough
-                        */
-               case ENOTCONN:
-                       edg_wll_gss_close(&ctx->connPool[ctx->connToUse].gss, NULL);
-                       edg_wll_FreeContext(ctx);
-                       ctx = NULL;
-                       free(errt); free(errd);
-                       dprintf(("[%d] Connection closed\n", getpid()));
-                       /*
-                        *      "recoverable" error - return (>0)
-                        */
-                       return 1;
-                       break;
-
-               case ENOENT:
-               case EINVAL:
-               case EPERM:
-               case EEXIST:
-               case EDG_WLL_ERROR_NOINDEX:
-               case E2BIG:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if ( !debug ) syslog(LOG_ERR,"%s (%s)", errt, errd);
-                       /*
-                        *      no action for non-fatal errors
-                        */
-                       break;
-                       
-               default:
-                       dprintf(("[%d] %s (%s)\n", getpid(), errt, errd));
-                       if (!debug) syslog(LOG_CRIT,"%s (%s)",errt,errd);
-                       /*
-                        *      unknown error - do rather return (<0) (slave will be killed)
-                        */
-                       return -1;
-               } 
-               free(errt); free(errd);
-               return 1;
-       }
-
-       return 0;
-}
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-
-int bk_clnt_disconnect(int conn, void *cdata)
-{
-       edg_wll_Context         ctx = ((struct clnt_data_t *) cdata)->ctx;
-
-
-       if ( ctx->connPool[ctx->connToUse].gss.context != GSS_C_NO_CONTEXT)
-       {
-               struct timeval  to = { 0, CLNT_REJECT_TIMEOUT };
-
-               edg_wll_gss_close(&ctx->connPool[ctx->connToUse].gss, &to);
-       }
-       edg_wll_FreeContext(ctx);
-
-       return 0;
-}
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-int bk_ws_clnt_disconnect(int conn, void *cdata)
-{
-       int             rv;
-
-
-       if ( (rv = bk_clnt_disconnect(conn, cdata)) )
-               return rv;
-
-       soap_destroy(((struct clnt_data_t *)cdata)->soap);
-
-       return 0;
-}
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-int bk_clnt_reject(int conn)
-{
-       int             flags = fcntl(conn, F_GETFL, 0);
-
-       if ( fcntl(conn, F_SETFL, flags | O_NONBLOCK) < 0 ) 
-               return 1;
-
-       edg_wll_gss_reject(conn);
-
-       return 0;
-}
-
-#ifdef GLITE_LB_SERVER_WITH_WS
-int bk_ws_clnt_reject(int conn)
-{
-       return bk_clnt_reject(conn);
-}
-#endif /* GLITE_LB_SERVER_WITH_WS */
-
-
-static void wait_for_open(edg_wll_Context ctx, const char *dbstring)
-{
-       char    *dbfail_string1, *dbfail_string2;
-
-       dbfail_string1 = dbfail_string2 = NULL;
-
-       while (edg_wll_Open(ctx, (char *) dbstring)) {
-               char    *errt,*errd;
-
-               if (dbfail_string1) free(dbfail_string1);
-               edg_wll_Error(ctx,&errt,&errd);
-               asprintf(&dbfail_string1,"%s (%s)\n",errt,errd);
-               if (dbfail_string1 != NULL) {
-                       if (dbfail_string2 == NULL || strcmp(dbfail_string1,dbfail_string2)) {
-                               if (dbfail_string2) free(dbfail_string2);
-                               dbfail_string2 = dbfail_string1;
-                               dbfail_string1 = NULL;
-                               dprintf(("[%d]: %s\nStill trying ...\n",getpid(),dbfail_string2));
-                               if (!debug) syslog(LOG_ERR,dbfail_string2);
-                       }
-               }
-               sleep(5);
-       }
-
-       if (dbfail_string1) free(dbfail_string1);
-       if (dbfail_string2 != NULL) {
-               free(dbfail_string2);
-               dprintf(("[%d]: DB connection established\n",getpid()));
-               if (!debug) syslog(LOG_INFO,"DB connection established\n");
-       }
-}
-
-static void free_hostent(struct hostent *h){
-       int i;
-
-       if (h) {
-               if (h->h_name) free(h->h_name);
-               if (h->h_aliases) {
-                       for (i=0; h->h_aliases[i]; i++) free(h->h_aliases[i]);
-                       free(h->h_aliases);
-               }
-               if (h->h_addr_list) {
-                       for (i=0; h->h_addr_list[i]; i++) free(h->h_addr_list[i]);
-                       free(h->h_addr_list);
-               }
-               free(h);
-       }
-}
-
-struct asyn_result {
-       struct hostent *ent;
-       int             err;
-};
-
-/* ares callback handler for ares_gethostbyaddr()       */
-static void callback_handler(void *arg, int status, struct hostent *h)
-{
-       struct asyn_result *arp = (struct asyn_result *) arg;
-
-       switch (status) {
-          case ARES_SUCCESS:
-               if (h && h->h_name) {
-                       arp->ent->h_name = strdup(h->h_name);           
-                       if (arp->ent->h_name == NULL) {
-                               arp->err = NETDB_INTERNAL;
-                       } else {
-                               arp->err = NETDB_SUCCESS;
-                       }
-               } else {
-                       arp->err = NO_DATA;
-               }
-               break;
-           case ARES_EBADNAME:
-           case ARES_ENOTFOUND:
-               arp->err = HOST_NOT_FOUND;
-               break;
-           case ARES_ENOTIMP:
-               arp->err = NO_RECOVERY;
-               break;
-           case ARES_ENOMEM:
-           case ARES_EDESTRUCTION:
-           default:
-               arp->err = NETDB_INTERNAL;
-               break;
-       }
-}
-
-static int asyn_gethostbyaddr(char **name, const char *addr,int len, int type, struct timeval *timeout)
-{
-       struct asyn_result ar;
-       ares_channel channel;
-       int nfds;
-       fd_set readers, writers;
-       struct timeval tv, *tvp;
-       struct timeval start_time,check_time;
-
-
-/* start timer */
-        gettimeofday(&start_time,0);
-
-/* ares init */
-        if ( ares_init(&channel) != ARES_SUCCESS ) return(NETDB_INTERNAL);
-       ar.ent = (struct hostent *) malloc (sizeof(*ar.ent));
-       memset((void *) ar.ent, 0, sizeof(*ar.ent));
-
-/* query DNS server asynchronously */
-       ares_gethostbyaddr(channel, addr, len, type, callback_handler, (void *) &ar);
-
-/* wait for result */
-        while (1) {
-                FD_ZERO(&readers);
-                FD_ZERO(&writers);
-                nfds = ares_fds(channel, &readers, &writers);
-                if (nfds == 0)
-                        break;
-
-                gettimeofday(&check_time,0);
-               if (decrement_timeout(timeout, start_time, check_time)) {
-                       ares_destroy(channel);
-                       free_hostent(ar.ent);
-                       return(TRY_AGAIN);
-               }
-               start_time = check_time;
-
-                tvp = ares_timeout(channel, timeout, &tv);
-
-                switch ( select(nfds, &readers, &writers, NULL, tvp) ) {
-                       case -1: if (errno != EINTR) {
-                                       ares_destroy(channel);
-                                       free_hostent(ar.ent);
-                                       return NETDB_INTERNAL;
-                                } else
-                                       continue;
-                       case 0: 
-                               FD_ZERO(&readers);
-                               FD_ZERO(&writers);
-                               /* fallthrough */
-                        default : ares_process(channel, &readers, &writers);
-                }
-
-        }
-
-       
-       ares_destroy(channel);
-               
-       if (ar.err == NETDB_SUCCESS) {
-               *name = strdup(ar.ent->h_name); 
-               free_hostent(ar.ent); 
-       }
-       return (ar.err);
-}
-
-static int read_roots(const char *file)
-{
-       FILE    *roots = fopen(file,"r");
-       char    buf[BUFSIZ];
-       int     cnt = 0;
-
-       if (!roots) {
-               perror(file);
-               return 1;
-       }
-
-       while (!feof(roots)) {
-               char    *nl;
-               fgets(buf,sizeof buf,roots);
-               nl = strchr(buf,'\n');
-               if (nl) *nl = 0;
-
-               super_users = realloc(super_users, (cnt+1) * sizeof super_users[0]);
-               super_users[cnt] = strdup(buf);
-               super_users[++cnt] = NULL;
-       }
-
-       fclose(roots);
-
-       return 0;
-}
-
-static int amIroot(const char *subj)
-{
-       int     i;
-
-       if (!subj) return 0;
-       for (i=0; super_users && super_users[i]; i++) 
-               if (strcmp(subj,super_users[i]) == 0) return 1;
-
-       return 0;
-}
-
-static int parse_limits(char *opt, int *j_limit, int *e_limit, int *size_limit)
-{
-       return (sscanf(opt, "%d:%d:%d", j_limit, e_limit, size_limit) == 3);
-}
-
-static int check_mkdir(const char *dir)
-{
-       struct stat     sbuf;
-       
-       if ( stat(dir, &sbuf) )
-       {
-               if ( errno == ENOENT )
-               {
-                       if ( mkdir(dir, S_IRWXU) )
-                       {
-                               dprintf(("[%d] %s: %s\n", getpid(), dir, strerror(errno)));
-                               if (!debug) syslog(LOG_CRIT, "%s: %m", dir);
-                               return 1;
-                       }
-               }
-               else
-               {
-                       dprintf(("[%d] %s: %s\n", getpid(), dir, strerror(errno)));
-                       if (!debug) syslog(LOG_CRIT, "%s: %m", dir);
-                       return 1;
-               }
-       }
-       else if (S_ISDIR(sbuf.st_mode)) return 0;
-       else {
-               dprintf(("[%d] %s: not a directory\n", getpid(),dir));
-               if (!debug) syslog(LOG_CRIT,"%s: not a directory",dir);
-               return 1;
-       }
-
-       return 0;
-}
-
-static int decrement_timeout(struct timeval *timeout, struct timeval before, struct timeval after)
-{
-        (*timeout).tv_sec = (*timeout).tv_sec - (after.tv_sec - before.tv_sec);
-        (*timeout).tv_usec = (*timeout).tv_usec - (after.tv_usec - before.tv_usec);
-        while ( (*timeout).tv_usec < 0) {
-                (*timeout).tv_sec--;
-                (*timeout).tv_usec += 1000000;
-        }
-        if ( ((*timeout).tv_sec < 0) || (((*timeout).tv_sec == 0) && ((*timeout).tv_usec == 0)) ) return(1);
-        else return(0);
-}
-
diff --git a/org.glite.lb.server/src/db_store.c b/org.glite.lb.server/src/db_store.c

deleted file mode 100644 (file)

index 6ff49cc..0000000
--- a/org.glite.lb.server/src/db_store.c
+++ /dev/null
@@ -1,91 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/events_parse.h"
-#include "store.h"
-#include "lbs_db.h"
-#include "lock.h"
-
-extern int debug;
-
-/* XXX */
-#define use_db 1
-
-extern int edg_wll_NotifMatch(edg_wll_Context, const edg_wll_JobStat *);
-
-int
-db_store(edg_wll_Context ctx,char *ucs, char *event)
-{
-  edg_wll_Event *ev;
-  int  seq;
-  int   err;
-  edg_wll_JobStat      newstat;
-
-  ev = NULL;
-
-  edg_wll_ResetError(ctx);
-  memset(&newstat,0,sizeof newstat);
-
-  if(edg_wll_ParseEvent(ctx, event, &ev))
-    goto err;
-
-  /* XXX: if event type is user tag, convert the tag name to lowercase!
-   *     (not sure whether to convert a value too is reasonable
-   *     or keep it 'case sensitive')
-   */
-  if ( ev->any.type == EDG_WLL_EVENT_USERTAG )
-  {
-       int i;
-       for ( i = 0; ev->userTag.name[i] != '\0'; i++ )
-         ev->userTag.name[i] = tolower(ev->userTag.name[i]);
-  }
-  
-  if(ev->any.user == NULL)
-    ev->any.user = strdup(ucs);
-
-  if(use_db) {
-    if (ctx->strict_locking && edg_wll_LockJob(ctx,ev->any.jobId)) goto err;
-    if(edg_wll_StoreEvent(ctx, ev,&seq))
-      goto err;
-  }
-
-  if (debug) { fputs(event,stderr); fputc('\n',stderr); }
-
-  if (!ctx->strict_locking && edg_wll_LockJob(ctx,ev->any.jobId)) goto err;
-
-  if ( ev->any.type == EDG_WLL_EVENT_CHANGEACL )
-    err = edg_wll_UpdateACL(ctx, ev->any.jobId,
-                       ev->changeACL.user_id, ev->changeACL.user_id_type,
-                       ev->changeACL.permission, ev->changeACL.permission_type,
-                       ev->changeACL.operation);
-  else
-    err = edg_wll_StepIntState(ctx,ev->any.jobId, ev, seq,&newstat);
-
-  if (edg_wll_UnlockJob(ctx,ev->any.jobId)) goto err;
-  if (err) goto err;
-
-  if (newstat.state) {
-         edg_wll_NotifMatch(ctx,&newstat);
-         edg_wll_FreeStatus(&newstat);
-  }
-
-  edg_wll_FreeEvent(ev);
-  free(ev);
-
-  return(0);
-
- err:
-  if(ev) {
-    edg_wll_FreeEvent(ev);
-    free(ev);
-  }
-  
-  return edg_wll_Error(ctx,NULL,NULL);
-}
-
diff --git a/org.glite.lb.server/src/dump.c b/org.glite.lb.server/src/dump.c

deleted file mode 100644 (file)

index 67ae95b..0000000
--- a/org.glite.lb.server/src/dump.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#ident "$Header$"
-
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <assert.h>
-#include <unistd.h>
-
-#include "glite/lb/trio.h"
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "glite/lb/context-int.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/ulm_parse.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/dump.h"
-
-#include "lbs_db.h"
-#include "query.h"
-#include "get_events.h"
-#include "server_state.h"
-#include "purge.h"
-
-static int handle_specials(edg_wll_Context,time_t *);
-
-#define sizofa(a) (sizeof(a)/sizeof((a)[0]))
-
-int edg_wll_DumpEvents(edg_wll_Context ctx,const edg_wll_DumpRequest *req,edg_wll_DumpResult *result)
-{
-       char    *from_s, *to_s, *stmt, *time_s;
-       char    *tmpfname;
-       time_t  start,end;
-       edg_wll_Stmt    q = NULL;
-       char            *res[10];
-       int     event;
-       edg_wll_Event   e;
-       int     ret,dump = 2;   /* TODO: manage dump file */
-       time_t  from = req->from,to = req->to;
-
-       from_s = to_s = stmt = NULL;
-       memset(res,0,sizeof res);
-       memset(&e,0,sizeof e);
-
-       time(&start);
-       edg_wll_ResetError(ctx);
-
-       if ( (dump = edg_wll_CreateTmpDumpFile(ctx, &tmpfname)) == -1 )
-               return edg_wll_Error(ctx, NULL, NULL);
-
-       if (handle_specials(ctx,&from) || handle_specials(ctx,&to))
-       {
-               unlink(tmpfname);
-               return edg_wll_Error(ctx,NULL,NULL);
-       }
-
-       from_s = strdup(edg_wll_TimeToDB(from));
-       to_s = strdup(edg_wll_TimeToDB(to));
-
-       trio_asprintf(&stmt,
-                       "select event,dg_jobid,code,prog,host,u.cert_subj,time_stamp,usec,level,arrived "
-                       "from events e,users u,jobs j "
-                       "where u.userid=e.userid "
-                       "and j.jobid = e.jobid "
-                       "and j.dg_jobid like 'https://%|Ss:%d%%' "
-                       "and arrived > '%|Ss' and arrived <= '%|Ss' "
-                       "order by arrived",
-                       ctx->srvName,ctx->srvPort,
-                       from_s,to_s);
-
-       if (edg_wll_ExecStmt(ctx,stmt,&q) < 0) goto clean;
-
-       while ((ret = edg_wll_FetchRow(q,res)) > 0) {
-               assert(ret == sizofa(res));
-               event = atoi(res[0]); free(res[0]); res[0] = NULL;
-
-               if (convert_event_head(ctx,res+1,&e)
-                       || edg_wll_get_event_flesh(ctx,event,&e))
-               {
-                       char    *et,*ed;
-                       int     i;
-
-               /* Most likely sort of internal inconsistency. 
-                * Must not be fatal -- just complain
-                */
-                       edg_wll_Error(ctx,&et,&ed);
-                       fprintf(stderr,"%s event %d: %s (%s)\n",res[1],event,et,ed);
-                       syslog(LOG_WARNING,"%s event %d: %s (%s)",res[1],event,et,ed);
-                       free(et); free(ed);
-                       for (i=0; i<sizofa(res); i++) free(res[i]);
-                       edg_wll_ResetError(ctx);
-               }
-               else {
-                       char    *event_s = edg_wll_UnparseEvent(ctx,&e);
-                       char    arr_s[100];
-                       int             len, written, total;
-
-                       strcpy(arr_s, "DG.ARRIVED=");
-                       edg_wll_ULMTimevalToDate(e.any.arrived.tv_sec,
-                                                       e.any.arrived.tv_usec,
-                                                       arr_s+strlen("DG.ARRIVED="));
-                       len = strlen(arr_s);
-                       total = 0;
-                       while (total != len) {
-                               written = write(dump,arr_s+total,len-total);
-                               if (written < 0 && errno != EAGAIN) {
-                                       edg_wll_SetError(ctx,errno,"writing dump file");
-                                       free(event_s);
-                                       goto clean;
-                               }
-                               total += written;
-                       }
-                       write(dump, " ", 1);
-                       len = strlen(event_s);
-                       total = 0;
-                       while (total != len) {
-                               written = write(dump,event_s+total,len-total);
-                               if (written < 0 && errno != EAGAIN) {
-                                       edg_wll_SetError(ctx,errno,"writing dump file");
-                                       free(event_s);
-                                       goto clean;
-                               }
-                               total += written;
-                       }
-                       write(dump,"\n",1);
-                       free(event_s);
-               }
-               edg_wll_FreeEvent(&e); memset(&e,0,sizeof e);
-       }
-
-       time(&end);
-/* XXX: get rid of apostrophes returned by edg_wll_TimeToDB() */
-       time_s = strdup(edg_wll_TimeToDB(start));
-       time_s[strlen(time_s)-1] = 0;
-       edg_wll_SetServerState(ctx,EDG_WLL_STATE_DUMP_START,time_s+1);
-       free(time_s);
-       
-       time_s = strdup(edg_wll_TimeToDB(end));
-       time_s[strlen(time_s)-1] = 0;
-       edg_wll_SetServerState(ctx,EDG_WLL_STATE_DUMP_END,time_s+1);
-       free(time_s);
-
-       result->from = from;
-       result->to = to;
-
-       edg_wll_CreateDumpFileFromTmp(ctx, tmpfname, &(result->server_file));
-       unlink(tmpfname);
-
-clean:
-       edg_wll_FreeEvent(&e);
-       edg_wll_FreeStmt(&q);
-
-       free(stmt);
-       free(from_s);
-       free(to_s);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static int handle_specials(edg_wll_Context ctx,time_t *t)
-{
-       char    *time_s;
-       int     ret;
-
-       edg_wll_ResetError(ctx);
-       switch (*t) {
-               case EDG_WLL_DUMP_NOW:
-                       time(t);
-                       return 0;
-               case EDG_WLL_DUMP_LAST_START:
-               case EDG_WLL_DUMP_LAST_END:
-                       switch (ret = edg_wll_GetServerState(ctx,
-                                       *t == EDG_WLL_DUMP_LAST_START ? 
-                                               EDG_WLL_STATE_DUMP_START:
-                                               EDG_WLL_STATE_DUMP_END,
-                                       &time_s))
-                       {
-                               case ENOENT: *t = 0; 
-                                            edg_wll_ResetError(ctx);
-                                            break;
-                               case 0: *t = edg_wll_DBToTime(time_s); 
-                                       assert(*t >= 0);
-                                       break;
-                               default: break;
-                       }
-                       break;
-               default: if (*t < 0) return edg_wll_SetError(ctx,EINVAL,"special time limit unrecognized");
-       }
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
diff --git a/org.glite.lb.server/src/get_events.c.T b/org.glite.lb.server/src/get_events.c.T

deleted file mode 100644 (file)

index a4b2f6e..0000000
--- a/org.glite.lb.server/src/get_events.c.T
+++ /dev/null
@@ -1,157 +0,0 @@
-#ident "$Header$"
-
-/*
-@@@AUTO
-*/
-@@@LANG: C
-
-/* Helper functions for getting events from the LB database *
- * XXX: lots of stuff still hadcoded:
- *             there's mapping db.columns <-> union event fields
- */
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <syslog.h>
-
-#include "get_events.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-#include "glite/lb/events_parse.h"
-
-static void edg_wll_set_event_field(edg_wll_Event *,char *,char *);
-static void edg_wll_set_event_field_warn(edg_wll_Event *,char *,char *);
-
-int edg_wll_get_event_flesh(edg_wll_Context ctx,int n,edg_wll_Event *e)
-{
-       char    *jobid = edg_wlc_JobIdGetUnique(e->any.jobId),
-               *q = NULL,*nameval[2];
-       edg_wll_Stmt    sh;
-       int     ret,t;
-       const char      *tables[] = { "short_fields","long_fields" };
-
-       edg_wll_ResetError(ctx);
-
-       for (t=0; t<=1; t++) {
-               trio_asprintf(&q,"select name,value from %s "
-                               "where jobid = '%|Ss' and event = %d ",
-                               tables[t],jobid,n);
-
-               if ((ret=edg_wll_ExecStmt(ctx,q,&sh)) < 0) goto cleanup;
-
-               while ((ret=edg_wll_FetchRow(sh,nameval)) > 0) {
-                       edg_wll_set_event_field(e,nameval[0],nameval[1]);
-                       free(nameval[0]);
-                       /* XXX: nameval[1] freed in edg_wll_set_event_field
-                        * if necessary
-                        */
-               }
-
-               if (ret<0) goto cleanup;
-               edg_wll_FreeStmt(&sh);
-               free(q); q=NULL;
-       }
-
-       ret=edg_wll_CheckEvent(ctx,e);
-
-cleanup:
-       if (sh) edg_wll_FreeStmt(&sh);
-       free(jobid);
-       free(q);
-
-       if (ret) { edg_wll_FreeEvent(e); memset(e,0,sizeof *e); }
-       return ret;
-}
-
-
-/* print/log  warning for database inconsistency */
-
-static void edg_wll_set_event_field_warn(
-               edg_wll_Event   *event,
-               char            *name,
-               char            *value)
-{
-       char *e = edg_wll_EventToString(event->any.type);
-
-       fprintf(stderr, "edg_wll_set_event_field: bad field:"
-               "code=\"%s\" name=\"%s\" value=\"%s\"\n",
-               e, name, value);
-       free(e);
-       /* XXX edg_wll_Log */
-}
-
-/* set event structure field */
-
-static void edg_wll_set_event_field(
-               edg_wll_Event   *event,
-               char            *name,
-               char            *value)
-{
-/* XXX: where's the best place to hande it? */
-       if (!strcasecmp(name,"SRC_INSTANCE")) {
-               event->any.src_instance = value;
-               return;
-       }
-
-/* XXX: handled separately, should go to event_head one day */
-       if (!strcasecmp(name,"SEQCODE")) {
-               event->any.seqcode = value;
-               return;
-       }
-
-@@@{
-       for my $n (getAllFieldsOrdered $event) {
-               my @occ = getFieldOccurence $event $n;
-               next if $#occ == 0 && $occ[0] eq '_common_';
-               selectType $event $occ[0];
-               my $f = selectField $event $n;
-               my $name = getName $f;
-               my $lcname = lc $name;
-               gen qq{
-!      if (!strcasecmp(name,"$lcname")) \{
-!              switch (event->any.type) \{
-};
-               for (@occ) {
-                       next if $_ eq '_common_';
-                       selectType $event $_;
-                       $f = selectField $event $n;
-                       my $fucname = ucfirst $n;
-                       my $uctype = uc $_;
-                       my $flctype = lcfirst $_;
-                       my $frs = $f->{codes} ?
-                               "event->$flctype.$name = edg_wll_StringTo$_${fucname}(value);" :
-                               fromString $f 'value',"event->$flctype.$name";
-                       gen qq{
-!                      case EDG_WLL_EVENT_$uctype: $frs break;
-};
-               }
-               gen qq{
-!                      default: edg_wll_set_event_field_warn(event,name,value); break;
-!              \} /* switch */
-!              free(value);
-!              return;
-!      \}
-};
-       }
-@@@}
-
-       edg_wll_set_event_field_warn(event,name,value);
-       free(value);
-       return;
-}
-               
-
-int compare_events_by_tv(const void *a, const void *b)
-{
-       const edg_wll_Event *e = (edg_wll_Event *)a;
-       const edg_wll_Event *f = (edg_wll_Event *)b;
-
-       if (e->any.timestamp.tv_sec < f->any.timestamp.tv_sec) return -1;
-       if (e->any.timestamp.tv_sec > f->any.timestamp.tv_sec) return 1;
-       if (e->any.timestamp.tv_usec < f->any.timestamp.tv_usec) return -1;
-       if (e->any.timestamp.tv_usec > f->any.timestamp.tv_usec) return 1;
-       return 0;
-}
diff --git a/org.glite.lb.server/src/get_events.h b/org.glite.lb.server/src/get_events.h

deleted file mode 100644 (file)

index cfa07c1..0000000
--- a/org.glite.lb.server/src/get_events.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ident "$Header$"
-
-/* Internal functions for getting event sets from the LB database */
-#include "lbs_db.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if 0  /* rel 1 */
-char *edg_wll_jobid_to_user( edg_wll_Context, char *);
-void edg_wll_set_event_field_warn( edg_wll_Event *, char *, char *);
-void edg_wll_set_event_field( edg_wll_Event *, char *, char *);
-int edg_wll_get_events_restricted( edg_wll_Context, edg_wlc_JobId, char *, int, int, char *, edg_wll_Event **);
-#define edg_wll_get_events(ctx,job,md5,emin,emax,ret) \
-       edg_wll_get_events_restricted((ctx),(job),(md5),(emin),(emax),NULL,(ret))
-int edg_wll_last_event( edg_wll_Context, char *);
-int compare_events_by_tv(const void *, const void *);
-#endif
-
-int edg_wll_get_event_flesh(edg_wll_Context,int,edg_wll_Event *);
-int edg_wll_QueryEventsServer(edg_wll_Context,int,const edg_wll_QueryRec **,const edg_wll_QueryRec **,edg_wll_Event **);
-
-int edg_wll_QueryJobsServer(edg_wll_Context, const edg_wll_QueryRec **, int, edg_wlc_JobId **, edg_wll_JobStat **);
-
-void edg_wll_SortEvents(edg_wll_Event *);
-int edg_wll_compare_seq(const char *, const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/org.glite.lb.server/src/il_notification.c b/org.glite.lb.server/src/il_notification.c

deleted file mode 100644 (file)

index 88a699a..0000000
--- a/org.glite.lb.server/src/il_notification.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/**
- * il_notification.c
- *   - implementation of IL API calls for notifications
- *
- */
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-
-#include "glite/lb/context-int.h"
-#include "glite/lb/notifid.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/log_proto.h"
-
-#include "il_notification.h"
-#include "lb_xml_parse.h"
-
-
-
-#define FCNTL_ATTEMPTS         5
-#define FCNTL_TIMEOUT          1
-#define FILE_PREFIX             "/tmp/notif_events"
-#define DEFAULT_SOCKET          "/tmp/notif_interlogger.sock"
-
-char *notif_ilog_socket_path = DEFAULT_SOCKET;
-char *notif_ilog_file_prefix = FILE_PREFIX;
-
-#define tv_sub(a,b) {\
-       (a).tv_usec -= (b).tv_usec;\
-       (a).tv_sec -= (b).tv_sec;\
-       if ((a).tv_usec < 0) {\
-               (a).tv_sec--;\
-               (a).tv_usec += 1000000;\
-       }\
-}
-
-static
-int
-notif_create_ulm(
-       edg_wll_Context context,
-       edg_wll_NotifId reg_id,
-       const char      *host,
-       const uint16_t  port,
-       const char      *owner,
-       const char      *notif_data,
-       char            **ulm_data,
-       char            **reg_id_s)
-{
-       int             ret;
-       edg_wll_Event   *event=NULL;
-
-       *ulm_data = NULL;
-       *reg_id_s = NULL;
-
-       event = edg_wll_InitEvent(EDG_WLL_EVENT_NOTIFICATION);
-
-       gettimeofday(&event->any.timestamp,0);
-       if (context->p_host) event->any.host = strdup(context->p_host);
-       event->any.level = context->p_level;
-       event->any.source = context->p_source;
-       if (context->p_instance) event->notification.src_instance = strdup(context->p_instance);
-       event->notification.notifId = reg_id;
-       if (owner) event->notification.owner = strdup(owner);
-       if (host) event->notification.dest_host = strdup(host);
-       event->notification.dest_port = port;
-       if (notif_data) event->notification.jobstat = strdup(notif_data);
-
-       if ((*ulm_data = edg_wll_UnparseNotifEvent(context,event)) == NULL) {
-               edg_wll_SetError(context, ret = ENOMEM, "edg_wll_UnparseNotifEvent()"); 
-               goto out;
-       }
-
-       if((*reg_id_s = edg_wll_NotifIdGetUnique(reg_id)) == NULL) {
-               edg_wll_SetError(context, ret = ENOMEM, "edg_wll_NotifIdGetUnique()");
-               goto out;
-       }
-
-       ret = 0;
-
-out:
-       if(event) { 
-               edg_wll_FreeEvent(event);
-               free(event);
-       }
-       if(ret) edg_wll_UpdateError(context, ret, "notif_create_ulm()");
-       return(ret);
-}
-
-
-static
-int
-notif_save_to_file(edg_wll_Context     context,
-                  const char         *event_file,
-                  const char         *ulm_data,
-                  long               *filepos)
-{
-       int ret;
-       FILE *outfile;
-       int filedesc;
-       struct flock filelock;
-       int i, filelock_status=-1;
-
-       for(i=0; i < FCNTL_ATTEMPTS; i++) {
-               /* fopen and properly handle the filelock */
-               if ((outfile = fopen(event_file,"a")) == NULL) {
-                       edg_wll_SetError(context, ret = errno, "fopen()");
-                       goto out;
-               }
-               if ((filedesc = fileno(outfile)) == -1) {
-                       edg_wll_SetError(context, ret = errno, "fileno()");
-                       goto out1;
-               }
-               filelock.l_type = F_WRLCK;
-               filelock.l_whence = SEEK_SET;
-               filelock.l_start = 0;
-               filelock.l_len = 0;
-               filelock_status=fcntl(filedesc, F_SETLK, &filelock);
-               if(filelock_status < 0) {
-                       switch(errno) {
-                       case EAGAIN:
-                       case EACCES:
-                       case EINTR:
-                               /* lock is held by someone else */
-                               sleep(FCNTL_TIMEOUT);
-                               break;
-                       default:
-                               /* other error */
-                               edg_wll_SetError(context, ret=errno, "fcntl()");
-                               goto out1;
-                       }
-               } else {
-                       /* lock acquired, break out of the loop */
-                       break;
-               }
-       }
-       if (fseek(outfile, 0, SEEK_END) == -1) {
-               edg_wll_SetError(context, ret = errno, "fseek()");
-               goto out1;
-       }
-       if ((*filepos=ftell(outfile)) == -1) {
-               edg_wll_SetError(context, ret = errno, "ftell()");
-               goto out1;
-       }
-       /* write, flush and sync */
-       if (fputs(ulm_data, outfile) == EOF) {
-               edg_wll_SetError(context, ret = errno, "fputs()");
-               goto out1;
-       }       
-       if (fflush(outfile) == EOF) {
-               edg_wll_SetError(context, ret = errno, "fflush()");
-               goto out1;
-       }
-       if (fsync(filedesc) < 0) { /* synchronize */
-               edg_wll_SetError(context, ret = errno, "fsync()");
-               goto out1;
-       } 
-
-       ret = 0;
-out1:
-       /* close and unlock */
-       fclose(outfile); 
-out:
-       if(ret) edg_wll_UpdateError(context, ret, "notif_save_to_file()");
-       return(ret);
-}
-
-
-static 
-ssize_t 
-socket_write_full(edg_wll_Context  context,
-                 int              sock,
-                 void            *buf,
-                 size_t           bufsize,
-                 struct timeval  *timeout,
-                 ssize_t         *total)
-{
-       int ret = 0;
-        ssize_t        len;
-
-        *total = 0;
-        while (bufsize > 0) {
-
-               fd_set  fds;
-               struct timeval  to,before,after;
-               
-               if (timeout) {
-                       memcpy(&to, timeout, sizeof(to));
-                       gettimeofday(&before, NULL);
-               }
-
-               len = write(sock, buf, bufsize);
-               while (len <= 0) {
-                       FD_ZERO(&fds);
-                       FD_SET(sock, &fds);
-                       if (select(sock+1, &fds, NULL, NULL, timeout ? &to : NULL) < 0) {
-                               edg_wll_SetError(context, ret = errno, "select()");
-                               goto out;
-                       }
-                       len = write(sock, buf, bufsize);
-               }
-               if (timeout) {
-                       gettimeofday(&after,NULL);
-                       tv_sub(after, before);
-                       tv_sub(*timeout,after);
-                       if (timeout->tv_sec < 0) {
-                               timeout->tv_sec = 0;
-                               timeout->tv_usec = 0;
-                       }
-               }
-               
-                if (len < 0) {
-                       edg_wll_SetError(context, ret = errno, "write()");
-                       goto out;
-               }
-
-               bufsize -= len;
-               buf += len;
-                *total += len;
-        }
-
-       ret = 0;
-out:
-       if(ret) edg_wll_UpdateError(context, ret, "socket_write_full()");
-        return ret;
-}
-
-
-static 
-int
-notif_send_socket(edg_wll_Context       context,
-                 long                  filepos,
-                 const char           *ulm_data)
-{
-       int ret;
-       struct sockaddr_un saddr;
-       int msg_sock, flags, count;
-       struct timeval timeout;
-
-       timeout.tv_sec = EDG_WLL_LOG_TIMEOUT_MAX;
-        timeout.tv_usec = 0;   
-
-       msg_sock = socket(PF_UNIX, SOCK_STREAM, 0);
-       if(msg_sock < 0) {
-               edg_wll_SetError(context, ret = errno, "socket()");
-               goto out;
-       }
-
-       memset(&saddr, 0, sizeof(saddr));
-       saddr.sun_family = AF_UNIX;
-       strcpy(saddr.sun_path, notif_ilog_socket_path);
-
-       if ((flags = fcntl(msg_sock, F_GETFL, 0)) < 0 ||
-           fcntl(msg_sock, F_SETFL, flags | O_NONBLOCK) < 0) {
-               edg_wll_SetError(context, ret = errno, "fcntl()");
-               goto out1;
-       }
-
-       if(connect(msg_sock, (struct sockaddr *)&saddr, sizeof(saddr)) < 0) {
-               if(errno != EISCONN) {
-                       edg_wll_SetError(context, ret = errno, "connect()");
-                       goto out1;
-               }
-       }
-
-       if (socket_write_full(context, msg_sock, &filepos, sizeof(filepos), &timeout, &count) < 0) {
-               ret = errno; 
-               goto out1;
-       }
-
-       if (socket_write_full(context, msg_sock, (void*)ulm_data, strlen(ulm_data), &timeout, &count) < 0) {
-               ret = errno; 
-               goto out1;
-       }
-
-       ret = 0;
-
-out1:
-       close(msg_sock);
-out:
-       if(ret) edg_wll_UpdateError(context, ret, "notif_send_socket()");
-       return(ret);
-}
-
-
-int
-edg_wll_NotifSend(edg_wll_Context       context,
-                 edg_wll_NotifId       reg_id,
-                 const char           *host,
-                  int                   port,
-                 const char           *owner,
-                  const char           *notif_data)
-{
-       int ret;
-       long filepos;
-       char *ulm_data, *reg_id_s, *event_file;
-
-       if((ret=notif_create_ulm(context, 
-                                reg_id, 
-                                host, 
-                                port, 
-                                owner, 
-                                notif_data,
-                                &ulm_data,
-                                &reg_id_s))) {
-               goto out;
-       }
-
-       asprintf(&event_file, "%s.%s", notif_ilog_file_prefix, reg_id_s);
-       if(event_file == NULL) {
-               edg_wll_SetError(context, ret=ENOMEM, "asprintf()");
-               goto out;
-       }
-
-       if((ret=notif_save_to_file(context,
-                                  event_file,
-                                  ulm_data,
-                                  &filepos))) {
-               goto out;
-       }
-
-       if((ret=notif_send_socket(context,
-                                 filepos,
-                                 ulm_data))) {
-               goto out;
-       }
-       ret = 0;
-
-out:
-       if(ulm_data) free(ulm_data);
-       if(reg_id_s) free(reg_id_s);
-       if(ret) edg_wll_UpdateError(context, ret, "edg_wll_NotifSend()");
-       return(ret);
-}
-
-
-int
-edg_wll_NotifJobStatus(edg_wll_Context context,
-                      edg_wll_NotifId  reg_id,
-                      const char      *host,
-                       int              port,
-                      const char      *owner,
-                      const edg_wll_JobStat notif_job_stat)
-{
-       int ret=0;
-       char   *xml_data, *xml_esc_data=NULL;
-
-       if(edg_wll_JobStatusToXML(context, notif_job_stat, &xml_data)) 
-               goto out;
-       
-       if((xml_esc_data = edg_wll_EscapeXML(xml_data)) == NULL) {
-               edg_wll_SetError(context, ret=ENOMEM, "edg_wll_EscapeXML()");
-               goto out;
-       }
-
-       ret=edg_wll_NotifSend(context, reg_id, host, port, owner, xml_esc_data);
-
-out:
-       if(xml_data) free(xml_data);
-       if(xml_esc_data) free(xml_esc_data);
-       if(ret) edg_wll_UpdateError(context, ret, "edg_wll_NotifJobStatus()");
-       return(ret);
-}
-
-
-int 
-edg_wll_NotifChangeDestination(edg_wll_Context context,
-                               edg_wll_NotifId reg_id,
-                               const char      *host,
-                               int             port)
-{
-       return(edg_wll_NotifSend(context, reg_id, host, port, "", ""));
-}
-
-
-int
-edg_wll_NotifCancelRegId(edg_wll_Context context,
-                        edg_wll_NotifId reg_id)
-{
-       return(edg_wll_NotifSend(context, reg_id, NULL, 0, "", ""));
-}
-
diff --git a/org.glite.lb.server/src/il_notification.h b/org.glite.lb.server/src/il_notification.h

deleted file mode 100644 (file)

index 52487c4..0000000
--- a/org.glite.lb.server/src/il_notification.h
+++ /dev/null
@@ -1,96 +0,0 @@
-#ifndef IL_NOTIFICATION_H
-#define IL_NOTIFICATION_H
-
-/* needed for the edg_wll_NotifId */
-#include "glite/lb/notification.h"
-/* import the edg_wll_JobStat structure */
-#include "glite/lb/jobstat.h"
-
-#ifdef __cplusplus
-#extern "C" {
-#endif
-
-extern char *notif_ilog_socket_path;
-extern char *notif_ilog_file_prefix;
-
-/** Send ULM notification string to interlogger.
- * Stores notification to file according to registration id and send it
- * to interlogger using local socket.
- * \param reg_id  registration id
- * \param host,port address to deliver the notification to.
- *                  If NULL, it means no further notifications will
- *                  follow (the client has unregistered). It always
- *                  overrides previous values (ie. changes the
- *                  reg_id->client address mapping in interlogger).
- * \param owner DN of the registration owner, this will be verified
- *              against client's certificate
- * \param notif_data ULM formatted notification string, may be NULL,
- *                   if there is nothing to be sent to client.
- * \retval 0 OK
- * \retval EINVAL      bad jobId, unknown event code, or the format
- *                      string together with the remaining arguments
- *                      does not form a valid event 
- * \retval ENOSPC      unable to accept the event due to lack of disk
- *                      space etc. 
- * \retval ENOMEM      failed to allocate memory
- * \retval EAGAIN      non blocking return from the call, the event
- *                      did not come through socket, but is backed up
- *                      in file
- */
-int
-edg_wll_NotifSend(edg_wll_Context       context,
-                 edg_wll_NotifId       reg_id,
-                 const char           *host,
-                  int                   port,
-                 const char           *owner,
-                  const char           *notif_data);
-
-
-/** Send job status notification.
- * Creates ULM notification string and sends it using
- * edg_wll_NotifSend(). The job status is encoded into XML and escaped
- * before inclusion into ULM.
- * \param reg_id registration id
- * \param host,port address to deliver the notification to.
- * \param owner DN of the registration owner, this will be verified
- *              against client's certificate
- * \param notif_job_stat structure describing job status
- * \see edg_wll_NotifSend()
- */
-int
-edg_wll_NotifJobStatus(edg_wll_Context context,
-                      edg_wll_NotifId  reg_id,
-                      const char      *host,
-                       int              port,
-                      const char      *owner,
-                      const edg_wll_JobStat notif_job_stat);
-
-
-/** Change address for notification delivery.
- * Creates ULM string and uses edg_wll_NotifSend() to pass it
- * to interlogger.
- * \param reg_id registration id
- * \param host,port new delivery address
- * \see edg_wll_NotifSend()
- */
-int 
-edg_wll_NotifChangeDestination(edg_wll_Context context,
-                               edg_wll_NotifId reg_id,
-                               const char      *host,
-                               int             port);
-
-/** Cancel registration.
- * Creates ULM string and uses edg_wll_NotifSend() to pass it to
- * interlogger.
- * \param reg_id registration id
- */
-int
-edg_wll_NotifCancelRegId(edg_wll_Context context,
-                        edg_wll_NotifId reg_id);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/org.glite.lb.server/src/index.c.T b/org.glite.lb.server/src/index.c.T

deleted file mode 100644 (file)

index b3cbd18..0000000
--- a/org.glite.lb.server/src/index.c.T
+++ /dev/null
@@ -1,227 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include "glite/lb/context-int.h"
-#include "lbs_db.h"
-#include "index.h"
-
-extern int debug;
-
-#define const_len(c)   (sizeof((c))-1)
-
-/* TODO: 
-   - better error recovery (skip unrecognised indices etc.)
-   - leaks memory on errors
-*/
-
-int edg_wll_QueryJobIndices(edg_wll_Context ctx,edg_wll_QueryRec *** index_out,char ***keys_out)
-{
-       edg_wll_QueryRec        **idx = NULL;
-       edg_wll_Stmt            stmt = NULL;
-
-       int     i,j,ret;
-
-       static const char *built_in_indices[] = {
-               "PRIMARY",
-               "parent_job",
-               NULL
-       };
-
-/* XXX: "show index from" columns. Matches at least MySQL 4.0.11 */
-
-       char    *showcol[12];
-       int     Key_name,Seq_in_index,Column_name,Sub_part;
-
-       char    **keys = NULL;
-       int     *cols = NULL;
-       char    **col_names = NULL;
-
-       int     nkeys = 0;
-
-       Key_name = Seq_in_index = Column_name = Sub_part = -1;
-
-       if (edg_wll_ExecStmt(ctx,"show index from states",&stmt)<0) 
-               return edg_wll_Error(ctx,NULL,NULL);
-
-       while ((ret = edg_wll_FetchRow(stmt,showcol))) {
-               if (ret < 0) return edg_wll_Error(ctx,NULL,NULL);
-               assert(ret <= sizeof showcol/sizeof showcol[0]);
-
-               if (!col_names) {
-                       col_names = malloc(ret * sizeof col_names[0]);
-                       edg_wll_QueryColumns(stmt,col_names);
-                       for (i=0; i<ret; i++) 
-                               if (!strcasecmp(col_names[i],"Key_name")) Key_name = i;
-                               else if (!strcasecmp(col_names[i],"Seq_in_index")) Seq_in_index = i;
-                               else if (!strcasecmp(col_names[i],"Column_name")) Column_name = i;
-                               else if (!strcasecmp(col_names[i],"Sub_part")) Sub_part = i;
-
-                       assert(Key_name >= 0 && Seq_in_index >= 0 && 
-                                       Column_name >= 0 && Sub_part >= 0);
-
-               }
-
-
-               for (j=0; built_in_indices[j]; j++) {
-                       if (strcasecmp(showcol[Key_name],built_in_indices[j]) == 0) {
-                               for (i=0; i<ret; i++) free(showcol[i]);
-                               goto continue_fetch_index;
-                       }
-               }
-               
-               for (i=0; i<nkeys && strcasecmp(showcol[Key_name],keys[i]); i++);
-
-               if (i == nkeys) {
-                       keys = realloc(keys,(i+2) * sizeof keys[0]);
-                       keys[i] = showcol[Key_name];
-                       keys[i+1] = NULL;
-                       cols = realloc(cols,(i+1) * sizeof cols[0]); 
-                       cols[i] = 0;
-                       idx = realloc(idx,(i+2) * sizeof idx[0]);
-                       idx[i] = idx[i+1] = NULL;
-                       showcol[Key_name] = NULL;
-                       nkeys++;
-               }
-
-               j = atoi(showcol[Seq_in_index])-1;
-               if (cols[i] <= j) {
-                       cols[i] = j+1;
-                       idx[i] = realloc(idx[i],(j+2)*sizeof idx[i][0]);
-                       memset(&idx[i][j+1],0,sizeof idx[i][0]);
-               }
-
-               if (edg_wll_ColumnToQueryRec(showcol[Column_name],&idx[i][j])) {
-                       char    ed[300];
-                       sprintf(ed,"%s(%s): unsupported column",keys[i],showcol[Column_name]);
-                       return edg_wll_SetError(ctx,EINVAL,ed);
-               }
-               else idx[i][j].value.i = atoi(showcol[Sub_part]);
-                       
-               for (i=0; i<ret; i++) free(showcol[i]);
-continue_fetch_index:
-               // just for escaping from nested cycles         
-               ;       /* prevent compiler to complain */
-       }
-
-       edg_wll_FreeStmt(&stmt);
-       free(cols);
-       free(col_names);
-       if (keys_out) *keys_out = keys; else free(keys);
-       *index_out = idx;
-
-       return edg_wll_ResetError(ctx);
-}
-
-int edg_wll_CmpColumn(const edg_wll_QueryRec *r1,const edg_wll_QueryRec *r2)
-{
-       if (r1->attr != r2->attr) return 1;
-       switch (r1->attr) {
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-                       return strcasecmp(r1->attr_id.tag,r2->attr_id.tag);
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       return r1->attr_id.state != r2->attr_id.state;
-               default:
-                       return 0;
-       }
-}
-
-static struct {
-       const char      *name;
-       edg_wll_QueryAttr       attr;
-} std_attrs[] =
-{
-@@@{
-       for my $n ($status->getAllFieldsOrdered) {
-               my $f = selectField $status $n;
-               next unless $f->{index};
-               my $u = uc getName $f;
-               gen "\t{ \"$n\", EDG_WLL_QUERY_ATTR_$u },\n";
-       }
-@@@}
-       { NULL, },
-};
-
-int edg_wll_ColumnToQueryRec(const char *col_name,edg_wll_QueryRec *rec)
-{
-       int     i;
-
-       memset(rec,0,sizeof *rec);
-       if (strncasecmp(col_name,STD_PREFIX,const_len(STD_PREFIX)) == 0) {
-               for (i=0; std_attrs[i].name
-                       && strcasecmp(std_attrs[i].name,col_name+const_len(STD_PREFIX)); i++);
-
-               if (std_attrs[i].name) rec->attr = std_attrs[i].attr;
-       }
-       else if (strncasecmp(col_name,TIME_PREFIX,const_len(TIME_PREFIX)) == 0) {
-               rec->attr_id.state = edg_wll_StringToStat(col_name+const_len(TIME_PREFIX));
-               if (rec->attr_id.state != (edg_wll_JobStatCode) -1) rec->attr = EDG_WLL_QUERY_ATTR_TIME;
-       }
-       else if (strncasecmp(col_name,USR_PREFIX,const_len(USR_PREFIX)) == 0) {
-               rec->attr = EDG_WLL_QUERY_ATTR_USERTAG;
-               rec->attr_id.tag = strdup(col_name+const_len(USR_PREFIX));
-               rec->value.c = NULL;
-       }
-
-       return !rec->attr;
-}
-
-char * edg_wll_QueryRecToColumn(const edg_wll_QueryRec *rec)
-{
-       char    col[100] = "";
-
-       if (rec->attr == EDG_WLL_QUERY_ATTR_USERTAG) {
-               strcpy(col,USR_PREFIX);
-               strcat(col,rec->attr_id.tag);
-       }
-       else if (rec->attr == EDG_WLL_QUERY_ATTR_TIME) {
-               char    *s = edg_wll_StatToString(rec->attr_id.state);
-
-               if (s) {
-                       strcpy(col,TIME_PREFIX);
-                       strcat(col,s);
-                       free(s);
-               }
-       }
-       else {
-               int     i;
-               for (i=0; std_attrs[i].name && std_attrs[i].attr != rec->attr; i++);
-               if (std_attrs[i].name) {
-                       strcpy(col,STD_PREFIX);
-                       strcat(col,std_attrs[i].name);
-               }
-       }
-
-       return col[0] ? strdup(col) : NULL;
-}
-
-char * edg_wll_QueryRecToColumnExt(const edg_wll_QueryRec *rec)
-{
-       char    *intern = edg_wll_QueryRecToColumn(rec),
-               *out;
-
-       if (!intern) return NULL;
-
-       switch (rec->attr) {
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-                       out = strdup(intern+const_len(USR_PREFIX));
-                       break;
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       out = strdup(intern+const_len(TIME_PREFIX));
-                       break;
-               default:
-                       out = strdup(intern+const_len(STD_PREFIX));
-                       break;
-       }
-       free(intern);
-       return out;
-}
-
-void edg_wll_FreeIColumnRec(edg_wll_IColumnRec *icrp)
-{
-       if (icrp->qrec.attr == EDG_WLL_QUERY_ATTR_USERTAG)
-               free(icrp->qrec.attr_id.tag);
-       free(icrp->colname);
-}
-
diff --git a/org.glite.lb.server/src/index.h b/org.glite.lb.server/src/index.h

deleted file mode 100644 (file)

index 2e585f2..0000000
--- a/org.glite.lb.server/src/index.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-int edg_wll_QueryJobIndices(edg_wll_Context,edg_wll_QueryRec ***,char ***);
-int edg_wll_ColumnToQueryRec(const char *,edg_wll_QueryRec *);
-char * edg_wll_QueryRecToColumn(const edg_wll_QueryRec *);
-char * edg_wll_QueryRecToColumnExt(const edg_wll_QueryRec *);
-
-int edg_wll_ParseIndexConfig(edg_wll_Context,const char *,edg_wll_QueryRec ***);
-int edg_wll_DumpIndexConfig(edg_wll_Context,const char *,edg_wll_QueryRec * const *);
-
-int edg_wll_CmpColumn(const edg_wll_QueryRec *,const edg_wll_QueryRec *);
-
-typedef struct _edg_wll_IColumnRec {
-       edg_wll_QueryRec        qrec;
-       char *                  colname;
-} edg_wll_IColumnRec;
-
-void edg_wll_FreeIColumnRec(edg_wll_IColumnRec *);
-
-int yylex();
-
-extern int     lex_int;
-extern char    *lex_out;
-extern int     lex_line;
-
-#define STD_PREFIX     "STD_"
-#define USR_PREFIX     "USR_"
-#define TIME_PREFIX    "TIME_"
diff --git a/org.glite.lb.server/src/index_lex.l b/org.glite.lb.server/src/index_lex.l

deleted file mode 100644 (file)

index fa552a1..0000000
--- a/org.glite.lb.server/src/index_lex.l
+++ /dev/null
@@ -1,47 +0,0 @@
-%{
-#ident "$Header$"
-
-#include <string.h>
-
-#include "glite/lb/context-int.h"
-#include "index_parse.h"
-#include "index.h"
-
-char   *lex_out;
-int    lex_int;
-int    lex_line;
-
-int yywrap(void) { return 1; }
-
-#define YY_NO_UNPUT
-
-%}
-
-
-delim  [ \t]
-ws     {delim}+
-string \"[^\"\n]*\"
-digit  [0-9]
-int    {digit}+
-
-%%
-{ws}   {}
-
-JobIndices     return JOB_INDICES;
-type           return TYPE;
-name           return NAME;
-prefixlen      return PREFIX;
-{int}          {
-                       lex_int = atoi(yytext);
-                       return INT;
-               }
-{string}       {
-                       int     len;
-                       lex_out = malloc(len = strlen(yytext)-1);
-                       strncpy(lex_out,yytext+1,len-1);
-                       lex_out[len-1] = 0;
-                       return STRING;
-               }
-\n     lex_line++;
-.              return *yytext;
-
diff --git a/org.glite.lb.server/src/index_parse.y b/org.glite.lb.server/src/index_parse.y

deleted file mode 100644 (file)

index 4c9265b..0000000
--- a/org.glite.lb.server/src/index_parse.y
+++ /dev/null
@@ -1,242 +0,0 @@
-%{
-#ident "$Header$"
-
-
-#include <stdio.h>
-#include <string.h>
-
-#include "glite/lb/context-int.h"
-
-#include "lbs_db.h"
-#include "index.h"
-
-#define yyerror(x) {}
-
-#define YYDEBUG        1
-
-#define ATTR_TYPE_SYSTEM       "system"
-#define ATTR_TYPE_USER         "user"
-#define ATTR_TYPE_TIME         "time"
-
-static edg_wll_Context parse_ctx;
-static const char      *parse_fname;
-
-#define bailout(msg) \
-{ \
-       char    *buf; \
- \
-       asprintf(&buf,"%s:%d: %s",parse_fname,lex_line,(msg)); \
-       edg_wll_SetError(parse_ctx,EINVAL,buf); \
-       free(buf); \
-       YYABORT; \
-}
-
-extern FILE *yyin;
-
-edg_wll_QueryRec       **indices_out;
-
-%}
-
-%term JOB_INDICES
-%term STRING
-%term INT
-%term TYPE
-%term NAME
-%term PREFIX
-
-%union
-{
-       char    *s;
-       int     i;
-       edg_wll_QueryRec        qr;
-       edg_wll_QueryRec        *qrl;
-       edg_wll_QueryRec        **qrll;
-       struct elem_attr {
-               int     attr;
-               char    *val;
-       }                       attr;
-}
-
-%type <s> string
-%type <i> int
-%type <qr> job_index_elem
-%type <qrl> job_index job_index_elem_list
-%type <qrll> job_index_list job_indices;
-%type <attr> elem_attr opt_elem_attr
-
-%%
-
-config : '[' job_indices soft_semicolon ']'    { indices_out = $2; }
-       ;
-
-job_indices    : JOB_INDICES '=' '{' job_index_list soft_comma '}' { $$ = $4; }
-               ;
-
-job_index_list : job_index     { $$ = calloc(2,sizeof (*$$)); *$$ = $1; }
-               | job_index_list ',' job_index
-{
-       int     i;
-       for (i=0; $1[i]; i++);
-       $$ = realloc($1,(i+2) * sizeof *$1);
-       $$[i] = $3;
-       $$[i+1] = NULL;
-}
-               ;
-
-job_index      : job_index_elem                { $$ = calloc(2,sizeof (*$$)); memcpy($$,&$1,sizeof $1); }
-               | '{' job_index_elem_list '}'   { $$ = $2; }
-               ;
-
-job_index_elem_list    : job_index_elem        { $$ = calloc(2,sizeof (*$$)); memcpy($$,&$1,sizeof $1); }
-               | job_index_elem_list ',' job_index_elem
-{
-       int     i;
-       for (i=0; $1[i].attr; i++);
-       $$ = realloc($1,(i+2) * sizeof *$1);
-       memcpy($$+i,&$3,sizeof $3);
-       memset($$+i+1,0,sizeof *$$);
-}
-               ;
-
-job_index_elem : '[' elem_attr ';' elem_attr opt_elem_attr ']'
-{
-       char    *name = $2.attr == NAME ? $2.val :
-                               $4.attr == NAME ? $4.val : 
-                               $5.attr == NAME ? $5.val : NULL,
-               *type = $2.attr == TYPE ? $2.val :
-                               $4.attr == TYPE ? $4.val :
-                               $5.attr == TYPE ? $5.val : NULL;
-       int     prefix = $2.attr == PREFIX ? (int) $2.val :
-                               $4.attr == PREFIX ? (int) $4.val :
-                               $5.attr == PREFIX ? (int) $5.val : 0;
-
-
-       if (!name) bailout("`name' required");
-       if (!type) bailout("`type' required");
-
-       if (strcasecmp(type,ATTR_TYPE_SYSTEM) == 0) {
-               char    *name2;
-               asprintf(&name2,STD_PREFIX "%s",name);
-               if (edg_wll_ColumnToQueryRec(name2,&$$)) bailout("unknown attribute");
-               free(name2);
-               free(name);
-       }
-       else if (strcasecmp(type,ATTR_TYPE_USER) == 0) {
-               $$.attr = EDG_WLL_QUERY_ATTR_USERTAG;
-               $$.attr_id.tag = name;
-       }
-       else if (strcasecmp(type,ATTR_TYPE_TIME) == 0) {
-               char    *name2;
-               if (prefix) bailout("PREFIXLEN is not valid with time attributes");
-               asprintf(&name2,TIME_PREFIX "%s",name);
-               if (edg_wll_ColumnToQueryRec(name2,&$$)) bailout("unknown attribute");
-               free(name2);
-               free(name);
-       }
-       else bailout("unknown attr type");
-
-       $$.value.i = prefix;
-}
-               ;
-
-elem_attr      : TYPE '=' string       { $$.attr = TYPE; $$.val = $3; }
-               | NAME '=' string       { $$.attr = NAME; $$.val = $3; }
-               | PREFIX '=' int        { $$.attr = PREFIX; $$.val = (char *) $3; }
-               ;
-
-opt_elem_attr  :       { $$.attr = 0; $$.val = NULL; }
-               |       ';' elem_attr   { $$ = $2; }
-               ;
-
-string         : STRING        { $$ = lex_out; lex_out = NULL; }
-               ;
-
-int            : INT           { $$ = lex_int; }
-               ;
-
-soft_semicolon :
-               | ';'
-               ;
-
-soft_comma     :
-               | ','
-               ;
-
-
-%%
-
-
-/* XXX: uses static variables -- non thread-safe */
-
-int edg_wll_ParseIndexConfig(edg_wll_Context ctx,const char *fname,edg_wll_QueryRec ***out)
-{
-       yyin = strcmp(fname,"-") ? fopen(fname,"r") : stdin;
-       lex_line = 1;
-
-       if (!yyin) return edg_wll_SetError(ctx,errno,fname);
-
-       parse_ctx = ctx;
-       parse_fname = fname;
-       edg_wll_ResetError(ctx);
-
-       /* yydebug = 1; */
-       if (yyparse() && !edg_wll_Error(ctx,NULL,NULL)) {
-               char    buf[100];
-               if (yyin != stdin) fclose(yyin);
-               sprintf(buf,"%s:%d: parse error",fname,lex_line);
-               return edg_wll_SetError(ctx,EINVAL,buf);
-       }
-       if (yyin != stdin) fclose(yyin);
-
-       if (!edg_wll_Error(ctx,NULL,NULL)) *out = indices_out;
-       indices_out = NULL;     /* XXX: memory leak on error but who cares? */
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_DumpIndexConfig(edg_wll_Context ctx,const char *fname,edg_wll_QueryRec * const *idx)
-{
-       int     haveit = 0;
-
-       FILE    *f = strcmp(fname,"-") ? fopen(fname,"w") : stdout;
-
-       if (!f) return edg_wll_SetError(ctx,errno,fname);
-       if (idx && *idx) { haveit = 1; fputs("[\n\tJobIndices = {\n",f); }
-
-       while (idx && *idx) {
-               const edg_wll_QueryRec *i;
-               int     multi = (*idx)[1].attr;
-
-               fputs(multi ? "\t\t{\n" : "\t\t",f);
-
-               for (i=*idx; i->attr; i++) {
-                       char    *cn = edg_wll_QueryRecToColumnExt(i);
-                       char    prefix[100] = "";
-                       char    *type;
-
-                       switch (i->attr) {
-                               case EDG_WLL_QUERY_ATTR_USERTAG: type = ATTR_TYPE_USER; break;
-                               case EDG_WLL_QUERY_ATTR_TIME: type = ATTR_TYPE_TIME; break;
-                               default: type = ATTR_TYPE_SYSTEM; break;
-                       }
-                               
-                       if (i->value.i) sprintf(prefix,"; prefixlen = %d ",i->value.i);
-                       if (multi) fputs("\t\t\t",f);
-                       fprintf(f,"[ type = \"%s\"; name = \"%s\" %s]",type,cn,prefix);
-                       if (multi) fputs(i[1].attr ? ",\n" : "\n",f);
-                       free(cn);
-               }
-
-               if (multi) fputs("\t\t}",f);
-               fputs(idx[1] ? ",\n" : "\n",f);
-
-               idx++;
-       }
-
-       if (haveit) {
-               fputs("\t}\n]\n",f);
-               return edg_wll_ResetError(ctx);
-       }
-       else return edg_wll_SetError(ctx,ENOENT,"no indices");
-}
-
-
diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c

deleted file mode 100644 (file)

index 6d2e64f..0000000
--- a/org.glite.lb.server/src/jobstat.c
+++ /dev/null
@@ -1,1250 +0,0 @@
-#ident "$Header$"
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <regex.h>
-#include <syslog.h>
-
-#include "glite/lb/producer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-
-#include "get_events.h"
-#include "store.h"
-#include "lock.h"
-#include "index.h"
-#include "jobstat.h"
-#include "lb_authz.h"
-
-
-extern int debug;
-
-#define DAG_ENABLE     1
-
-#ifndef dprintf
-#define dprintf(x) { if (debug) printf x; }
-#endif
-
-/* TBD: share in whole logging or workload */
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-  
-#define RET_FAIL       0
-#define RET_OK         1
-#define RET_FATAL      RET_FAIL
-#define RET_SOON       2
-#define RET_LATE       3
-#define RET_BADSEQ     4
-#define RET_SUSPECT    5
-#define RET_IGNORE     6
-#define RET_INTERNAL   100
-
-#define rep(a,b) { free(a); a = (b == NULL) ? NULL : strdup(b); }
-#define mov(a,b) { free(a); a = b; b = NULL; }
-
-static void warn (const char* format, ...) UNUSED_VAR ;
-static char *job_owner(edg_wll_Context,char *);
-static char* location_string(const char*, const char*, const char*);
-static int add_stringlist(char ***, const char *) UNUSED_VAR;
-static int add_taglist(edg_wll_TagValue **, const char *, const char *);
-
-
-int edg_wll_intJobStatus(edg_wll_Context, const edg_wlc_JobId, int, intJobStat *, int);
-edg_wll_ErrorCode edg_wll_StoreIntState(edg_wll_Context, intJobStat *, int);
-edg_wll_ErrorCode edg_wll_LoadIntState(edg_wll_Context , edg_wlc_JobId , int, intJobStat **);
-
-int js_enable_store = 1;
-
-/*
- * Basic manipulations with the internal representation of job state
- */
-
-static void init_intJobStat(intJobStat *p)
-{
-       memset(p, 0, sizeof(intJobStat));
-       p->pub.jobtype = EDG_WLL_STAT_SIMPLE;
-       p->pub.children_hist = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int));
-       p->pub.children_hist[0] = EDG_WLL_NUMBER_OF_STATCODES;
-       p->pub.stateEnterTimes = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int));
-       p->pub.stateEnterTimes[0] = EDG_WLL_NUMBER_OF_STATCODES;
-       /* TBD: generate */
-}
-
-static void destroy_intJobStat_extension(intJobStat *p)
-{
-       free(p->last_seqcode); p->last_seqcode = NULL;
-       free(p->last_cancel_seqcode); p->last_cancel_seqcode = NULL;
-                              p->wontresub = 0;
-}
-
-void destroy_intJobStat(intJobStat *p)
-{
-       edg_wll_FreeStatus(&p->pub);
-       destroy_intJobStat_extension(p);
-       memset(p, 0, sizeof(intJobStat));
-}
-
-#if 0
-static int eval_expect_update(intJobStat *, int *, char **);
-#endif
-
-static int processEvent(intJobStat *, edg_wll_Event *, int, int, char **);
-
-static char* matched_substr(char *, regmatch_t) UNUSED_VAR;
-
-static char* matched_substr(char *in, regmatch_t match)
-{
-       int len;
-       char *s;
-
-       len = match.rm_eo - match.rm_so;
-       s = calloc(1, len + 1);
-       if (s != NULL) {
-               strncpy(s, in + (int)match.rm_so, len);
-       }
-
-       return s;
-}
-
-
-int edg_wll_JobStatus(
-       edg_wll_Context ctx,
-       const edg_wlc_JobId             job,
-       int             flags,
-       edg_wll_JobStat *stat)
-{
-
-/* Local variables */
-       char            *string_jobid;
-       char            *md5_jobid;
-
-       intJobStat      jobstat;
-       intJobStat      *ijsp;
-       int             intErr = 0;
-       int             lockErr;
-       edg_wll_Acl     acl = NULL;
-#if DAG_ENABLE 
-       char            *stmt = NULL;
-#endif 
-
-       edg_wll_ResetError(ctx);
-
-       string_jobid = edg_wlc_JobIdUnparse(job);
-       if (string_jobid == NULL || stat == NULL)
-               return edg_wll_SetError(ctx,EINVAL, NULL);
-       md5_jobid = edg_wlc_JobIdGetUnique(job);
-
-       if ( !(jobstat.pub.owner = job_owner(ctx,md5_jobid)) ) {
-               free(md5_jobid);
-               free(string_jobid);
-               return edg_wll_Error(ctx,NULL,NULL);
-       }
-
-       intErr = edg_wll_GetACL(ctx, job, &acl);
-       if (intErr) {
-               free(md5_jobid);
-               free(string_jobid);
-               return edg_wll_Error(ctx,NULL,NULL);
-       }
-
-       /* authorization check */
-       if ( !(ctx->noAuth) &&
-           (!(ctx->peerName) ||  strcmp(ctx->peerName, jobstat.pub.owner))) {
-               intErr = (acl == NULL) || edg_wll_CheckACL(ctx, acl, EDG_WLL_PERM_READ);
-             if (intErr) {
-                free(string_jobid);
-                free(md5_jobid);
-                free(jobstat.pub.owner); jobstat.pub.owner = NULL;
-                if (acl) {
-                       edg_wll_FreeAcl(acl);
-                       return edg_wll_Error(ctx, NULL, NULL);
-                } else {
-                       return edg_wll_SetError(ctx,EPERM, "not owner, no ACL is set");
-                }
-             }
-       }
-
-       intErr = edg_wll_LoadIntState(ctx, job, -1 /*all events*/, &ijsp);
-       if (!intErr) {
-               *stat = ijsp->pub;
-               destroy_intJobStat_extension(ijsp);
-               free(ijsp);
-
-       } else {
-               lockErr = edg_wll_LockJob(ctx,job);
-               intErr = edg_wll_intJobStatus(ctx, job, flags,&jobstat, js_enable_store && !lockErr);
-               if (!lockErr) {
-                       edg_wll_UnlockJob(ctx,job);
-               }
-       
-               *stat = jobstat.pub;
-               if (intErr) edg_wll_FreeStatus(&jobstat.pub);
-               destroy_intJobStat_extension(&jobstat);
-       }
-       
-       if (intErr) {
-               free(string_jobid);
-               free(md5_jobid);
-               if (acl) edg_wll_FreeAcl(acl);
-               return edg_wll_Error(ctx, NULL, NULL);
-       }
-
-       if (acl) {
-               stat->acl = strdup(acl->string);
-               edg_wll_FreeAcl(acl);
-       }
-
-       if ((flags & EDG_WLL_STAT_CLASSADS) == 0) {
-               char *null = NULL;
-
-               mov(stat->jdl, null);
-               mov(stat->matched_jdl, null);
-               mov(stat->condor_jdl, null);
-               mov(stat->rsl, null);
-       }
-
-#if DAG_ENABLE
-       if (stat->jobtype == EDG_WLL_STAT_DAG) {
-               if (1) {
-                       char *out[2];
-                       edg_wll_Stmt sh;
-                       int num_sub, num_f;
-
-                       if (stat->children_hist == NULL) {
-                               stat->children_hist = (int*) calloc(1+EDG_WLL_NUMBER_OF_STATCODES, sizeof(int));
-                               stat->children_hist[0] = EDG_WLL_NUMBER_OF_STATCODES;
-                       }
-                       if ((flags & EDG_WLL_STAT_CHILDREN) == 0) {
-                               trio_asprintf(&stmt, "SELECT status FROM states "
-                                                       "WHERE parent_job='%|Ss' AND version='%|Ss'",
-                                       md5_jobid, INTSTAT_VERSION);
-                               out[1] = NULL;
-                       } else {
-                               trio_asprintf(&stmt, "SELECT s.status,j.dg_jobid FROM states s,jobs j "
-                                               "WHERE s.parent_job='%|Ss' AND s.version='%|Ss' AND s.jobid=j.jobid",
-                                       md5_jobid, INTSTAT_VERSION);
-                       }
-                       if (stmt != NULL) {
-                               num_sub = edg_wll_ExecStmt(ctx, stmt, &sh);
-                               if (num_sub >=0 ) {
-                                       while ((num_f = edg_wll_FetchRow(sh, out)) == 1
-                                                       || (num_f == 2)) {
-                                               num_f = atoi(out[0]);
-                                               if (num_f > EDG_WLL_JOB_UNDEF && num_f < EDG_WLL_NUMBER_OF_STATCODES)
-                                                       stat->children_hist[num_f+1]++;
-                                               if (out[1] !=NULL) add_stringlist(&stat->children, out[1]);
-                                               free(out[0]); free(out[1]);
-                                       }
-                                       edg_wll_FreeStmt(&sh);
-                               }
-                               free(stmt);
-                       } else goto dag_enomem;
-               }
-               if (flags & EDG_WLL_STAT_CHILDSTAT) {
-                       char *stat_str, *s_out;
-                       edg_wll_Stmt sh;
-                       int num_sub, num_f, i;
-                       intJobStat *js;
-
-                       trio_asprintf(&stmt, "SELECT int_status FROM states WHERE parent_job='%|Ss'"
-                                               " AND version='%|Ss'",
-                                       md5_jobid, INTSTAT_VERSION);
-                       if (stmt != NULL) {
-                               num_sub = edg_wll_ExecStmt(ctx, stmt, &sh);
-                               if (num_sub >=0 ) {
-                                       i = 0;
-                                       stat->children_states = calloc(num_sub+1, sizeof(edg_wll_JobStat));
-                                       if (stat->children_states == NULL) {
-                                               edg_wll_FreeStmt(&sh);
-                                               goto dag_enomem;
-                                       }
-                                       while ((num_f = edg_wll_FetchRow(sh, &stat_str)) == 1
-                                               && i < num_sub) {
-                                               js = dec_intJobStat(stat_str, &s_out);
-                                               if (s_out != NULL && js != NULL) {
-                                                       stat->children_states[i] = js->pub;
-                                                       destroy_intJobStat_extension(js);
-                                                       free(js);
-                                                       i++;
-                                               }
-                                               free(stat_str);
-                                       }
-                                       edg_wll_FreeStmt(&sh);
-                               }
-                               free(stmt);
-                       } else goto dag_enomem;
-               }
-       }
-#endif
-       free(string_jobid);
-       free(md5_jobid);
-       return edg_wll_Error(ctx, NULL, NULL);
-
-#if DAG_ENABLE
-dag_enomem:
-       free(string_jobid);
-       free(md5_jobid);
-       edg_wll_FreeStatus(stat);
-       free(stmt);
-       return edg_wll_SetError(ctx, ENOMEM, NULL);
-#endif
-}
-
-int edg_wll_intJobStatus(
-       edg_wll_Context ctx,
-       const edg_wlc_JobId     job,
-       int                     flags,
-       intJobStat      *intstat,
-       int             update_db)
-{
-
-/* Local variables */
-       char            *string_jobid;
-       char            *md5_jobid;
-
-       int             num_events;
-       edg_wll_Event   *events = NULL;
-
-       int             i, intErr = 0;
-       int             res;
-       int             be_strict = 0;
-       char            *errstring = NULL;
-
-       edg_wll_QueryRec        jqr[2];
-       edg_wll_QueryRec        **jqra;
-
-/* Processing */
-       edg_wll_ResetError(ctx);
-       init_intJobStat(intstat);
-
-       string_jobid = edg_wlc_JobIdUnparse(job);
-       if (string_jobid == NULL || intstat == NULL)
-               return edg_wll_SetError(ctx,EINVAL, NULL);
-
-       /* can be already filled by public edg_wll_JobStat() */
-       if (intstat->pub.owner == NULL) {
-               md5_jobid = edg_wlc_JobIdGetUnique(job);
-               if ( !(intstat->pub.owner = job_owner(ctx,md5_jobid)) ) {
-                       free(md5_jobid);
-                       free(string_jobid);
-                       return edg_wll_Error(ctx,NULL,NULL);
-               }
-               free(md5_jobid);
-       }
-       
-        jqr[0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-        jqr[0].op = EDG_WLL_QUERY_OP_EQUAL;
-        jqr[0].value.j = job;
-        jqr[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-       jqra = (edg_wll_QueryRec **) malloc (2 * sizeof(edg_wll_QueryRec **));
-       jqra[0] = jqr;
-       jqra[1] = NULL;
-
-       if (edg_wll_QueryEventsServer(ctx,1, (const edg_wll_QueryRec **)jqra, NULL, &events)) {
-               free(string_jobid);
-               free(jqra);
-                return edg_wll_Error(ctx, NULL, NULL);
-       }
-       free(jqra);
-
-       for (num_events = 0; events[num_events].type != EDG_WLL_EVENT_UNDEF;
-               num_events++);
-
-       if (num_events == 0) {
-               free(string_jobid);
-               return edg_wll_SetError(ctx,ENOENT,NULL);
-       }
-
-       edg_wll_SortEvents(events);
-
-       for (i = 0; i < num_events; i++) {
-               res = processEvent(intstat, &events[i], i, be_strict, &errstring);
-               if (res == RET_FATAL || res == RET_INTERNAL) { /* !strict */
-                       intErr = 1; break;
-               }
-       }
-       if (intstat->pub.state == EDG_WLL_JOB_UNDEF) {
-               intstat->pub.state = EDG_WLL_JOB_UNKNOWN;
-       }
-
-       free(string_jobid);
-
-       for (i=0; i < num_events ; i++) edg_wll_FreeEvent(&events[i]);
-       free(events);
-
-
-       if (intErr) {
-               destroy_intJobStat(intstat);
-               return edg_wll_SetError(ctx, EDG_WLL_ERROR_SERVER_RESPONSE, NULL);
-       } else {
-               /* XXX intstat->pub.expectUpdate = eval_expect_update(intstat, &intstat->pub.expectFrom); */
-               intErr = edg_wlc_JobIdDup(job, &intstat->pub.jobId);
-               if (!intErr) {
-                       if (update_db) {
-                               int tsq = num_events - 1;
-                               edg_wll_StoreIntState(ctx, intstat, tsq);
-                               /* recheck
-                                * intJobStat *reread;
-                                * edg_wll_LoadIntState(ctx, job, tsq, &reread);
-                                * destroy_intJobStat(reread);
-                               */
-                       }
-               }
-               return edg_wll_SetError(ctx, intErr, NULL);
-       }
-
-}
-
-static int badEvent(intJobStat *js UNUSED_VAR, edg_wll_Event *e, int ev_seq UNUSED_VAR)
-{
-       char *str;
-
-       str = edg_wll_EventToString(e->any.type);
-       fprintf(stderr, "edg_wll_JobStatus:  bad event: type %d (%s)\n",
-               e->any.type, (str == NULL) ? "unknown" : str);
-       free(str);
-       return RET_FATAL;
-}
-
-#define USABLE(res,strict) ((res) == RET_OK || ( (res) == RET_SOON && !strict))
-#define USABLE_DATA(res,strict) ((res) == RET_OK || ( (res) != RET_FATAL && !strict))
-#define LRMS_STATE(state) ((state) == EDG_WLL_JOB_RUNNING || (state) == EDG_WLL_JOB_DONE)
-
-
-static int processEvent(intJobStat *js, edg_wll_Event *e, int ev_seq, int strict, char **errstring)
-{
-
-       edg_wll_JobStatCode     old_state = js->pub.state;
-       edg_wll_JobStatCode     new_state = EDG_WLL_JOB_UNKNOWN;
-       int             res = RET_OK;
-
-       if (old_state == EDG_WLL_JOB_ABORTED ||
-               old_state == EDG_WLL_JOB_CANCELLED ||
-               old_state == EDG_WLL_JOB_CLEARED) {
-               res = RET_LATE;
-       }
-
-       if (js->last_seqcode != NULL &&
-               edg_wll_compare_seq(e->any.seqcode, js->last_seqcode) < 0) {
-               res = RET_LATE;
-       }
-
-       switch (e->any.type) {
-               case EDG_WLL_EVENT_TRANSFER:
-                       if (e->transfer.result == EDG_WLL_TRANSFER_OK) {
-                               switch (e->transfer.source) {
-                                       case EDG_WLL_SOURCE_USER_INTERFACE:
-                                               new_state = EDG_WLL_JOB_WAITING; break;
-                                       case EDG_WLL_SOURCE_JOB_SUBMISSION:
-                                               /* if (LRMS_STATE(old_state)) res = RET_LATE; */
-                                               new_state = EDG_WLL_JOB_READY; break;
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               if (LRMS_STATE(old_state)) {
-                                                       js->pub.stateEnterTimes[1 + EDG_WLL_JOB_SCHEDULED] =
-                                                               e->any.timestamp.tv_sec;
-                                                       res = RET_LATE;
-                                               }
-                                               new_state = EDG_WLL_JOB_SCHEDULED; break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       } else if (e->transfer.result == EDG_WLL_TRANSFER_FAIL) {
-                               /* transfer failed */ 
-                               switch (e->transfer.source) {
-                                       case EDG_WLL_SOURCE_USER_INTERFACE:
-                                               new_state = EDG_WLL_JOB_SUBMITTED; break;
-                                       case EDG_WLL_SOURCE_JOB_SUBMISSION:
-                                               if (LRMS_STATE(old_state)) res = RET_LATE;
-                                               new_state = EDG_WLL_JOB_READY; break;
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               if (LRMS_STATE(old_state)) res = RET_LATE;
-                                               new_state = EDG_WLL_JOB_READY; break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       } else {
-                               /* e->transfer.result == EDG_WLL_TRANSFER_START */
-                               res = RET_IGNORE;
-                       }
-                       if (USABLE(res, strict)) {
-                               js->pub.state = new_state;
-                               rep(js->pub.reason, e->transfer.reason);
-
-                               free(js->pub.location);
-                               if (e->transfer.result == EDG_WLL_TRANSFER_OK) {
-                                       js->pub.location = location_string(
-                                               edg_wll_SourceToString(e->transfer.destination),
-                                               e->transfer.dest_host,
-                                               e->transfer.dest_instance);
-                               } else {
-                                       js->pub.location = location_string(
-                                               edg_wll_SourceToString(e->transfer.source),
-                                               e->transfer.host,
-                                               e->transfer.src_instance);
-                               }
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               switch (e->transfer.source) {
-                                       case EDG_WLL_SOURCE_USER_INTERFACE:
-                                               rep(js->pub.jdl, e->transfer.job); break;
-                                       case EDG_WLL_SOURCE_JOB_SUBMISSION:
-                                               rep(js->pub.condor_jdl, e->transfer.job); break;
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               rep(js->pub.rsl, e->transfer.job); break;
-                                       default:
-                                               goto bad_event; break;
-                                               
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_ACCEPTED:
-                       switch (e->accepted.source) {
-                               case EDG_WLL_SOURCE_NETWORK_SERVER:
-                                       new_state = EDG_WLL_JOB_WAITING; break;
-                               case EDG_WLL_SOURCE_LOG_MONITOR:
-                                       if (LRMS_STATE(old_state)) res = RET_LATE;
-                                       new_state = EDG_WLL_JOB_READY; break;
-                               case EDG_WLL_SOURCE_LRMS:
-                                       new_state = EDG_WLL_JOB_SCHEDULED; break;
-                               default:
-                                       goto bad_event; break;
-                       }
-                       if (USABLE(res, strict)) {
-                               js->pub.state = new_state;
-                               free(js->pub.location);
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(e->accepted.source),
-                                               e->accepted.host,
-                                               e->accepted.src_instance);
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               switch (e->accepted.source) {
-                                       case EDG_WLL_SOURCE_NETWORK_SERVER:
-                                               break; /* no WM id */
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               rep(js->pub.condorId, e->accepted.local_jobid); break;
-                                       case EDG_WLL_SOURCE_LRMS:
-                                               /* XXX localId */
-                                               rep(js->pub.globusId, e->accepted.local_jobid); break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_REFUSED:
-                       switch (e->refused.source) {
-                               case EDG_WLL_SOURCE_NETWORK_SERVER:
-                                       new_state = EDG_WLL_JOB_SUBMITTED; break;
-                               case EDG_WLL_SOURCE_LOG_MONITOR:
-                                       new_state = EDG_WLL_JOB_READY; break;
-                               case EDG_WLL_SOURCE_LRMS:
-                                       new_state = EDG_WLL_JOB_READY; break;
-                               default:
-                                       goto bad_event; break;
-                       }
-                       if (USABLE(res, strict)) {
-                               js->pub.state = new_state;
-                               rep(js->pub.reason, e->refused.reason);
-
-                               free(js->pub.location);
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(e->refused.from),
-                                               e->refused.from_host,
-                                               e->refused.from_instance);
-                       }
-                       break;
-               case EDG_WLL_EVENT_ENQUEUED:
-                       if (e->enQueued.result == EDG_WLL_ENQUEUED_OK) {
-                               switch (e->enQueued.source) {
-                                       case EDG_WLL_SOURCE_NETWORK_SERVER:
-                                               new_state = EDG_WLL_JOB_WAITING; break;
-                                       case EDG_WLL_SOURCE_WORKLOAD_MANAGER:
-                                               if (LRMS_STATE(old_state)) res = RET_LATE;
-                                               new_state = EDG_WLL_JOB_READY; break;
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               new_state = EDG_WLL_JOB_WAITING; break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       } else if (e->enQueued.result == EDG_WLL_ENQUEUED_FAIL) {
-                               switch (e->enQueued.source) {
-                                       case EDG_WLL_SOURCE_NETWORK_SERVER:
-                                               new_state = EDG_WLL_JOB_WAITING; break;
-                                       case EDG_WLL_SOURCE_WORKLOAD_MANAGER:
-                                               new_state = EDG_WLL_JOB_WAITING; break;
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               new_state = old_state; break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       } else { 
-                               /* e->enQueued.result == EDG_WLL_ENQUEUED_START */
-                               res = RET_IGNORE;
-                       }
-                       if (USABLE(res, strict)) {
-                               js->pub.state = new_state;
-                               rep(js->pub.reason, e->enQueued.reason);
-
-                               free(js->pub.location);
-                               if (e->transfer.result == EDG_WLL_ENQUEUED_OK) {
-                                       js->pub.location = location_string(
-                                               e->enQueued.queue,
-                                               e->enQueued.host,
-                                               e->enQueued.src_instance);
-                                       if (e->enQueued.source == EDG_WLL_SOURCE_LOG_MONITOR)
-                                               js->pub.resubmitted = 1;
-                               } else {
-                                       js->pub.location = location_string(
-                                               edg_wll_SourceToString(e->enQueued.source),
-                                               e->enQueued.host,
-                                               e->enQueued.src_instance);
-                               }
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               switch (e->enQueued.source) {
-                                       case EDG_WLL_SOURCE_NETWORK_SERVER:
-                                               rep(js->pub.jdl, e->enQueued.job); break;
-                                       case EDG_WLL_SOURCE_WORKLOAD_MANAGER:
-                                               rep(js->pub.matched_jdl,  e->enQueued.job); break;
-                                       case EDG_WLL_SOURCE_LOG_MONITOR:
-                                               /* no interim JDL here */
-                                               break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_DEQUEUED:
-                       switch (e->deQueued.source) {
-                               case EDG_WLL_SOURCE_WORKLOAD_MANAGER:
-                                       new_state = EDG_WLL_JOB_WAITING; break;
-                               case EDG_WLL_SOURCE_JOB_SUBMISSION:
-                                       if (LRMS_STATE(old_state)) res = RET_LATE;
-                                       new_state = EDG_WLL_JOB_READY; break;
-                               default:
-                                       goto bad_event; break;
-                       }
-                       if (USABLE(res, strict)) {
-                               js->pub.state = new_state;
-                               free(js->pub.location);
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(e->deQueued.source),
-                                               e->deQueued.host,
-                                               e->deQueued.src_instance);
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               /* no WM/JSS local jobid */
-                       }
-                       break;
-               case EDG_WLL_EVENT_HELPERCALL:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_WAITING;
-                               free(js->pub.location);
-                               js->pub.location = location_string(
-                                               e->helperCall.helper_name,
-                                               e->helperCall.host,
-                                               e->helperCall.src_instance);
-                               /* roles and params used only for debugging */
-                       }
-                       break;
-               case EDG_WLL_EVENT_HELPERRETURN:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_WAITING;
-                               free(js->pub.location);
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(EDG_WLL_SOURCE_WORKLOAD_MANAGER),
-                                               e->helperReturn.host,
-                                               e->helperReturn.src_instance);
-                               /* roles and retvals used only for debugging */
-                       }
-                       break;
-               case EDG_WLL_EVENT_RUNNING:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_RUNNING;
-                               free(js->pub.location);
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(EDG_WLL_SOURCE_LRMS),
-                                               "worknode",
-                                               e->running.node);
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               rep(js->pub.ce_node, e->running.node);
-                       }
-                       break;
-               case EDG_WLL_EVENT_RESUBMISSION:
-                       if (USABLE(res, strict)) {
-                               if (e->resubmission.result == EDG_WLL_RESUBMISSION_WONTRESUB) {
-                                       rep(js->pub.reason, e->resubmission.reason);
-                               }
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               if (e->resubmission.result == EDG_WLL_RESUBMISSION_WONTRESUB) {
-                                       js->wontresub = 1;
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_DONE:
-                       if (e->any.source == EDG_WLL_SOURCE_LRMS) {
-                               /* Done from JobWrapper is not sufficient for transition
-                                * to DONE state according its current definition */
-                               break;
-                       }
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_DONE;
-                               rep(js->pub.reason, e->done.reason);
-                               switch (e->done.status_code) {
-                                       case EDG_WLL_DONE_CANCELLED:
-                                               js->pub.state = EDG_WLL_JOB_CANCELLED;
-                                       case EDG_WLL_DONE_OK:
-                                               rep(js->pub.location, "none"); break;
-                                       default:
-                                               free(js->pub.location);
-                                               js->pub.location = location_string(
-                                                       edg_wll_SourceToString(e->done.source),
-                                                       e->done.host,
-                                                       e->done.src_instance);
-                               }
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               switch (e->done.status_code) {
-                                       case EDG_WLL_DONE_OK:
-                                               js->pub.exit_code = e->done.exit_code;
-                                               js->pub.done_code = EDG_WLL_STAT_OK; break;
-                                       case EDG_WLL_DONE_CANCELLED:
-                                               js->pub.exit_code = 0;
-                                               js->pub.done_code = EDG_WLL_STAT_CANCELLED; break;
-                                       case EDG_WLL_DONE_FAILED:
-                                               js->pub.exit_code = 0;
-                                               js->pub.done_code = EDG_WLL_STAT_FAILED; break;
-                                       default:
-                                               goto bad_event; break;
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_CANCEL:
-                       if (js->last_cancel_seqcode != NULL &&
-                               edg_wll_compare_seq(e->any.seqcode, js->last_cancel_seqcode) < 0) {
-                               res = RET_LATE;
-                       } 
-                       if (USABLE(res, strict)) {
-                               switch (e->cancel.status_code) {
-                                       case EDG_WLL_CANCEL_REQ:
-                                               js->pub.cancelling = 1; break;
-                                       case EDG_WLL_CANCEL_DONE:
-                                               js->pub.state = EDG_WLL_JOB_CANCELLED;
-                                               rep(js->pub.reason, e->cancel.reason);
-                                               rep(js->last_seqcode, e->any.seqcode);
-                                               rep(js->pub.location, "none");
-                                               /* fall though */
-                                       case EDG_WLL_CANCEL_ABORT:
-                                               js->pub.cancelling = 0; break;
-                                       default:
-                                               /* do nothing */
-                                               break;
-
-                               }
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               rep(js->pub.cancelReason, e->cancel.reason);
-                       }
-                       break;
-               case EDG_WLL_EVENT_ABORT:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_ABORTED;
-                               rep(js->pub.reason, e->abort.reason);
-                               rep(js->pub.location, "none");
-                       }
-                       break;
-
-               case EDG_WLL_EVENT_CLEAR:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_CLEARED;
-                               rep(js->pub.location, "none");
-                               switch (e->clear.reason) {
-                                       case EDG_WLL_CLEAR_USER:
-                                               rep(js->pub.reason, "user retrieved output sandbox");
-                                               break;
-                                       case EDG_WLL_CLEAR_TIMEOUT:
-                                               rep(js->pub.reason, "timed out, resource purge forced");
-                                               break;
-                                       case EDG_WLL_CLEAR_NOOUTPUT:
-                                               rep(js->pub.reason, "no output was generated");
-                                               break;
-                                       default:
-                                               goto bad_event; break;
-
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_PURGE:
-                       /* ignore, meta-information only */
-                       break;
-               case EDG_WLL_EVENT_MATCH:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_WAITING;
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(EDG_WLL_SOURCE_WORKLOAD_MANAGER),
-                                               e->match.host,
-                                               e->match.src_instance);
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               rep(js->pub.destination, e->match.dest_id);
-                       }
-                       break;
-               case EDG_WLL_EVENT_PENDING:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_WAITING;
-                               rep(js->pub.reason, e->pending.reason);
-                               js->pub.location = location_string(
-                                               edg_wll_SourceToString(EDG_WLL_SOURCE_WORKLOAD_MANAGER),
-                                               e->match.host,
-                                               e->match.src_instance);
-                       }
-                       break;
-               case EDG_WLL_EVENT_REGJOB:
-                       if (USABLE(res, strict)) {
-                               js->pub.state = EDG_WLL_JOB_SUBMITTED;
-                       }
-                       if (USABLE_DATA(res, strict)) {
-                               rep(js->pub.jdl, e->regJob.jdl);
-                               edg_wlc_JobIdFree(js->pub.parent_job);
-                               edg_wlc_JobIdDup(e->regJob.parent,
-                                                       &js->pub.parent_job);
-                               rep(js->pub.network_server, e->regJob.ns);
-                               js->pub.children_num = e->regJob.nsubjobs;
-                               if (e->regJob.jobtype == EDG_WLL_REGJOB_DAG
-                                       || e->regJob.jobtype == EDG_WLL_REGJOB_PARTITIONED) {
-                                       js->pub.jobtype = EDG_WLL_STAT_DAG;
-                               }
-                               rep(js->pub.seed, e->regJob.seed);
-                       }
-                       break;
-               case EDG_WLL_EVENT_USERTAG:
-                       if (USABLE_DATA(res, strict)) {
-                               if (e->userTag.name != NULL && e->userTag.value != NULL) {
-                                       add_taglist(&js->pub.user_tags, 
-                                                   e->userTag.name, e->userTag.value);
-                               } else {
-                                       goto bad_event;
-                               }
-                       }
-                       break;
-               case EDG_WLL_EVENT_LISTENER:
-                       /* ignore, listener port is not part of job status */
-                       break;
-               case EDG_WLL_EVENT_CURDESCR:
-               case EDG_WLL_EVENT_CHKPT:
-               case EDG_WLL_EVENT_CHANGEACL:
-                       /* ignore, only for event log */
-                       break;
-               
-               default:
-                       goto bad_event;
-                       break;
-       }
-
-       if (USABLE(res,strict)) {
-               js->pub.lastUpdateTime = e->any.timestamp;
-               if (old_state != js->pub.state) {
-                       js->pub.stateEnterTime = js->pub.lastUpdateTime;
-                       js->pub.stateEnterTimes[1 + js->pub.state]
-                               = (int)js->pub.lastUpdateTime.tv_sec;
-               }
-       }
-
-       if (USABLE_DATA(res,strict)) {
-               if (e->any.source == EDG_WLL_SOURCE_NETWORK_SERVER &&
-                       js->pub.network_server == NULL) {
-                       char *inst;
-                       inst = e->any.src_instance;
-                       asprintf(&js->pub.network_server, "%s%s%s",
-                               e->any.host,
-                               inst != NULL ? ":" : " ",
-                               inst != NULL ? inst : "");
-               }
-       }
-       
-       if (e->any.type == EDG_WLL_EVENT_CANCEL) {
-               rep(js->last_cancel_seqcode, e->any.seqcode);
-       } else {
-               rep(js->last_seqcode, e->any.seqcode);
-       }
-
-       return res;
-
-bad_event:
-       badEvent(js,e,ev_seq);
-       return RET_SUSPECT;
-}
-
-/*
- * Helper for warning printouts
- */
-
-static void warn(const char* format, ...)
-{
-       va_list l;
-       va_start(l, format);
-
-       /*
-       fprintf(stderr, "Warning: ");
-       vfprintf(stderr, format, l);
-       fputc('\n', stderr);
-       */
-
-       va_end(l);
-}
-
-static char *job_owner(edg_wll_Context ctx,char *md5_jobid)
-{
-       char    *stmt = NULL,*out = NULL;
-       edg_wll_Stmt    sh;
-       int     f = -1;
-       
-       edg_wll_ResetError(ctx);
-       trio_asprintf(&stmt,"select cert_subj from users,jobs "
-               "where users.userid = jobs.userid "
-               "and jobs.jobid = '%|Ss'",md5_jobid);
-
-       if (stmt==NULL) {
-               edg_wll_SetError(ctx,ENOMEM, NULL);
-               return NULL;
-       }
-       if (edg_wll_ExecStmt(ctx,stmt,&sh) >= 0) {
-               f=edg_wll_FetchRow(sh,&out);
-               if (f == 0) {
-                       if (out) free(out);
-                       out = NULL;
-                       edg_wll_SetError(ctx,ENOENT,md5_jobid);
-               }
-       }
-       edg_wll_FreeStmt(&sh);
-       free(stmt);
-
-       return out;
-}
-
-
-#if 0
-/* XXX went_through went out */
-static int eval_expect_update(intJobStat *js, int* went_through, char **expect_from)
-{
-       int em = 0;
-       int ft = 0; /* fall through following tests */
-
-       if (ft || (went_through[ EDG_WLL_JOB_OUTPUTREADY ] && !js->done_failed)) ft = 1;
-       if (ft || (went_through[ EDG_WLL_JOB_DONE ] && !js->done_failed)) ft = 1;
-       if (ft || went_through[ EDG_WLL_JOB_CHECKPOINTED ]) ft = 1;
-       if (ft || went_through[ EDG_WLL_JOB_RUNNING ]) {
-               if (js->pub.node == NULL) em |= EXPECT_MASK_JOBMGR;
-               ft = 1;
-       }
-       if (ft || went_through[ EDG_WLL_JOB_SCHEDULED ]) {
-                       if (js->pub.jssId == NULL) em |= EXPECT_MASK_JSS;
-                       if (js->pub.rsl == NULL) em |= EXPECT_MASK_JSS;
-                       if (js->pub.globusId == NULL) em |= EXPECT_MASK_JOBMGR;
-                       if (js->pub.localId == NULL) em |= EXPECT_MASK_JOBMGR;
-                       if (js->pub.jss_jdl == NULL) em |= EXPECT_MASK_RB;
-                       ft = 1;
-       }
-       if (ft || went_through[ EDG_WLL_JOB_READY ]) {
-               if (js->pub.destination == NULL) em |= EXPECT_MASK_RB;
-               ft = 1;
-       }
-       if (ft || went_through[ EDG_WLL_JOB_SUBMITTED ]) {
-               if (js->pub.jdl == NULL) em |= EXPECT_MASK_UI;
-               ft = 1;
-       }
-       
-       if (em == 0) 
-               *expect_from = NULL;
-       else {
-               asprintf(expect_from, "%s%s%s%s%s%s%s",
-                       (em & EXPECT_MASK_UI ) ? EDG_WLL_SOURCE_UI : "",
-                       (em & EXPECT_MASK_UI ) ? " " : "",
-                       (em & EXPECT_MASK_RB ) ? EDG_WLL_SOURCE_RB : "",
-                       (em & EXPECT_MASK_RB ) ? " " : "",
-                       (em & EXPECT_MASK_JSS ) ? EDG_WLL_SOURCE_JSS : "",
-                       (em & EXPECT_MASK_JSS ) ? " " : "",
-                       (em & EXPECT_MASK_JOBMGR ) ? EDG_WLL_SOURCE_JOBMGR : ""
-                       );
-       }
-
-       return (em == 0) ? 0 : 1;
-}
-#endif
-
-static char* location_string(const char *source, const char *host, const char *instance)
-{
-       char *ret;
-       asprintf(&ret, "%s/%s/%s", source, host, instance);
-       return ret;
-}
-
-static int add_stringlist(char ***lptr, const char *new_item)
-{
-       char **itptr;
-       int             i;
-
-       if (*lptr == NULL) {
-               itptr = (char **) malloc(2*sizeof(char *));
-               itptr[0] = strdup(new_item);
-               itptr[1] = NULL;
-               *lptr = itptr;
-               return 1;
-       } else {
-               for (i = 0, itptr = *lptr; itptr[i] != NULL; i++);
-               itptr = (char **) realloc(*lptr, (i+2)*sizeof(char *));
-               if (itptr != NULL) {
-                       itptr[i] = strdup(new_item);
-                       itptr[i+1] = NULL;
-                       *lptr = itptr;
-                       return 1;
-               } else {
-                       return 0;
-               }
-       }
-}
-
-static int add_taglist(edg_wll_TagValue **lptr, const char *new_item, const char *new_item2)
-{
-       edg_wll_TagValue        *itptr;
-       int                     i;
-
-       if (*lptr == NULL) {
-               itptr = (edg_wll_TagValue *) calloc(2,sizeof(edg_wll_TagValue));
-               itptr[0].tag = strdup(new_item);
-               itptr[0].value = strdup(new_item2);
-               *lptr = itptr;
-               return 1;
-       } else {
-               for (i = 0, itptr = *lptr; itptr[i].tag != NULL; i++)
-                       if ( !strcasecmp(itptr[i].tag, new_item) )
-                       {
-                               free(itptr[i].value);
-                               itptr[i].value = strdup(new_item2);
-                               return 1;
-                       }
-               itptr = (edg_wll_TagValue *) realloc(*lptr, (i+2)*sizeof(edg_wll_TagValue));
-               if (itptr != NULL) {
-                       itptr[i].tag = strdup(new_item);
-                       itptr[i].value = strdup(new_item2);
-                       itptr[i+1].tag = NULL;
-                       itptr[i+1].value = NULL;
-                       *lptr = itptr;
-                       return 1;
-               } else {
-                       return 0;
-               }
-       }
-}
-
-/* XXX more thorough malloc, calloc, and asprintf failure handling */
-/* XXX indexes in {short,long}_fields */
-/* XXX strict mode */
-/* XXX caching */
-
-/*
- * Store current job state to states and status_tags DB tables.
- * Should be called with the job locked.
- */
-
-edg_wll_ErrorCode edg_wll_StoreIntState(edg_wll_Context ctx,
-                                    intJobStat *stat,
-                                    int seq)
-{
-       char *jobid_md5, *stat_enc, *parent_md5 = NULL;
-       char *stmt;
-       edg_wll_TagValue *tagp;
-       int update;
-       int dbret;
-       char *icnames, *icvalues;
-
-       update = (seq > 0);
-       jobid_md5 = edg_wlc_JobIdGetUnique(stat->pub.jobId);
-       stat_enc = enc_intJobStat(strdup(""), stat);
-
-       tagp = stat->pub.user_tags;
-       if (tagp) {
-               while ((*tagp).tag != NULL) {
-                       trio_asprintf(&stmt, "insert into status_tags"
-                                       "(jobid,seq,name,value) values "
-                                       "('%|Ss',%d,'%|Ss','%|Ss')",
-                                       jobid_md5, seq, (*tagp).tag, (*tagp).value);
-                       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) {
-                               if (EEXIST == edg_wll_Error(ctx, NULL, NULL)) {
-                               /* XXX: this should not happen */
-                                       edg_wll_ResetError(ctx);
-                                       tagp++;
-                                       continue;
-                               }
-                               else
-                                       goto cleanup;
-                       }
-                       tagp++;
-               }
-       }
-
-       parent_md5 = edg_wlc_JobIdGetUnique(stat->pub.parent_job);
-       if (parent_md5 == NULL) parent_md5 = strdup("*no parent job*");
-
-
-       edg_wll_IColumnsSQLPart(ctx, ctx->job_index_cols, stat, 0, NULL, &icvalues);
-
-       trio_asprintf(&stmt,
-               "update states set "
-               "status=%d,seq=%d,int_status='%|Ss',version='%|Ss'"
-                       ",parent_job='%|Ss'%s "
-               "where jobid='%|Ss'",
-               stat->pub.state, seq, stat_enc, INTSTAT_VERSION,
-               parent_md5, icvalues,
-               jobid_md5);
-       free(icvalues);
-
-       if ((dbret = edg_wll_ExecStmt(ctx,stmt,NULL)) < 0) goto cleanup;
-
-       if (dbret == 0) {
-               edg_wll_IColumnsSQLPart(ctx, ctx->job_index_cols, stat, 1, &icnames, &icvalues);
-               trio_asprintf(&stmt,
-                       "insert into states"
-                       "(jobid,status,seq,int_status,version"
-                               ",parent_job%s) "
-                       "values ('%|Ss',%d,%d,'%|Ss','%|Ss','%|Ss'%s)",
-                       icnames,
-                       jobid_md5, stat->pub.state, seq, stat_enc,
-                       INTSTAT_VERSION, parent_md5, icvalues);
-               free(icnames); free(icvalues);
-
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) goto cleanup;
-       }
-
-       if (update) {
-               trio_asprintf(&stmt, "delete from states "
-                       "where jobid ='%|Ss' and ( seq<%d or version !='%|Ss')",
-                       jobid_md5, seq, INTSTAT_VERSION);
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) goto cleanup;
-       }
-       if (update) {
-               trio_asprintf(&stmt, "delete from status_tags "
-                       "where jobid ='%|Ss' and seq<%d", jobid_md5, seq);
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) goto cleanup;
-       }
-
-       if (ctx->rgma_export) write2rgma_status(&stat->pub);
-
-cleanup:
-       free(stmt); 
-       free(jobid_md5); free(stat_enc);
-       free(parent_md5);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-/*
- * Retrieve stored job state from states and status_tags DB tables.
- * Should be called with the job locked.
- */
-
-edg_wll_ErrorCode edg_wll_LoadIntState(edg_wll_Context ctx,
-                                   edg_wlc_JobId jobid,
-                                   int seq,
-                                   intJobStat **stat)
-{
-       char *jobid_md5;
-       char *stmt;
-       edg_wll_Stmt sh;
-       char *res, *res_rest;
-       int nstates;
-
-       edg_wll_ResetError(ctx);
-       jobid_md5 = edg_wlc_JobIdGetUnique(jobid);
-
-       if (seq == -1) {
-               /* any sequence number */
-               trio_asprintf(&stmt,
-                       "select int_status from states "
-                       "where jobid='%|Ss' and version='%|Ss'",
-                       jobid_md5, INTSTAT_VERSION);
-       } else {
-               trio_asprintf(&stmt,
-                       "select int_status from states "
-                       "where jobid='%|Ss' and seq='%d' and version='%|Ss'",
-                       jobid_md5, seq, INTSTAT_VERSION);
-       }
-
-       if (stmt == NULL) {
-               return edg_wll_SetError(ctx, ENOMEM, NULL);
-       }
-
-       if ((nstates = edg_wll_ExecStmt(ctx,stmt,&sh)) < 0) goto cleanup;
-       if (nstates == 0) {
-               edg_wll_SetError(ctx,ENOENT,"no state in DB");
-               goto cleanup;
-       }
-       if (edg_wll_FetchRow(sh,&res) < 0) goto cleanup;
-
-       *stat = dec_intJobStat(res, &res_rest);
-       if (res_rest == NULL) {
-               edg_wll_SetError(ctx, EDG_WLL_ERROR_DB_CALL,
-                               "error decoding DB intJobStatus");
-       }
-
-       free(res);
-cleanup:
-       free(jobid_md5);
-       free(stmt); edg_wll_FreeStmt(&sh);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-/*
- * update stored state according to the new event
- * (must be called with the job locked)
- */
-
-edg_wll_ErrorCode edg_wll_StepIntState(edg_wll_Context ctx,
-                                       edg_wlc_JobId job,
-                                       edg_wll_Event *e,
-                                       int seq,
-                                       edg_wll_JobStat *stat_out)
-{
-       intJobStat      *ijsp;
-       int             intErr = 0;
-       int             flags = 0;
-       int             res;
-       int             be_strict = 0;
-       char            *errstring = NULL;
-       intJobStat      jobstat;
-
-       if (seq != 0) {
-               intErr = edg_wll_LoadIntState(ctx, job, seq - 1, &ijsp);
-       }
-       if (seq != 0 && !intErr) {
-               res = processEvent(ijsp, e, seq, be_strict, &errstring);
-               if (res == RET_FATAL || res == RET_INTERNAL) { /* !strict */
-                       return edg_wll_SetError(ctx, EINVAL, errstring);
-               }
-               edg_wll_StoreIntState(ctx, ijsp, seq);
-               if (stat_out) {
-                       memcpy(stat_out,&ijsp->pub,sizeof *stat_out);
-                       destroy_intJobStat_extension(ijsp);
-               }
-               else destroy_intJobStat(ijsp);
-               free(ijsp);
-       } else {
-               edg_wll_intJobStatus(ctx, job, flags,&jobstat, js_enable_store);
-               if (stat_out) {
-                       memcpy(stat_out,&jobstat.pub,sizeof *stat_out);
-                       destroy_intJobStat_extension(&jobstat);
-               }
-               else destroy_intJobStat(&jobstat);
-       }
-       return edg_wll_Error(ctx, NULL, NULL);
-}
diff --git a/org.glite.lb.server/src/jobstat.h b/org.glite.lb.server/src/jobstat.h

deleted file mode 100644 (file)

index 1b17c7b..0000000
--- a/org.glite.lb.server/src/jobstat.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* $Header$ */
-
-/*
- * Internal representation of job state
- * (includes edg_wll_JobStat API structure)
- */
-
-#define INTSTAT_VERSION "release-2.0"
-
-
-typedef struct _intJobStat {
-               edg_wll_JobStat pub;
-               int             wontresub;
-               char            *last_seqcode;
-               char            *last_cancel_seqcode;
-
-/*             int             expect_mask; */
-       } intJobStat;
-
-void destroy_intJobStat(intJobStat *);
-
-edg_wll_ErrorCode edg_wll_IColumnsSQLPart(edg_wll_Context, void *, intJobStat *, int , char **, char **);
-edg_wll_ErrorCode edg_wll_RefreshIColumns(edg_wll_Context, void *);
-int edg_wll_intJobStatus( edg_wll_Context, const edg_wlc_JobId, int, intJobStat *, int);
-
-intJobStat* dec_intJobStat(char *, char **);
-char *enc_intJobStat(char *, intJobStat* );
-
-void write2rgma_status(edg_wll_JobStat *);
-
diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c

deleted file mode 100644 (file)

index dcbe4f1..0000000
--- a/org.glite.lb.server/src/jobstat_supp.c
+++ /dev/null
@@ -1,669 +0,0 @@
-#ident "$Header$"
-
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <regex.h>
-#include <syslog.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-
-#include "store.h"
-#include "index.h"
-#include "jobstat.h"
-#include "lbs_db.h"
-#include "get_events.h"
-
-
-extern int debug;
-#ifndef dprintf
-#define dprintf(x) { if (debug) printf x; }
-#endif
-
-
-/* TBD: share in whole logging or workload */
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-
-static char* enc_strlist(char *, char **) UNUSED_VAR;
-static char **dec_strlist(char *, char **) UNUSED_VAR;
-
-/*
- * string encoding routines for safe DB store
- */
-
-static char *enc_string(char *old, char *item)
-{
-       char *out;
-       if (item == NULL) {
-               asprintf(&out,"%s-1 ", old);
-       } else {
-               asprintf(&out,"%s%d %s",old, strlen(item), item);
-       }
-       free(old);
-       return out;
-}
-
-static char *dec_string(char *in, char **rest)
-{
-       int scret;
-       int len = -1;
-       char *out;
-       
-       scret = sscanf(in, "%d", &len);
-       if (scret < 1) {
-               *rest = NULL;
-               return NULL;
-       }
-       if (len == -1) {
-               out = NULL;
-               *rest = strchr(in, ' ') ? strchr(in, ' ') + 1 : NULL;
-       } else {
-               in = strchr(in, ' ') ? strchr(in, ' ') + 1 : NULL;
-               out = (char *)malloc(len+1);
-               if (out) {
-                       memcpy(out, in, len);
-                       *(out+len) = '\0';
-               }
-               *rest = in+len;
-       }
-       return out;
-}
-
-static char *enc_int(char *old, int item)
-{
-        char *out;
-        asprintf(&out,"%s%d ", old, item);
-       free(old);
-        return out;
-}
-
-static int dec_int(char* in, char **rest)
-{
-       int scret;
-       int out;
-
-       scret = sscanf(in, "%d", &out);
-       if (scret == 1) {
-               *rest = strchr(in, ' ') ? strchr(in, ' ') + 1 : NULL;
-       } else {
-               out = 0;
-               *rest = in;
-       }
-       return out;
-}
-
-static char* enc_jobid(char *old, edg_wlc_JobId item)
-{
-       char *str;
-       char *out;
-
-       str = edg_wlc_JobIdUnparse(item);
-       out = enc_string(old, str);
-       free(str);
-       return out;
-}
-static edg_wlc_JobId dec_jobid(char *in, char **rest)
-{
-       char *str;
-       edg_wlc_JobId jobid;
-       
-       str = dec_string(in, rest);
-       if (str == NULL) return NULL;
-       edg_wlc_JobIdParse(str, &jobid);
-       free(str);
-       return jobid;
-}
-
-static char* enc_strlist(char *old, char **item)
-{
-       char *ret;
-
-       if (item == NULL) {
-               asprintf(&ret,"%s-1 ", old);
-               free(old);
-               return ret;
-       } else {
-               asprintf(&ret,"%s1 ",old);
-               free(old);
-               if (ret == NULL) return ret;
-       }
-       do {
-               ret = enc_string(ret, *item);
-       } while (*(item++) != NULL);
-       return ret;
-}
-
-static char **dec_strlist(char *in, char **rest)
-{
-       char **out;
-       int len = -1;
-       char *tmp_in, *tmp_ret;
-       int scret;
-
-       scret = sscanf(in, "%d", &len);
-       if (scret < 1) {
-               *rest = NULL;
-               return NULL;
-       }
-       if (len == -1) {
-               *rest = strchr(in, ' ') ? strchr(in, ' ') + 1 : NULL;
-               return NULL;
-       }
-
-       len = 0;
-       tmp_in = in = strchr(in, ' ') + 1 ;
-       do {
-               tmp_ret = dec_string(tmp_in, &tmp_in);
-               len++;
-       }  while (tmp_ret != NULL);
-
-       out = (char**) malloc(len*sizeof(char*));
-
-       if (out) {
-               len = 0;
-               tmp_in = in;
-               do {
-                       out[len] = dec_string(tmp_in, &tmp_in);
-               } while  (out[len++] != NULL);
-       }
-       *rest = tmp_in;
-       return out;
-}
-
-static char* enc_taglist(char *old, edg_wll_TagValue *item)
-{
-       char *ret;
-
-       if (item == NULL) {
-               asprintf(&ret,"%s-1 ", old);
-               free(old);
-               return ret;
-       } else {
-               asprintf(&ret,"%s1 ",old);
-               free(old);
-               if (ret == NULL) return ret;
-       }
-       do {
-               ret = enc_string(ret, (*item).tag);
-               ret = enc_string(ret, (*item).value);
-       } while ((*(item++)).tag != NULL);
-       return ret;
-}
-
-static edg_wll_TagValue *dec_taglist(char *in, char **rest)
-{
-       edg_wll_TagValue *out;
-       int len = -1;
-       char *tmp_in, *tmp_ret, *tmp_ret2;
-       int scret;
-
-       scret = sscanf(in, "%d", &len);
-       if (scret < 1) {
-               *rest = NULL;
-               return NULL;
-       }
-       if (len == -1) {
-               *rest = strchr(in, ' ') ? strchr(in, ' ') + 1 : NULL;
-               return NULL;
-       }
-
-       len = 0;
-       tmp_in = in = strchr(in, ' ') + 1 ;
-       do {
-               tmp_ret2 = dec_string(tmp_in, &tmp_in);
-               if (!tmp_in) { *rest = tmp_in; return NULL; }
-               tmp_ret = dec_string(tmp_in, &tmp_in);
-               if (!tmp_in) { *rest = tmp_in; return NULL; }
-               len++;
-       }  while (tmp_ret2 != NULL);
-
-       out = (edg_wll_TagValue *) malloc(len*sizeof(edg_wll_TagValue));
-
-       if (out) {
-               len = 0;
-               tmp_in = in;
-
-               do {
-                       out[len].tag = dec_string(tmp_in, &tmp_in);
-                       out[len].value = dec_string(tmp_in, &tmp_in);
-               } while  (out[len++].tag != NULL);
-               *rest = tmp_in;
-       }
-       else 
-               *rest = 0;
-
-       return out;
-}
-
-static char *enc_intlist(char *old, int *item)
-{
-       int len;
-       char *ret;
-
-       if (item == NULL) {
-               asprintf(&ret,"%s-1 ", old);
-               free(old);
-               return ret;
-       } else {
-               asprintf(&ret,"%s1 ",old);
-               free(old);
-               if (ret == NULL) return ret;
-       }
-       len = *item; item++;
-       ret = enc_int(ret, len);
-       for (; len > 0 ; len--, item++) {
-               ret = enc_int(ret, *item);
-       }
-
-       return ret;
-}
-
-static int *dec_intlist(char *in, char **rest)
-{
-       int len = -1;
-       int *out, *ptr;
-       char *tmp_in;
-       int scret;
-
-       scret = sscanf(in, "%d", &len);
-       if (scret < 1) {
-               *rest = NULL;
-               return NULL;
-       }
-       tmp_in = strchr(in, ' ') ? strchr(in, ' ') + 1 : NULL;
-       if (len == -1 || tmp_in == NULL) {
-               *rest = tmp_in;
-               return NULL;
-       }
-
-       len = dec_int(tmp_in, &tmp_in);
-       out = (int *)malloc( (len+1) *sizeof(int));
-       if (out) {
-               *out = len; 
-               ptr = out+1;
-               while (len) {
-                       *ptr = dec_int(tmp_in, &tmp_in);
-                       len--; ptr++;
-               }
-       }
-       *rest = tmp_in;
-       return out;
-}
-
-static char* enc_timeval(char *old, struct timeval item)
-{
-       char *ret;
-       
-       ret = enc_int(old, (int)item.tv_sec);
-       if (ret) {
-               ret = enc_int(ret, (int)item.tv_usec);
-       }
-       return ret;
-}
-
-static struct timeval dec_timeval(char *in, char **rest)
-{
-       struct timeval t;
-       char *tmp_in;
-       
-       t.tv_sec = dec_int(in, &tmp_in);
-       if (tmp_in != NULL) t.tv_usec = dec_int(tmp_in, &tmp_in);
-       *rest = tmp_in;
-       return t;
-}
-
-static char *enc_JobStat(char *old, edg_wll_JobStat* stat)
-{
-       char *ret;
-
-       ret = enc_int(old, stat->state);
-       if (ret) ret = enc_jobid(ret, stat->jobId);
-       if (ret) ret = enc_string(ret, stat->owner);
-       if (ret) ret = enc_int(ret, stat->jobtype);
-       if (ret) ret = enc_jobid(ret, stat->parent_job);
-       if (ret) ret = enc_string(ret, stat->seed);
-       if (ret) ret = enc_int(ret, stat->children_num);
-               /* children data are not stored in DB */
-       if (ret) ret = enc_string(ret, stat->condorId);
-       if (ret) ret = enc_string(ret, stat->globusId);
-       if (ret) ret = enc_string(ret, stat->localId);
-       if (ret) ret = enc_string(ret, stat->jdl);
-       if (ret) ret = enc_string(ret, stat->matched_jdl);
-       if (ret) ret = enc_string(ret, stat->destination);
-       if (ret) ret = enc_string(ret, stat->condor_jdl);
-       if (ret) ret = enc_string(ret, stat->rsl);
-       if (ret) ret = enc_string(ret, stat->reason);
-       if (ret) ret = enc_string(ret, stat->location);
-       if (ret) ret = enc_string(ret, stat->ce_node);
-       if (ret) ret = enc_string(ret, stat->network_server);
-       if (ret) ret = enc_int(ret, stat->subjob_failed);
-       if (ret) ret = enc_int(ret, stat->done_code);
-       if (ret) ret = enc_int(ret, stat->exit_code);
-       if (ret) ret = enc_int(ret, stat->resubmitted);
-       if (ret) ret = enc_int(ret, stat->cancelling);
-       if (ret) ret = enc_string(ret, stat->cancelReason);
-       if (ret) ret = enc_int(ret, stat->cpuTime);
-       if (ret) ret = enc_taglist(ret, stat->user_tags);
-       if (ret) ret = enc_timeval(ret, stat->stateEnterTime);
-       if (ret) ret = enc_intlist(ret, stat->stateEnterTimes);
-       if (ret) ret = enc_timeval(ret, stat->lastUpdateTime);
-       if (ret) ret = enc_int(ret, stat->expectUpdate);
-       if (ret) ret = enc_string(ret, stat->expectFrom);
-
-       return ret;
-}
-static edg_wll_JobStat* dec_JobStat(char *in, char **rest)
-{
-       char *tmp_in;
-       edg_wll_JobStat *stat;
-
-       stat = (edg_wll_JobStat *) calloc(1,sizeof(edg_wll_JobStat));
-       if (!stat) return stat;
-
-       tmp_in = in;
-        stat->state = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->jobId = dec_jobid(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->owner = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->jobtype = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->parent_job = dec_jobid(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->seed = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->children_num = dec_int(tmp_in, &tmp_in);
-                /* children data are not stored in DB */
-        if (tmp_in != NULL) stat->condorId = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->globusId = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->localId = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->jdl = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->matched_jdl = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->destination = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->condor_jdl = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->rsl = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->reason = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->location = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->ce_node = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->network_server = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->subjob_failed = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->done_code = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->exit_code = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->resubmitted = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->cancelling = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->cancelReason = dec_string(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->cpuTime = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->user_tags = dec_taglist(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->stateEnterTime = dec_timeval(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->stateEnterTimes = dec_intlist(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->lastUpdateTime = dec_timeval(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->expectUpdate = dec_int(tmp_in, &tmp_in);
-        if (tmp_in != NULL) stat->expectFrom = dec_string(tmp_in, &tmp_in);
-       
-       *rest = tmp_in;
-       return stat;
-}
-
-char *enc_intJobStat(char *old, intJobStat* stat)
-{
-       char *ret;
-
-       ret = enc_JobStat(old, &stat->pub);
-       if (ret) ret = enc_int(ret, stat->wontresub);
-       if (ret) ret = enc_string(ret, stat->last_seqcode);
-       if (ret) ret = enc_string(ret, stat->last_cancel_seqcode);
-       return ret;
-}
-
-intJobStat* dec_intJobStat(char *in, char **rest)
-{
-       edg_wll_JobStat *pubstat;
-       intJobStat *stat = 0;
-       char *tmp_in;
-
-       pubstat = dec_JobStat(in, &tmp_in);
-       if (tmp_in != NULL) {
-               stat = (intJobStat *)calloc(1,sizeof(intJobStat));
-       } 
-       if (stat != NULL) {
-               stat->pub = *pubstat;
-               free(pubstat);
-               stat->wontresub = dec_int(tmp_in, &tmp_in);
-               if (tmp_in != NULL) {
-                       stat->last_seqcode = dec_string(tmp_in, &tmp_in);
-               }
-               if (tmp_in != NULL) {
-                       stat->last_cancel_seqcode = dec_string(tmp_in, &tmp_in);
-               }
-       } else if (tmp_in != NULL) {
-               edg_wll_FreeStatus(pubstat);
-               free(pubstat);
-       }
-
-       *rest = tmp_in;
-       return stat;
-}
-
-/*
- * Compute part of SQL command used for indexed state table columns
- */
-
-edg_wll_ErrorCode edg_wll_IColumnsSQLPart(edg_wll_Context ctx,
-                                       void *job_index_cols_v,
-                                       intJobStat *stat,
-                                       int is_insert,
-                                       char **names_out,
-                                       char **values_out)
-{
-       int i;
-       char *names, *values;
-       char *data;
-       char *tmp;
-       edg_wll_IColumnRec *job_index_cols = (edg_wll_IColumnRec *)job_index_cols_v;
-
-       edg_wll_ResetError(ctx);
-
-       if (is_insert) names = strdup(""); else names = NULL;
-       values = strdup("");
-
-       if (job_index_cols != NULL)
-       for (i=0; job_index_cols[i].colname; i++) {
-               data = NULL;
-               switch (job_index_cols[i].qrec.attr) {
-                       case EDG_WLL_QUERY_ATTR_OWNER:
-                               if (stat->pub.owner)
-                                       trio_asprintf(&data, "'%|Ss'", stat->pub.owner);
-                               else data = strdup("''");
-                               break;
-                       case EDG_WLL_QUERY_ATTR_LOCATION:
-                               if (stat->pub.location)
-                                       trio_asprintf(&data, "'%|Ss'", stat->pub.location);
-                               else data = strdup("''");
-                               break;
-                       case EDG_WLL_QUERY_ATTR_DESTINATION:
-                               if (stat->pub.destination)
-                                       trio_asprintf(&data, "'%|Ss'", stat->pub.destination);
-                               else data = strdup("''");
-                               break;
-                       case EDG_WLL_QUERY_ATTR_DONECODE:
-                               asprintf(&data, "%d", stat->pub.done_code);
-                               break;
-                       case EDG_WLL_QUERY_ATTR_USERTAG:
-                               if (stat->pub.user_tags) {
-                                       int k;
-                                       for (k=0; stat->pub.user_tags[k].tag &&
-                                                       strcmp(stat->pub.user_tags[k].tag,job_index_cols[i].qrec.attr_id.tag);
-                                               k++);
-                                       if (stat->pub.user_tags[k].tag != NULL) {
-                                               trio_asprintf(&data, "'%|Ss'", stat->pub.user_tags[k].value);
-                                       } else data = strdup("''");
-                               } else data = strdup("''");
-                               break;
-                       case EDG_WLL_QUERY_ATTR_TIME:
-                               if (stat->pub.stateEnterTimes)
-                                       data = strdup(edg_wll_TimeToDB(stat->pub.stateEnterTimes[
-                                                       job_index_cols[i].qrec.attr_id.state+1]));
-                               else data = strdup("0");
-                               break;
-                       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                               asprintf(&data, "%d", stat->pub.resubmitted);
-                               break;
-
-                               /* XXX add more attributes when defined */
-                       default:
-                               /* do not use */
-                               break;
-               }
-
-               if (!data) continue;
-
-               if (is_insert) {
-                       asprintf(&tmp, "%s,`%s`", names, job_index_cols[i].colname);
-                       free(names); names = tmp;
-                       asprintf(&tmp, "%s,%s", values, data);
-                       free(values); values = tmp;
-               } else {
-                       /* update */
-                       asprintf(&tmp, "%s,`%s`=%s", values, job_index_cols[i].colname, data);
-                       free(values); values = tmp;
-               }
-               free(data);
-       }
-
-       if (is_insert) *names_out = names;
-       *values_out = values;
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-/*
- * Set values of index columns in state table (after index reconfiguration)
- */
-
-edg_wll_ErrorCode edg_wll_RefreshIColumns(edg_wll_Context ctx, void *job_index_cols) {
-
-       edg_wll_Stmt sh, sh2;
-       int njobs, ret = -1;
-       intJobStat *stat;
-       edg_wlc_JobId jobid;
-       char *res[5];
-       char *rest;
-       char *icvalues, *stmt;
-       int i;
-
-       edg_wll_ResetError(ctx);
-       if (!job_index_cols) return 0;
-
-       if ((njobs = edg_wll_ExecStmt(ctx, "select s.jobid,s.int_status,s.seq,s.version,j.dg_jobid"
-                                      " from states s, jobs j where s.jobid=j.jobid",&sh)) < 0) {
-               edg_wll_FreeStmt(&sh);
-               return edg_wll_Error(ctx, NULL, NULL);
-       }
-       while ((ret=edg_wll_FetchRow(sh,res)) >0) {
-               if (strcmp(res[3], INTSTAT_VERSION)) {
-                       stat = NULL;
-                       if (!edg_wlc_JobIdParse(res[4], &jobid)) {
-                               if ((stat = malloc(sizeof(intJobStat))) != NULL) {
-                                       if (edg_wll_intJobStatus(ctx, jobid, 0, stat, 1)) {
-                                               free(stat);
-                                               stat = NULL;
-                                       }
-                               }
-                               edg_wlc_JobIdFree(jobid);
-                       }
-               } else {
-                       stat = dec_intJobStat(res[1], &rest);
-                       if (rest == NULL) stat = NULL;
-               }
-               if (stat == NULL) {
-                       edg_wll_FreeStmt(&sh);
-                       return edg_wll_SetError(ctx, EDG_WLL_ERROR_SERVER_RESPONSE,
-                               "cannot decode int_status from states DB table");
-               }
-
-               edg_wll_IColumnsSQLPart(ctx, job_index_cols, stat, 0, NULL, &icvalues);
-               trio_asprintf(&stmt, "update states set seq=%s%s where jobid='%|Ss'", res[2], icvalues, res[0]);
-               ret = edg_wll_ExecStmt(ctx, stmt, &sh2);
-               edg_wll_FreeStmt(&sh2);
-
-               for (i = 0; i < 5; i++) free(res[i]);
-               destroy_intJobStat(stat); free(stat);
-               free(stmt); free(icvalues);
-
-               if (ret < 0) return edg_wll_Error(ctx, NULL, NULL);
-               
-       }
-       edg_wll_FreeStmt(&sh);
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-int edg_wll_compare_seq(const char *a, const char *b)
-{
-       unsigned int    c[EDG_WLL_SOURCE__LAST];
-       unsigned int    d[EDG_WLL_SOURCE__LAST];
-       int             res, i;
-
-       assert(EDG_WLL_SOURCE__LAST == 9);
-
-       res =  sscanf(a, "UI=%d:NS=%d:WM=%d:BH=%d:JSS=%d:LM=%d:LRMS=%d:APP=%d",
-                       &c[EDG_WLL_SOURCE_USER_INTERFACE],
-                       &c[EDG_WLL_SOURCE_NETWORK_SERVER],
-                       &c[EDG_WLL_SOURCE_WORKLOAD_MANAGER],
-                       &c[EDG_WLL_SOURCE_BIG_HELPER],
-                       &c[EDG_WLL_SOURCE_JOB_SUBMISSION],
-                       &c[EDG_WLL_SOURCE_LOG_MONITOR],
-                       &c[EDG_WLL_SOURCE_LRMS],
-                       &c[EDG_WLL_SOURCE_APPLICATION]);
-       if (res != EDG_WLL_SOURCE__LAST-1) {
-               syslog(LOG_ERR, "unparsable sequence code %s\n", a);
-               dprintf(( "unparsable sequence code %s\n", a));
-               return -1;
-       }
-
-       res =  sscanf(b, "UI=%d:NS=%d:WM=%d:BH=%d:JSS=%d:LM=%d:LRMS=%d:APP=%d",
-                       &d[EDG_WLL_SOURCE_USER_INTERFACE],
-                       &d[EDG_WLL_SOURCE_NETWORK_SERVER],
-                       &d[EDG_WLL_SOURCE_WORKLOAD_MANAGER],
-                       &d[EDG_WLL_SOURCE_BIG_HELPER],
-                       &d[EDG_WLL_SOURCE_JOB_SUBMISSION],
-                       &d[EDG_WLL_SOURCE_LOG_MONITOR],
-                       &d[EDG_WLL_SOURCE_LRMS],
-                       &d[EDG_WLL_SOURCE_APPLICATION]);
-       if (res != EDG_WLL_SOURCE__LAST-1) {
-               syslog(LOG_ERR, "unparsable sequence code %s\n", b);
-               dprintf(( "unparsable sequence code %s\n", b));
-               return 1;
-       }
-
-       for (i = EDG_WLL_SOURCE_USER_INTERFACE ; i < EDG_WLL_SOURCE__LAST; i++) {
-               if (c[i] < d[i]) return -1;
-               if (c[i] > d[i]) return  1;
-       }
-
-       return 0;
-}
-
-static int compare_events_by_seq(const void *a, const void *b)
-{
-        const edg_wll_Event *e = (edg_wll_Event *)a;
-        const edg_wll_Event *f = (edg_wll_Event *)b;
-
-       return edg_wll_compare_seq(e->any.seqcode, f->any.seqcode);
-}
-
-void edg_wll_SortEvents(edg_wll_Event *e)
-{
-       int     n;
-
-       if (!e) return;
-       for (n=0; e[n].type; n++);
-       qsort(e,n,sizeof *e,compare_events_by_seq);
-}
diff --git a/org.glite.lb.server/src/lb_authz.c b/org.glite.lb.server/src/lb_authz.c

deleted file mode 100644 (file)

index 3ade941..0000000
--- a/org.glite.lb.server/src/lb_authz.c
+++ /dev/null
@@ -1,882 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <syslog.h>
-
-#ifndef NO_VOMS
-
-#include <openssl/ssl.h>
-#include <libxml/parser.h> 
-#undef WITHOUT_TRIO
-
-#include "glite/security/voms/voms_apic.h"
-#include "glite/wmsutils/jobid/strmd5.h"
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/trio.h"
-#include "lb_authz.h"
-#include "lbs_db.h"
-
-/* XXX should be defined in gridsite-gacl.h */
-GRSTgaclEntry *GACLparseEntry(xmlNodePtr cur);
-
-static int
-add_groups(edg_wll_Context ctx, struct voms *voms_cert, char *vo_name,
-          edg_wll_VomsGroups *groups)
-{
-   struct data **voms_data;
-   edg_wll_VomsGroup *tmp = NULL;
-
-   if (voms_cert->type != TYPE_STD) {
-      edg_wll_SetError(ctx, EINVAL, "not supported VOMS certificate type");
-      return EINVAL;
-   }
-
-   for (voms_data = voms_cert->std; voms_data && *voms_data; voms_data++) {
-      if ((*voms_data)->group && *(*voms_data)->group) {
-        tmp = realloc(groups->val, (groups->len + 1) * sizeof(*groups->val));
-        if (tmp == NULL)
-           return ENOMEM;
-        groups->val = tmp;
-        groups->val[groups->len].vo = strdup(vo_name);
-        groups->val[groups->len].name = strdup((*voms_data)->group);
-        groups->len++;
-      }
-   }
-   return 0;
-}
-
-static int 
-get_groups(edg_wll_Context ctx, struct vomsdata *voms_info,
-          edg_wll_VomsGroups *res_groups)
-{
-   struct voms **voms_cert = NULL;
-   edg_wll_VomsGroups groups;
-   int ret;
-
-   memset(&groups, 0, sizeof(groups));
-
-   for (voms_cert = voms_info->data; voms_cert && *voms_cert; voms_cert++) {
-      if ((*voms_cert)->voname) {
-        ret = add_groups(ctx, *voms_cert, (*voms_cert)->voname, &groups);
-        if (ret) {
-           edg_wll_FreeVomsGroups(&groups);
-           return ret;
-        }
-      }
-   }
-
-   res_groups->len = groups.len;
-   res_groups->val = groups.val;
-   return 0;
-}
-
-static int
-get_peer_cred(edg_wll_GssConnection *gss, STACK_OF(X509) **chain, X509 **cert)
-{
-   OM_uint32 maj_stat, min_stat;
-   gss_buffer_desc buffer = GSS_C_EMPTY_BUFFER;
-   BIO *bio = NULL;
-   SSL_SESSION *session = NULL;
-   unsigned char int_buffer[4];
-   long length;
-   int ret, index;
-   STACK_OF(X509) *cert_chain = NULL;
-   X509 *peer_cert = NULL;
-   X509 *p_cert;
-
-   maj_stat = gss_export_sec_context(&min_stat, &gss->context, &buffer);
-   if (GSS_ERROR(maj_stat))
-      return -1; /* XXX */
-
-   /* The GSSAPI specs requires gss_export_sec_context() to destroy the context
-    * after exporting. So we have to resurrect the context here by importing
-    * from just generated buffer. I'm eagerly waiting for adaptations in the
-    * VOMS API to avoid these hacks */
-   maj_stat = gss_import_sec_context(&min_stat, &buffer, &gss->context);
-
-   bio = BIO_new(BIO_s_mem());
-   if (bio == NULL) {
-      ret = -1;
-      goto end;
-   }
-   
-   /* Store exported context to memory, skipping the version number and and cred_usage fields */
-   BIO_write(bio, buffer.value + 8 , buffer.length - 8);
-
-   /* decode the session data in order to skip at the start of the cert chain */
-   session = d2i_SSL_SESSION_bio(bio, NULL);
-   if (session == NULL) {
-      ret = -1; /* XXX */
-      goto end;
-   }
-   if (session->peer)
-      peer_cert = X509_dup(session->peer);
-
-   SSL_SESSION_free(session);
-
-   BIO_read(bio, (char *) int_buffer, 4);
-   length  = (((size_t) int_buffer[0]) << 24) & 0xffff;
-   length |= (((size_t) int_buffer[1]) << 16) & 0xffff;
-   length |= (((size_t) int_buffer[2]) <<  8) & 0xffff;
-   length |= (((size_t) int_buffer[3])      ) & 0xffff;
-
-   if (length == 0) {
-      ret = 0;
-      goto end;
-   }
-
-   cert_chain = sk_X509_new_null();
-   for(index = 0; index < length; index++) {
-      p_cert = d2i_X509_bio(bio, NULL);
-      if (p_cert == NULL) {
-        ret = -1; /* XXX */
-        sk_X509_pop_free(cert_chain, X509_free);
-        goto end;
-      }
-
-      sk_X509_push(cert_chain, p_cert);
-   }
-
-   *chain = cert_chain;
-   *cert = peer_cert;
-   peer_cert = NULL;
-   ret = 0;
-
-end:
-   if (peer_cert)
-      X509_free(peer_cert);
-   gss_release_buffer(&min_stat, &buffer);
-
-   return ret;
-}
-
-int
-edg_wll_SetVomsGroups(edg_wll_Context ctx, edg_wll_GssConnection *gss, char *voms_dir, char *ca_dir)
-{
-   STACK_OF(X509) *p_chain = NULL;
-   X509 *cert = NULL;
-   int ret;
-   int err = 0;
-   struct vomsdata *voms_info = NULL;
-
-   /* XXX DK: correct cleanup ?? */
-   memset (&ctx->vomsGroups, 0, sizeof(ctx->vomsGroups));
-   edg_wll_ResetError(ctx);
-
-   ret = get_peer_cred(gss, &p_chain, &cert);
-   if (ret) {
-      ret = 0;
-      goto end;
-   }
-
-   /* exit if peer's credentials are not available */
-   if (p_chain == NULL || cert == NULL) {
-      ret = 0;
-      goto end;
-   }
-      
-   /* uses X509_CERT_DIR and X509_VOMS_DIR vars */
-   voms_info = VOMS_Init(voms_dir, ca_dir);
-   if (voms_info == NULL) {
-      edg_wll_SetError(ctx, errno, "failed to initialize VOMS structures");
-      ret = -1; /* XXX VOMS Error */
-      goto end;
-   }
-
-   ret = VOMS_Retrieve(cert, p_chain, RECURSE_CHAIN, voms_info, &err);
-   if (ret == 0) {
-      if (err == VERR_NOEXT)
-        /* XXX DK:
-        edg_wll_SetError(ctx, EINVAL, "no client VOMS certificates found");
-        */
-        ret = 0;
-      else {
-        edg_wll_SetError(ctx, -1, "failed to retrieve VOMS info");
-        ret = -1; /* XXX VOMS Error */
-      }
-      goto end;
-   }
-
-   ret = get_groups(ctx, voms_info, &ctx->vomsGroups);
-
-end:
-   if (voms_info)
-      VOMS_Destroy(voms_info);
-   if (cert)
-      X509_free(cert);
-
-   return ret;
-}
-
-void
-edg_wll_FreeVomsGroups(edg_wll_VomsGroups *groups)
-{
-   size_t len;
-
-   if (groups == NULL)
-      return;
-
-   for (len = 0; len < groups->len; len++) {
-      if (groups->val[len].vo)
-        free(groups->val[len].vo);
-      if (groups->val[len].name)
-        free(groups->val[len].name);
-   }
-}
-
-#else /* NO_VOMS */
-
-int
-edg_wll_SetVomsGroups() { return 0; }
-
-void edg_wll_FreeVomsGroups() {}
-
-#endif
-
-
-#if !defined(NO_VOMS) && !defined(NO_GACL)
-
-static int
-parse_creds(edg_wll_VomsGroups *groups, char *subject, GRSTgaclUser **gacl_user)
-{
-   GRSTgaclCred *cred = NULL;
-   GRSTgaclUser *user = NULL;
-   int ret;
-   int i;
-
-   GRSTgaclInit();
-
-   cred = GRSTgaclCredNew("person");
-   if (cred == NULL)
-      return ENOMEM;
-   
-   if (!GRSTgaclCredAddValue(cred, "dn", subject)) {
-      ret = EINVAL; /* GACL_ERR */
-      goto fail;
-   }
-
-   user = GRSTgaclUserNew(cred);
-   if (user == NULL) {
-      ret = ENOMEM;
-      goto fail;
-   }
-   cred = NULL; /* GACLnewUser() doesn't copy content, just store the pointer */
-
-   for (i = 0; i < groups->len; i++) {
-      cred = GRSTgaclCredNew("voms-cred");
-      if (cred == NULL) {
-        ret = ENOMEM;
-        goto fail;
-      }
-      if (!GRSTgaclCredAddValue(cred, "vo", groups->val[i].vo) ||
-         !GRSTgaclCredAddValue(cred, "group", groups->val[i].name)) {
-        ret = EINVAL; /* GACL_ERR */
-        goto fail;
-      }
-      if (!GRSTgaclUserAddCred(user, cred)) {
-        ret = EINVAL; /* GACL_ERR */
-        goto fail;
-      }
-      cred = NULL;
-      /* GACLuserAddCred() doesn't copy content, just store the pointer. Cred
-       * mustn't be free()ed */
-   }
-
-   *gacl_user = user;
-
-   return 0;
-
-fail:
-   if (cred)
-      GRSTgaclCredFree(cred);
-   if (user)
-      GRSTgaclUserFree(user);
-
-   return ret;
-}
-
-static int
-cmp_gacl_names(GRSTgaclNamevalue *n1, GRSTgaclNamevalue *n2)
-{
-   if (n1 == NULL && n2 == NULL)
-      return 1;
-
-   for ( ; n1; n1 = (GRSTgaclNamevalue *)n1->next, n2 = (GRSTgaclNamevalue *) n2->next) {
-      if (n2 == NULL)
-        return 0;
-      if (strcmp(n1->name, n2->name) != 0 ||
-         strcmp(n1->value, n2->value) != 0)
-        return 0;
-   }
-
-   return (n2 == NULL);
-}
-
-static int
-cmp_gacl_creds(GRSTgaclCred *c1, GRSTgaclCred *c2)
-{
-   if (strcmp(c1->type, c2->type) != 0)
-      return 0;
-
-   return cmp_gacl_names(c1->firstname, c2->firstname);
-   /* we support only "simple" entries containing only one credential (DN or 
-    * VOMS group */
-}
-
-static int
-addEntry(GRSTgaclAcl *acl, GRSTgaclEntry *entry)
-{
-       GRSTgaclEntry   *cur = NULL;
-   
-
-       if ( acl == NULL )
-               return EINVAL;
-
-       if ( acl->firstentry == NULL )
-               return (GRSTgaclAclAddEntry(acl, entry) == 0) ? -1 /* GACL_ERR */ : 0;
-
-       for ( cur = acl->firstentry; cur; cur = cur->next )
-               if (   cmp_gacl_creds(cur->firstcred, entry->firstcred)
-                       && cur->allowed == entry->allowed
-                       && cur->denied == entry->denied ) 
-                       return EEXIST;
-
-       return (GRSTgaclAclAddEntry(acl, entry) == 0) ? -1 /* GACL_ERR */ : 0;
-}
-
-static int
-delEntry(GRSTgaclAcl *acl, GRSTgaclEntry *entry)
-{
-   GRSTgaclEntry *cur = NULL, *prev = NULL;
-   int found = 0;
-   
-   if (acl == NULL || acl->firstentry == NULL)
-      return EINVAL;
-
-   cur = acl->firstentry;
-   while (cur) {
-      if (cmp_gacl_creds(cur->firstcred, entry->firstcred) &&
-         cur->allowed == entry->allowed &&
-         cur->denied == entry->denied) {
-        if (prev)
-           prev->next = cur->next;
-        else
-           acl->firstentry = cur->next;
-        GRSTgaclEntryFree(cur);
-        found = 1;
-        break;
-      }
-      prev = cur;
-      cur = cur->next; 
-   }
-
-   return (found) ? 0 : -1 /* NOT_FOUND */;
-}
-
-static int
-create_cred(char *userid, int user_type, GRSTgaclCred **cred)
-{
-   GRSTgaclCred *c = NULL;
-   char *group = NULL;
-
-   if (user_type == EDG_WLL_USER_SUBJECT) {
-      c = GRSTgaclCredNew("person");
-      if (c == NULL)
-        return ENOMEM;
-      if (!GRSTgaclCredAddValue(c, "dn", userid)) {
-        GRSTgaclCredFree(c);
-        return -1; /* GACL_ERR */
-      }
-   } else if(user_type == EDG_WLL_USER_VOMS_GROUP) {
-      c = GRSTgaclCredNew("voms-cred");
-      if (c == NULL)
-        return ENOMEM;
-      group = strchr(userid, ':');
-      if ( !group )
-        return EINVAL;
-      *group++ = '\0';
-      if (!GRSTgaclCredAddValue(c, "vo", userid) ||
-         !GRSTgaclCredAddValue(c, "group", group)) {
-        GRSTgaclCredFree(c);
-        return -1; /* GACL_ERR */
-      }
-   } else
-      return EINVAL;
-
-   *cred = c;
-
-   return 0;
-}
-
-static int
-change_acl(GRSTgaclAcl *acl, GRSTgaclEntry *entry, int operation)
-      /* creds, permission, permission_type */
-{
-   if (operation == EDG_WLL_ACL_ADD)
-      return addEntry(acl, entry);
-   
-   if (operation == EDG_WLL_ACL_REMOVE)
-      return delEntry(acl, entry);
-
-   return -1;
-}
-
-static int
-edg_wll_change_acl(edg_wll_Acl acl, char *user_id, int user_id_type, 
-                  int permission, int perm_type, int operation)
-{
-   GRSTgaclCred *cred = NULL;
-   GRSTgaclEntry *entry = NULL;
-   int ret;
-
-   GRSTgaclInit();
-
-   if (acl == NULL || acl->value == NULL)
-      return EINVAL;
-
-   ret = create_cred(user_id, user_id_type, &cred);
-   if (ret)
-      return ret;
-
-   entry = GRSTgaclEntryNew();
-   if (entry == NULL) {
-      ret = ENOMEM;
-      goto end;
-   }
-
-   if (!GRSTgaclEntryAddCred(entry, cred)) {
-      ret = -1; /* GACLErr */
-      goto end;
-   }
-
-   if (perm_type == EDG_WLL_PERM_ALLOW)
-      GRSTgaclEntryAllowPerm(entry, permission);
-   else if (perm_type == EDG_WLL_PERM_DENY)
-      GRSTgaclEntryDenyPerm(entry, permission);
-   else {
-      ret = EINVAL;
-      goto end;
-   }
-
-   ret = change_acl(acl->value, entry, operation);
-   if (ret)
-   {
-/*    XXX: mem leak?
-      GRSTgaclEntryFree(entry);
-*/
-      goto end;
-   }
-
-   if (acl->string) free(acl->string);
-   ret = edg_wll_EncodeACL(acl->value, &acl->string);
-
-end:
-
-   return ret;
-}
-
-int
-edg_wll_CheckACL(edg_wll_Context ctx, edg_wll_Acl acl, int requested_perm)
-{
-   int ret;
-   GRSTgaclUser *user = NULL;
-   unsigned int perm;
-
-   if (acl == NULL || acl->value == NULL)
-      return edg_wll_SetError(ctx,EINVAL,"CheckACL");
-
-   if (!ctx->peerName) return edg_wll_SetError(ctx,EPERM,"CheckACL");
-
-   ret = parse_creds(&ctx->vomsGroups, ctx->peerName, &user);
-   if (ret) {
-      return edg_wll_SetError(ctx,ret,"parse_creds()");
-   }
-
-   perm = GRSTgaclAclTestUser(acl->value, user);
-
-   /* XXX GRSTgaclUserFree(user); */
-   
-   if (perm & requested_perm) return edg_wll_ResetError(ctx);
-   else return edg_wll_SetError(ctx,EPERM,"CheckACL");
-}
-
-int
-edg_wll_EncodeACL(GRSTgaclAcl *acl, char **str)
-{
-   int tmp_fd, ret;
-   FILE *fd = NULL;
-   char filename[16];
-   char line[4096];
-   char *buf = NULL;
-   size_t buf_len = 0;
-   char *p;
-
-   snprintf(filename, sizeof(filename), "/tmp/XXXXXX");
-   tmp_fd = mkstemp(filename);
-   if (tmp_fd == -1)
-      return errno;
-
-   fd = fdopen(tmp_fd, "r");
-
-   ret = GRSTgaclAclSave(acl, filename);
-   unlink(filename);
-   if (ret == 0) {
-      ret = -1; /* GACL_ERR */
-      goto end;
-   }
-
-   buf_len = 1024;
-   buf = calloc(buf_len, 1);
-   if (buf == NULL) {
-      ret = ENOMEM;
-      goto end;
-   }
-
-   while (fgets(line, sizeof(line), fd) != NULL) {
-      p = strchr(line, '\n');
-      if (p)
-        *p = '\0';
-
-      if (strlen(buf) + strlen(line) > buf_len) {
-        char *tmp;
-
-        tmp =  realloc(buf, buf_len + 1024);
-        if (tmp == NULL) {
-           ret = ENOMEM;
-           goto end;
-        }
-        buf = tmp;
-        buf_len += 1024;
-      }
-
-      strcat(buf, line);
-   }
-
-   *str = buf;
-   ret = 0;
-
-end:
-   fclose(fd);
-   return ret;
-}
-
-int
-edg_wll_DecodeACL(char *buf, GRSTgaclAcl **result_acl)
-{
-   /* Got from GACLloadAcl() available from GACL API */
-   xmlDocPtr   doc;
-   xmlNodePtr  cur;
-   GRSTgaclAcl    *acl;
-   GRSTgaclEntry  *entry;
-        
-   doc = xmlParseMemory(buf, strlen(buf));
-   if (doc == NULL) return EINVAL;
-    
-   cur = xmlDocGetRootElement(doc);
-  
-   if (xmlStrcmp(cur->name, (const xmlChar *) "gacl"))
-    {
-       free(doc);
-       free(cur);
-       return EINVAL;
-    }
-
-   cur = cur->xmlChildrenNode;
-
-   acl = GRSTgaclAclNew();
-  
-   while (cur != NULL)
-       {
-        /*
-        if (cur->type == XML_TEXT_NODE && cur->content == '\n') {
-           cur=cur->next;
-           continue;
-        }
-        */
-         entry = GACLparseEntry(cur);
-         if (entry == NULL)
-           {
-             GRSTgaclAclFree(acl);
-             xmlFreeDoc(doc);
-             return EINVAL;
-           }
-
-         GRSTgaclAclAddEntry(acl, entry);
-         
-         cur=cur->next;
-       }
-
-   xmlFreeDoc(doc);
-   *result_acl = acl;
-   return 0;
-}
-
-int
-edg_wll_InitAcl(edg_wll_Acl *acl)
-{
-   edg_wll_Acl tmp;
-
-   tmp = malloc(sizeof(*tmp));
-   if ( !tmp )
-      return ENOMEM;
-
-   tmp->value = GRSTgaclAclNew();
-   tmp->string = NULL;
-   *acl = tmp;
-   return 0;
-}
-
-void
-edg_wll_FreeAcl(edg_wll_Acl acl)
-{
-   /* XXX if ( acl->value ) GRSTgaclAclFree(acl->value); */
-   if ( acl->string ) free(acl->string);
-   free(acl);
-}
-
-int
-edg_wll_HandleCounterACL(edg_wll_Context ctx, edg_wll_Acl acl,
-                        char *aclid, int incr)
-{
-       char       *q1 = NULL,
-                          *q2 = NULL;
-
-       edg_wll_ResetError(ctx);
-
-       if ( incr > 0 )
-       {
-               trio_asprintf(&q1,
-                               "insert into acls(aclid,value,refcnt) "
-                               "values ('%|Ss','%|Ss',%d)",
-                               aclid, acl->string, incr);
-
-               for ( ; ; )
-               {
-                       if ( edg_wll_ExecStmt(ctx, q1, NULL) > 0 )
-                               goto end;
-
-                       if ( edg_wll_Error(ctx,NULL,NULL) != EEXIST )
-                               goto end;
-
-                       /*
-                        *      row allready in DB
-                        */
-                       if ( !q2 ) trio_asprintf(&q2,
-                                               "update acls set refcnt = refcnt+%d "
-                                               "where aclid = '%|Ss'",
-                                               incr, aclid);
-                       if ( edg_wll_ExecStmt(ctx, q2, NULL) < 0 )
-                               continue;
-
-                       goto end; 
-               }
-       }
-       else if (incr < 0)
-       {
-               trio_asprintf(&q1,
-                               "update acls set refcnt = refcnt-%d "
-                               "where aclid='%|Ss' and refcnt>=%d",
-                               -incr, aclid, -incr);
-
-               if ( edg_wll_ExecStmt(ctx, q1, NULL) > 0 )
-               {
-                       trio_asprintf(&q2,
-                                               "delete from acls "
-                                               "where aclid='%|Ss' and refcnt=0",
-                                               aclid);
-                       edg_wll_ExecStmt(ctx, q2, NULL);
-               }
-               else
-               {
-                       fprintf(stderr, "ACL with ID: %s has invalid reference count\n", aclid);
-                       syslog(LOG_WARNING, "ACL with ID: %s has invalid reference count\n", aclid);
-               }
-       }
-
-
-end:
-       if ( q1 ) free(q1);
-       if ( q2 ) free(q2);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-int
-edg_wll_UpdateACL(edg_wll_Context ctx, edg_wlc_JobId job, 
-                 char *user_id, int user_id_type,
-                 int permission, int perm_type, int operation)
-{
-   char *md5_jobid;
-   edg_wll_Acl acl = NULL;
-   int ret;
-   char *stmt = NULL;
-   char *new_aclid = NULL, *old_aclid = NULL;
-   int updated;
-
-   edg_wll_ResetError(ctx);
-
-   md5_jobid = edg_wlc_JobIdGetUnique(job);
-
-   do {
-      if (acl)
-      {
-        edg_wll_FreeAcl(acl);
-        acl = NULL;
-      }
-      if (old_aclid)
-      {
-        free(old_aclid);
-        old_aclid = NULL;
-      }
-      if (new_aclid)
-      {
-        free(new_aclid);
-         new_aclid = NULL;
-      }
-        
-      if ( (ret = edg_wll_GetACL(ctx, job, &acl)) )
-        goto end;
-      if ( !acl && (ret = edg_wll_InitAcl(&acl)) )
-        goto end;
-        
-      old_aclid = acl->string? strdup(strmd5(acl->string, NULL)): NULL;
-
-      ret = edg_wll_change_acl(acl, user_id, user_id_type, 
-                              permission, perm_type, operation);
-      if (ret)
-      {
-        if ( ret == EEXIST )
-           /*
-            *  adding allready set entry
-            *  only upgrade the counter
-            */
-           ret = edg_wll_HandleCounterACL(ctx, acl, new_aclid, 1);
-
-        goto end;
-      }
-
-      new_aclid = strdup(strmd5(acl->string, NULL));
-
-      /* store new ACL or increment its counter if already present in db */
-      ret = edg_wll_HandleCounterACL(ctx, acl, new_aclid, 1);
-      if  (ret)
-        goto end;
-
-      if ( old_aclid )
-        trio_asprintf(&stmt,
-           "update jobs set aclid='%|Ss' where jobid='%|Ss' and aclid='%|Ss'",
-           new_aclid, md5_jobid, old_aclid);
-      else
-        trio_asprintf(&stmt,
-           "update jobs set aclid='%|Ss' where jobid='%|Ss' and ISNULL(aclid)",
-           new_aclid, md5_jobid);
-      updated = edg_wll_ExecStmt(ctx, stmt, NULL);
-      free(stmt); stmt = NULL;
-
-      if (updated > 0)
-        /* decrement reference counter of the old ACL, and possibly remove
-         * whole ACL if the counter becames zero */
-        ret = edg_wll_HandleCounterACL(ctx, NULL, old_aclid, -1);
-      else
-         /* We failed to store new ACL to db, most likely because the ACL has
-         * been changed. Decrement counter of new ACL set before trying
-         * updating */
-        ret = edg_wll_HandleCounterACL(ctx, NULL, new_aclid, -1);
-   } while (updated <= 0);
-
-end:
-   free(md5_jobid);
-   if (acl)
-      edg_wll_FreeAcl(acl);
-   if (new_aclid)
-      free(new_aclid);
-   if (old_aclid)
-      free(old_aclid);
-
-   return ret;
-}
-
-int edg_wll_GetACL(edg_wll_Context ctx, edg_wlc_JobId jobid, edg_wll_Acl *acl)
-{
-       char    *q = NULL;
-       char    *acl_id = NULL;
-       char    *acl_str = NULL;
-       edg_wll_Stmt    stmt = NULL;
-       int     ret;
-       GRSTgaclAcl     *gacl = NULL;
-       char    *jobstr = edg_wlc_JobIdGetUnique(jobid);
-
-       if (jobid == NULL || jobstr == NULL)
-          return edg_wll_SetError(ctx,EINVAL,"edg_wll_GetACL()");
-
-       edg_wll_ResetError(ctx);
-
-       trio_asprintf(&q,
-               "select aclid from jobs where jobid = '%|Ss'", jobstr);
-
-       if (edg_wll_ExecStmt(ctx, q, &stmt) < 0 ||
-               edg_wll_FetchRow(stmt, &acl_id) < 0) {
-               goto end;
-       }
-       edg_wll_FreeStmt(&stmt); stmt = NULL;
-       free(q); q = NULL;
-
-       if (acl_id == NULL || *acl_id == '\0') {
-               *acl = NULL;
-               return 0;
-       }
-
-       trio_asprintf(&q,
-               "select value from acls where aclid = '%|Ss'", acl_id);
-       if (edg_wll_ExecStmt(ctx, q, &stmt) < 0 ||
-               edg_wll_FetchRow(stmt, &acl_str) < 0) {
-               goto end;
-       }
-
-       ret = edg_wll_DecodeACL(acl_str, &gacl);
-       if (ret) {
-               edg_wll_SetError(ctx, EINVAL, "encoding ACL");
-               goto end;
-       }
-
-       *acl = calloc(1, sizeof(**acl));
-       if (*acl == NULL) {
-               ret = ENOMEM;
-               edg_wll_SetError(ctx, ENOMEM, "not enough memory");
-               goto end;
-       }
-
-       (*acl)->value = gacl;
-       (*acl)->string = acl_str;
-       gacl = NULL; acl_str = NULL;
-       ret = 0;
-
-end:
-       if (q) free(q);
-       if (stmt) edg_wll_FreeStmt(&stmt);
-       if (acl_id) free(acl_id);
-       if (acl_str) free(acl_str);
-       if (gacl) GRSTgaclAclFree(gacl);
-       if (jobstr) free(jobstr);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-#else /* VOMS & GACL */
-
-
-int edg_wll_CheckACL() { return EPERM; }
-int edg_wll_EncodeACL() { return 0; }
-int edg_wll_DecodeACL() { return 0; }
-int edg_wll_InitAcl() { return 0; }
-int edg_wll_FreeAcl() { return 0; }
-int edg_wll_HandleCounterACL() { return 0; }
-int edg_wll_UpdateACL() { return 0; }
-int edg_wll_GetACL() { return 0; }
-
-
-#endif
-
diff --git a/org.glite.lb.server/src/lb_authz.h b/org.glite.lb.server/src/lb_authz.h

deleted file mode 100644 (file)

index 0aa659a..0000000
--- a/org.glite.lb.server/src/lb_authz.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifndef LB_AUTHZ_H
-#define LB_AUTHZ_H
-
-#ifndef NO_GACL
-#include <gridsite.h>
-#endif 
-
-typedef struct _edg_wll_Acl {
-#ifndef NO_GACL
-       GRSTgaclAcl     *value;
-#else
-       void    *value; /* XXX */
-#endif
-       char    *string;
-} _edg_wll_Acl;
-typedef struct _edg_wll_Acl *edg_wll_Acl;
-
-#ifndef NO_VOMS
-
-# ifndef NO_GACL
-
-#include <stdio.h>
-
-#include "glite/lb/context-int.h"
-#include "glite/lb/lb_gss.h"
-
-extern int
-edg_wll_InitAcl(edg_wll_Acl *);
-
-extern void
-edg_wll_FreeAcl(edg_wll_Acl);
-
-extern int
-edg_wll_UpdateACL(edg_wll_Context, edg_wlc_JobId, char *, int, int, int, int);
-
-extern int
-edg_wll_CheckACL(edg_wll_Context, edg_wll_Acl, int);
-
-extern int
-edg_wll_DecodeACL(char *, GRSTgaclAcl **);
-
-extern int
-edg_wll_EncodeACL(GRSTgaclAcl *, char **);
-
-extern int
-edg_wll_GetACL(edg_wll_Context, edg_wlc_JobId, edg_wll_Acl *);
-
-#endif /* NO_GACL */
-
-extern int
-edg_wll_SetVomsGroups(edg_wll_Context, edg_wll_GssConnection *, char *, char *);
-
-extern void
-edg_wll_FreeVomsGroups(edg_wll_VomsGroups *);
-
-#endif /* NO_VOMS */
-
-#endif
diff --git a/org.glite.lb.server/src/lb_html.c b/org.glite.lb.server/src/lb_html.c

deleted file mode 100644 (file)

index e91a3ba..0000000
--- a/org.glite.lb.server/src/lb_html.c
+++ /dev/null
@@ -1,146 +0,0 @@
-#ident "$Header$"
-
-#include "lb_html.h"
-#include "lb_proto.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-
-int edg_wll_QueryToHTML(edg_wll_Context ctx UNUSED_VAR, edg_wll_Event *eventsOut UNUSED_VAR, char **message UNUSED_VAR)
-{
-/* not implemented yet */
-       return -1;
-}
-
-/* construct Message-Body of Response-Line for edg_wll_UserJobs */
-int edg_wll_UserJobsToHTML(edg_wll_Context ctx, edg_wlc_JobId *jobsOut, char **message)
-{
-        char *pomA, *pomB;
-        int i = 0;
-
-       /* head */
-       pomB = strdup("");      
-
-        while (jobsOut[i]) {
-               char    *chid = edg_wlc_JobIdUnparse(jobsOut[i]);
-
-                asprintf(&pomA,"%s\t\t <li> <a href=\"%s\">%s</a>\r\n",
-                        pomB, chid,chid);
-
-               free(chid);
-                free(pomB);
-                pomB = pomA;
-                i++;
-        }
-
-        asprintf(&pomA, "<html>\r\n\t<body>\r\n"
-                       "<h2><B>User jobs</B></h2>\r\n"
-                       "User subject: %s<p>"
-                       "<ul>%s</ul>"
-                       "\t</body>\r\n</html>",ctx->peerName,pomB);
-        free(pomB);
-
-        *message = pomA;
-
-        return 0;
-}
-
-
-/* construct Message-Body of Response-Line for edg_wll_JobStatus */
-int edg_wll_JobStatusToHTML(edg_wll_Context ctx UNUSED_VAR, edg_wll_JobStat stat, char **message)
-{
-        char *pomA, *pomB;
-       char    *chid,*chstat;
-       char    *jdl,*rsl;
-
-       jdl = strdup("");
-       rsl = strdup("");
-       
-       pomB = strdup("");
-
-        chid = edg_wlc_JobIdUnparse(stat.jobId);
-
-#define TR(name,type,field)            \
-       if (field) {            \
-               asprintf(&pomA,"%s<tr><th align=\"left\">" name ":</th>"        \
-                       "<td>" type "</td></tr>",pomB,(field)); \
-               free(pomB);                                     \
-               pomB = pomA;                                    \
-       }
-
-       TR("Status","%s",(chstat = edg_wll_StatToString(stat.state)));
-       free(chstat);
-       TR("owner","%s",stat.owner);
-       TR("Condor Id","%s",stat.condorId);
-       TR("Globus Id","%s",stat.globusId);
-       TR("Local Id","%s",stat.localId);
-       TR("Reason","%s",stat.reason);
-       if ( (stat.stateEnterTime.tv_sec) || (stat.stateEnterTime.tv_usec) ) {
-               time_t  time = stat.stateEnterTime.tv_sec;
-               TR("State entered","%s",ctime(&time));
-       }
-        if ( (stat.lastUpdateTime.tv_sec) || (stat.lastUpdateTime.tv_usec) ) {
-               time_t  time = stat.lastUpdateTime.tv_sec;
-               TR("Last update","%s",ctime(&time));
-       }
-       TR("Expect update","%s",stat.expectUpdate ? "YES" : "NO");
-       TR("Expect update from","%s",stat.expectFrom);
-       TR("Location","%s",stat.location);
-       TR("Destination","%s",stat.destination);
-       TR("Cancelling","%s",stat.cancelling>0 ? "YES" : "NO");
-       if (stat.cancelReason != NULL) {
-               TR("Cancel reason","%s",stat.cancelReason);
-       }
-       TR("CPU time","%d",stat.cpuTime);
-
-       
-       TR("Done code","%d",stat.done_code);
-       TR("Exit code","%d",stat.exit_code);
-
-        if (stat.jdl) asprintf(&jdl,"<h3>Job description</h3>\r\n"
-               "<pre>%s</pre>\r\n",stat.jdl);
-
-       if (stat.rsl) asprintf(&rsl,"<h3>RSL</h3>\r\n"
-               "<pre>%s</pre>\r\n",stat.rsl);
-
-
-        asprintf(&pomA, "<html>\r\n\t<body>\r\n"
-                       "<h2>%s</h2>\r\n"
-                       "<table halign=\"left\">%s</table>"
-                       "%s%s"
-                       "\t</body>\r\n</html>",
-                       chid,pomB,jdl,rsl);
-        free(pomB);
-
-        *message = pomA;
-
-       free(chid);
-       free(jdl);
-       free(rsl);
-        return 0;
-}
-
-char *edg_wll_ErrorToHTML(edg_wll_Context ctx,int code)
-{
-       char    *out,*et,*ed;
-       char    *msg = edg_wll_HTTPErrorMessage(code);
-       edg_wll_ErrorCode       e;
-
-       e = edg_wll_Error(ctx,&et,&ed);
-       asprintf(&out,"<html><head><title>Error</title></head>\n"
-               "<body><h1>%s</h1>\n"
-               "%d: %s (%s)</body></html>",msg,e,et,ed);
-
-       free(et); free(ed);
-       return out;
-}
diff --git a/org.glite.lb.server/src/lb_html.h b/org.glite.lb.server/src/lb_html.h

deleted file mode 100644 (file)

index 1cac83f..0000000
--- a/org.glite.lb.server/src/lb_html.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _LB_HTML
-#define _LB_HTML
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-
-int edg_wll_QueryToHTML(edg_wll_Context,edg_wll_Event *,char **);
-int edg_wll_JobStatusToHTML(edg_wll_Context, edg_wll_JobStat, char **);
-int edg_wll_UserJobsToHTML(edg_wll_Context, edg_wlc_JobId *, char **);
-char *edg_wll_ErrorToHTML(edg_wll_Context,int);
-
-#endif
diff --git a/org.glite.lb.server/src/lb_http.c b/org.glite.lb.server/src/lb_http.c

deleted file mode 100644 (file)

index 79e85d5..0000000
--- a/org.glite.lb.server/src/lb_http.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/mini_http.h"
-#include "glite/lb/context-int.h"
-
-#include "lb_http.h"
-#include "lb_proto.h"
-
-#define dprintf(x) printf x
-
-
-int edg_wll_ServerHTTP(edg_wll_Context ctx)
-{
-       char    **hdr = NULL,*req = NULL,*body = NULL,
-               **hdrOut = NULL, *resp = NULL, *bodyOut = NULL,
-               *err_desc = NULL;
-       edg_wll_ErrorCode       err = 0;
-
-
-       err = edg_wll_http_recv(ctx,&req,&hdr,&body);
-
-       dprintf(("[%d] %s\n",getpid(),req));
-       if (body) dprintf(("\n%s\n\n",body));
-
-       if (!err) {
-               if ((err = edg_wll_Proto(ctx,req,hdr,body,&resp,&hdrOut,&bodyOut))) 
-                       edg_wll_Error(ctx,NULL,&err_desc);
-
-               if (resp) edg_wll_http_send(ctx,resp,(char const * const *)hdrOut,bodyOut);
-       }
-
-       free(req);
-       free(resp);
-       if (hdr) {
-               char    **h;
-               for (h = hdr; *h; h++) free(*h);
-               free(hdr);
-       }
-       // hdrOut are static
-       free(body);
-       free(bodyOut);
-
-       if (err != edg_wll_Error(ctx,NULL,NULL)) edg_wll_SetError(ctx,err,err_desc);
-       free(err_desc);
-       return err;
-}
diff --git a/org.glite.lb.server/src/lb_http.h b/org.glite.lb.server/src/lb_http.h

deleted file mode 100644 (file)

index c3e012d..0000000
--- a/org.glite.lb.server/src/lb_http.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _LB_HTTP_H
-#define _LB_HTTP_H
-
-#ident "$Header$"
-
-#include <stdio.h>
-
-#include "glite/lb/consumer.h"
-
-int edg_wll_ServerHTTP(edg_wll_Context);
-
-#endif
diff --git a/org.glite.lb.server/src/lb_proto.c b/org.glite.lb.server/src/lb_proto.c

deleted file mode 100644 (file)

index 582c41b..0000000
--- a/org.glite.lb.server/src/lb_proto.c
+++ /dev/null
@@ -1,804 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-
-#include <expat.h>
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/mini_http.h"
-#include "glite/lb/xml_conversions.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/load.h"
-#include "glite/lb/purge.h"
-
-#include "lb_proto.h"
-#include "lb_html.h"
-#include "get_events.h"
-#include "purge.h"
-#include "lb_xml_parse.h"
-#include "lb_xml_parse_V21.h"
-
-
-#define METHOD_GET      "GET "
-#define METHOD_POST     "POST "
-
-#define KEY_QUERY_JOBS         "/queryJobs "
-#define KEY_QUERY_EVENTS       "/queryEvents "
-#define KEY_PURGE_REQUEST      "/purgeRequest "
-#define KEY_DUMP_REQUEST       "/dumpRequest "
-#define KEY_LOAD_REQUEST       "/loadRequest "
-#define KEY_INDEXED_ATTRS      "/indexedAttrs "
-#define KEY_NOTIF_REQUEST      "/notifRequest "
-#define KEY_HTTP               "HTTP/1.1"
-
-
-#define KEY_ACCEPT      "Accept:"
-#define KEY_APP         "application/x-dglb"
-#define KEY_AGENT      "User-Agent"
-
-
-const char* const response_headers[] = {
-        "Cache-Control: no-cache",
-        "Accept: application/x-dglb",
-        "User-Agent: edg_wll_Server/" PROTO_VERSION "/" COMP_PROTO,
-        "Content-Type: application/x-dglb",
-        NULL
-};
-
-extern int edg_wll_NotifNewServer(edg_wll_Context,
-                               edg_wll_QueryRec const * const *, char const *,
-                               const edg_wll_NotifId, time_t *);
-extern int edg_wll_NotifBindServer(edg_wll_Context,
-                               const edg_wll_NotifId, const char *, time_t *);
-extern int edg_wll_NotifChangeServer(edg_wll_Context,
-                               const edg_wll_NotifId, edg_wll_QueryRec const * const *,
-                               edg_wll_NotifChangeOp);
-extern int edg_wll_NotifRefreshServer(edg_wll_Context,
-                               const edg_wll_NotifId, time_t *);
-extern int edg_wll_NotifDropServer(edg_wll_Context, edg_wll_NotifId *);
-
-
-
-char *edg_wll_HTTPErrorMessage(int errCode)
-{
-       char *msg;
-       
-       switch (errCode) {
-               case HTTP_OK: msg = "OK"; break;
-               case HTTP_BADREQ: msg = "Bad Request"; break;
-               case HTTP_UNAUTH: msg = "Unauthorized"; break;
-               case HTTP_NOTFOUND: msg = "Not Found"; break;
-               case HTTP_NOTALLOWED: msg = "Method Not Allowed"; break;
-               case HTTP_UNSUPPORTED: msg = "Unsupported Media Type"; break;
-               case HTTP_NOTIMPL: msg = "Not Implemented"; break;
-               case HTTP_INTERNAL: msg = "Internal Server Error"; break;
-               case HTTP_UNAVAIL: msg = "Service Unavailable"; break;
-               case HTTP_INVALID: msg = "Invalid Data"; break;
-               default: msg = "Unknown error"; break;
-       }
-
-       return msg;
-}
-
-
-/* returns non-zero if old style (V21) protocols incompatible */
-static int is_protocol_incompatibleV21(char *user_agent)
-{
-        char *version, *comp_proto, *needle;
-        double  v, c, my_v = strtod(PROTO_VERSION_V21, (char **) NULL), my_c;
-
-
-       /* get version od the other side */
-        if ((version = strstr(user_agent,"/")) == NULL) return(-1);
-        else v = strtod(++version, &needle);
-
-       /* sent the other side list of compatible protocols? */
-       if ( needle[0] == '\0' ) return(-2);
-
-       /* test compatibility if server newer*/
-        if (my_v > v) {
-                comp_proto=COMP_PROTO_V21;
-                do {
-                        my_c = strtod(comp_proto, &needle);
-                        if (my_c == v) return(0);
-                        comp_proto = needle + 1;
-                } while (needle[0] != '\0');
-                return(1);
-        }
-
-       /* test compatibility if server is older */
-        else if (my_v < v) {
-                do {
-                        comp_proto = needle + 1;
-                        c = strtod(comp_proto, &needle);
-                        if (my_v == c) return(0);
-                } while (needle[0] != '\0');
-                return(1);
-        }
-
-       /* version match */
-        return(0);
-}
-
-
-/* returns non-zero if protocols incompatible */
-static int is_protocol_incompatible(char *user_agent)
-{
-        char *version, *comp_proto, *needle;
-        double  v, c, my_v = strtod(PROTO_VERSION, (char **) NULL), my_c;
-
-
-       /* get version od the other side */
-        if ((version = strstr(user_agent,"/")) == NULL) return(-1);
-        else v = strtod(++version, &needle);
-
-       /* sent the other side list of compatible protocols? */
-       if ( needle[0] == '\0' ) return(-2);
-
-       /* test compatibility if server newer*/
-        if (my_v > v) {
-                comp_proto=COMP_PROTO;
-                do {
-                        my_c = strtod(comp_proto, &needle);
-                        if (my_c == v) return(0);
-                        comp_proto = needle + 1;
-                } while (needle[0] != '\0');
-                return(1);
-        }
-
-       /* test compatibility if server is older */
-        else if (my_v < v) {
-                do {
-                        comp_proto = needle + 1;
-                        c = strtod(comp_proto, &needle);
-                        if (my_v == c) return(0);
-                } while (needle[0] != '\0');
-                return(1);
-        }
-
-       /* version match */
-        return(0);
-}
-
-
-static int outputHTML(char **headers)
-{
-       int i;
-
-       if (!headers) return 0;
-
-       for (i=0; headers[i]; i++)
-               if (!strncmp(headers[i], KEY_ACCEPT, sizeof(KEY_ACCEPT) - 1)) {
-                       if (strstr(headers[i],KEY_APP)) 
-                               return 0;               /* message sent by edg_wll_Api */
-                       else 
-                               return 1;               /* message sent by other application */
-               }
-       return 1;
-
-}
-
-
-
-
-edg_wll_ErrorCode edg_wll_ProtoV21(edg_wll_Context ctx,
-       char *request,char **headers,char *messageBody,
-       char **response,char ***headersOut,char **bodyOut)
-{
-       char *requestPTR, *message = NULL;
-       int     ret = HTTP_OK;
-       int     html = outputHTML(headers);
-       int     i;
-
-       edg_wll_ResetError(ctx);
-
-       for (i=0; headers[i]; i++) /* find line with version number in headers */
-               if ( strstr(headers[i], KEY_AGENT) ) break;
-  
-       if (headers[i] == NULL) { ret = HTTP_BADREQ; goto errV21; } /* if not present */
-       switch (is_protocol_incompatibleV21(headers[i])) { 
-               case 0  : /* protocols compatible */
-                         ctx->is_V21 = 1;
-                         break;
-               case -1 : /* malformed 'User Agent:' line */
-                         ret = HTTP_BADREQ;
-                         goto errV21;
-                         break;
-               case -2 : /* version of one protocol unknown */
-                         /* fallthrough */
-               case 1  : /* protocols incompatible */
-                         /* fallthrough */
-               default : ret = HTTP_UNSUPPORTED; 
-                         edg_wll_SetError(ctx,ENOTSUP,"Protocol versions are incompatible.");
-                         goto errV21; 
-                         break;
-       }
-
-
-/* GET */
-       if (!strncmp(request, METHOD_GET, sizeof(METHOD_GET)-1)) {
-               // Not supported
-               ret = HTTP_BADREQ;
-/* POST */
-       } else if (!strncmp(request,METHOD_POST,sizeof(METHOD_POST)-1)) {
-
-               requestPTR = request + sizeof(METHOD_POST)-1;
-       
-               if (!strncmp(requestPTR,KEY_QUERY_EVENTS,sizeof(KEY_QUERY_EVENTS)-1)) { 
-                       edg_wll_Event *eventsOut = NULL;
-                       edg_wll_QueryRec **job_conditions = NULL, **event_conditions = NULL;
-                       int i,j;
-
-                       if (parseQueryEventsRequestV21(ctx, messageBody, &job_conditions, &event_conditions)) 
-                               ret = HTTP_BADREQ;
-                               
-                       else {
-                               int     fatal = 0;
-
-                               switch (edg_wll_QueryEventsServer(ctx,ctx->noAuth,
-                                   (const edg_wll_QueryRec **)job_conditions, 
-                                   (const edg_wll_QueryRec **)event_conditions, &eventsOut)) {
-
-                                       case 0: if (html) ret = HTTP_NOTIMPL;
-                                               else      ret = HTTP_OK; 
-                                               break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM : ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               /* glue errors (if eny) to XML responce */ 
-                               if (!html && !fatal)
-                                       if (edg_wll_QueryEventsToXMLV21(ctx, eventsOut, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-
-                       if (job_conditions) {
-                               for (j = 0; job_conditions[j]; j++) {
-                                       for (i = 0 ; (job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&job_conditions[j][i]);
-                                       free(job_conditions[j]);
-                               }
-                               free(job_conditions);
-                       }
-
-                       if (event_conditions) {
-                               for (j = 0; event_conditions[j]; j++) {
-                                       for (i = 0 ; (event_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&event_conditions[j][i]);
-                                       free(event_conditions[j]);
-                               }
-                               free(event_conditions);
-                       }
-       
-                       if (eventsOut != NULL) {
-                               for (i=0; eventsOut[i].type != EDG_WLL_EVENT_UNDEF; i++) 
-                                       edg_wll_FreeEvent(&(eventsOut[i]));
-                               edg_wll_FreeEvent(&(eventsOut[i])); /* free last line */
-                               free(eventsOut);
-                       }
-               }
-               else if (!strncmp(requestPTR,KEY_QUERY_JOBS,sizeof(KEY_QUERY_JOBS)-1)) { 
-                       edg_wlc_JobId *jobsOut = NULL;
-                       edg_wll_JobStat *statesOut = NULL;
-                       edg_wll_QueryRec **conditions = NULL;
-                       int i,j, flags = 0;
-
-                       if (parseQueryJobsRequestV21(ctx, messageBody, &conditions, &flags))
-                               ret = HTTP_BADREQ;
-
-                       else { 
-                               int             fatal = 0,
-                                               retCode;
- 
-                               if (flags & EDG_WLL_STAT_NO_JOBS) { 
-                                       flags -= EDG_WLL_STAT_NO_JOBS;
-                                       jobsOut = NULL;
-                                       if (flags & EDG_WLL_STAT_NO_STATES) {
-                                               flags -= EDG_WLL_STAT_NO_STATES;
-                                               statesOut = NULL;
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, NULL, NULL);
-                                       }
-                                       else
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, NULL, &statesOut);
-                               }
-                               else {
-                                       if (flags & EDG_WLL_STAT_NO_STATES) {
-                                               flags -= EDG_WLL_STAT_NO_STATES;
-                                               statesOut = NULL;
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, &jobsOut, NULL);
-                                       }
-                                       else
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, &jobsOut, &statesOut);
-                               }
-                               
-                               switch ( retCode ) {
-                                       // case EPERM : ret = HTTP_UNAUTH;
-                                       //              /* soft-error fall through */
-                                       case 0: if (html) ret =  HTTP_NOTIMPL;
-                                               else ret = HTTP_OK;
-
-                                               break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM: ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               if (!html && !fatal)
-                                       if (edg_wll_QueryJobsToXMLV21(ctx, jobsOut, statesOut, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-
-                       if (conditions) {
-                               for (j = 0; conditions[j]; j++) {
-                                       for (i = 0; (conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&conditions[j][i]);
-                                       free(conditions[j]);
-                               }
-                               free(conditions);
-                       }
-
-                       if (jobsOut) {
-                               for (i=0; jobsOut[i]; i++) edg_wlc_JobIdFree(jobsOut[i]);
-                               free(jobsOut);
-                       }
-                       if (statesOut) {
-                               for (i=0; statesOut[i].state != EDG_WLL_JOB_UNDEF; i++) 
-                                       edg_wll_FreeStatus(&(statesOut[i]));
-                               edg_wll_FreeStatus(&(statesOut[i])); /* free last line */
-                               free(statesOut);
-                       }
-               }
-        /* POST [something else]: not understood */
-               else ret = HTTP_BADREQ;
-
-/* other HTTP methods */
-       } else ret = HTTP_NOTALLOWED;
-
-errV21:        asprintf(response,"HTTP/1.1 %d %s",ret,edg_wll_HTTPErrorMessage(ret));
-       *headersOut = (char **) response_headers;
-       if ((ret != HTTP_OK) && html)
-               *bodyOut = edg_wll_ErrorToHTML(ctx,ret);
-       else
-               *bodyOut = message;
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-edg_wll_ErrorCode edg_wll_Proto(edg_wll_Context ctx,
-       char *request,char **headers,char *messageBody,
-       char **response,char ***headersOut,char **bodyOut)
-{
-       char *requestPTR, *message = NULL;
-       int     ret = HTTP_OK;
-       int     html = outputHTML(headers);
-       int     i;
-
-       edg_wll_ResetError(ctx);
-
-       for (i=0; headers[i]; i++) /* find line with version number in headers */
-               if ( strstr(headers[i], KEY_AGENT) ) break;
-  
-       if (headers[i] == NULL) { ret = HTTP_BADREQ; goto err; } /* if not present */
-       switch (is_protocol_incompatible(headers[i])) { 
-               case 0  : /* protocols compatible */
-                         ctx->is_V21 = 0;
-                         break;
-               case -1 : /* malformed 'User Agent:' line */
-                         ret = HTTP_BADREQ;
-                         goto err;
-                         break;
-               case 1  : /* protocols incompatible */
-                         /* try old (V21) version compatibility */
-                         edg_wll_ProtoV21(ctx, request, headers, messageBody, 
-                                         response, headersOut, bodyOut);
-                                         
-                         /* and propagate errors or results */
-                         return edg_wll_Error(ctx,NULL,NULL);
-                         break;
-               case -2 : /* version of one protocol unknown */
-                         /* fallthrough */
-               default : ret = HTTP_UNSUPPORTED; 
-                         edg_wll_SetError(ctx,ENOTSUP,"Protocol versions are incompatible.");
-                         goto err; 
-                         break;
-       }
-
-
-/* GET */
-       if (!strncmp(request, METHOD_GET, sizeof(METHOD_GET)-1)) {
-               
-               requestPTR = request + sizeof(METHOD_GET)-1;
-
-
-       /* GET /: Current User Jobs */
-               if (requestPTR[0]=='/' && (requestPTR[1]==' ' || requestPTR[1]=='?')) {
-                       edg_wlc_JobId *jobsOut = NULL;
-                       int     i, flags;
-                       
-                       flags = (requestPTR[1]=='?') ? edg_wll_string_to_stat_flags(requestPTR + 2) : 0;
-
-// FIXME: edg_wll_UserJobs should take flags as parameter
-                       if (!ctx->peerName) {
-                               edg_wll_SetError(ctx,EPERM,"Operation not permitted.");
-                               ret = HTTP_UNAUTH; 
-                       }
-                       switch (edg_wll_UserJobs(ctx,&jobsOut,NULL)) {
-                               case 0: if (html) edg_wll_UserJobsToHTML(ctx, jobsOut, &message);
-                                       else ret = HTTP_OK;
-                                       break;
-                               case ENOENT: ret = HTTP_NOTFOUND; break;
-                               default: ret = HTTP_INTERNAL; break;
-                       }
-                       if (!html && (ret != HTTP_INTERNAL)) 
-                               if (edg_wll_UserJobsToXML(ctx, jobsOut, &message))
-                                       ret = HTTP_INTERNAL;
-
-                       if (jobsOut) {
-                               for (i=0; jobsOut[i]; i++) edg_wlc_JobIdFree(jobsOut[i]);
-                               free(jobsOut);
-                       }
-               } 
-
-       /* GET /[jobId]: Job Status */
-               else if (*requestPTR=='/') {
-                       edg_wlc_JobId jobId = NULL;
-                       char *pom1,*fullid = NULL;
-                       edg_wll_JobStat stat;
-                       char *pomCopy;
-
-                       if (ctx->srvName == NULL) {
-                               edg_wll_SetError(ctx, EDG_WLL_ERROR_SERVER_RESPONSE,
-                                                       "no server name on GET /jobid");
-                               ret = HTTP_INTERNAL;
-                               goto err;
-                       }
-                       memset(&stat,0,sizeof(stat));
-                       pomCopy = strdup(requestPTR + 1);
-                       for (pom1=pomCopy; *pom1 && !isspace(*pom1); pom1++);
-                       *pom1 = 0;
-
-                       asprintf(&fullid,GLITE_WMSC_JOBID_PROTO_PREFIX"%s:%u/%s",ctx->srvName,ctx->srvPort,pomCopy);
-                       free(pomCopy);  
-
-                       if (edg_wlc_JobIdParse(fullid, &jobId)) {
-                               edg_wll_SetError(ctx,EDG_WLL_ERROR_JOBID_FORMAT,fullid);
-                               ret = HTTP_BADREQ;
-                       }
-                       else switch (edg_wll_JobStatus(ctx,jobId,0,&stat)) {
-                               case 0: if (html) edg_wll_JobStatusToHTML(ctx,stat,&message); 
-                                       else ret = HTTP_OK;
-                                       break;
-                               case ENOENT: ret = HTTP_NOTFOUND; break;
-                               case EINVAL: ret = HTTP_INVALID; break;
-                               case EPERM : ret = HTTP_UNAUTH; break;
-                               default: ret = HTTP_INTERNAL; break;
-                       }
-                       if (!html && (ret != HTTP_INTERNAL))
-                               if (edg_wll_JobStatusToXML(ctx,stat,&message))
-                                       ret = HTTP_INTERNAL;
-
-                       free(fullid);
-                       edg_wlc_JobIdFree(jobId);
-                       edg_wll_FreeStatus(&stat);
-
-       /* GET [something else]: not understood */
-               } else ret = HTTP_BADREQ;
-
-/* POST */
-       } else if (!strncmp(request,METHOD_POST,sizeof(METHOD_POST)-1)) {
-
-               requestPTR = request + sizeof(METHOD_POST)-1;
-       
-               if (!strncmp(requestPTR,KEY_QUERY_EVENTS,sizeof(KEY_QUERY_EVENTS)-1)) { 
-                       edg_wll_Event *eventsOut = NULL;
-                       edg_wll_QueryRec **job_conditions = NULL, **event_conditions = NULL;
-                       int i,j;
-
-                       if (parseQueryEventsRequest(ctx, messageBody, &job_conditions, &event_conditions)) 
-                               ret = HTTP_BADREQ;
-                               
-                       else {
-                               int     fatal = 0;
-
-                               switch (edg_wll_QueryEventsServer(ctx,ctx->noAuth,
-                                   (const edg_wll_QueryRec **)job_conditions, 
-                                   (const edg_wll_QueryRec **)event_conditions, &eventsOut)) {
-
-                                       case 0: if (html) ret = HTTP_NOTIMPL;
-                                               else      ret = HTTP_OK; 
-                                               break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM : ret = HTTP_UNAUTH; break;
-                                       case E2BIG: ret = HTTP_UNAUTH; break;
-                                       case EINVAL: ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               /* glue errors (if eny) to XML responce */ 
-                               if (!html && !fatal)
-                                       if (edg_wll_QueryEventsToXML(ctx, eventsOut, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-
-                       if (job_conditions) {
-                               for (j = 0; job_conditions[j]; j++) {
-                                       for (i = 0 ; (job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&job_conditions[j][i]);
-                                       free(job_conditions[j]);
-                               }
-                               free(job_conditions);
-                       }
-
-                       if (event_conditions) {
-                               for (j = 0; event_conditions[j]; j++) {
-                                       for (i = 0 ; (event_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&event_conditions[j][i]);
-                                       free(event_conditions[j]);
-                               }
-                               free(event_conditions);
-                       }
-       
-                       if (eventsOut != NULL) {
-                               for (i=0; eventsOut[i].type != EDG_WLL_EVENT_UNDEF; i++) 
-                                       edg_wll_FreeEvent(&(eventsOut[i]));
-                               edg_wll_FreeEvent(&(eventsOut[i])); /* free last line */
-                               free(eventsOut);
-                       }
-               }
-               else if (!strncmp(requestPTR,KEY_QUERY_JOBS,sizeof(KEY_QUERY_JOBS)-1)) { 
-                       edg_wlc_JobId *jobsOut = NULL;
-                       edg_wll_JobStat *statesOut = NULL;
-                       edg_wll_QueryRec **conditions = NULL;
-                       int i,j, flags = 0;
-
-                       if (parseQueryJobsRequest(ctx, messageBody, &conditions, &flags))
-                               ret = HTTP_BADREQ;
-
-                       else { 
-                               int             fatal = 0,
-                                               retCode;
- 
-                               if (flags & EDG_WLL_STAT_NO_JOBS) { 
-                                       flags -= EDG_WLL_STAT_NO_JOBS;
-                                       jobsOut = NULL;
-                                       if (flags & EDG_WLL_STAT_NO_STATES) {
-                                               flags -= EDG_WLL_STAT_NO_STATES;
-                                               statesOut = NULL;
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, NULL, NULL);
-                                       }
-                                       else
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, NULL, &statesOut);
-                               }
-                               else {
-                                       if (flags & EDG_WLL_STAT_NO_STATES) {
-                                               flags -= EDG_WLL_STAT_NO_STATES;
-                                               statesOut = NULL;
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, &jobsOut, NULL);
-                                       }
-                                       else
-                                               retCode = edg_wll_QueryJobsServer(ctx, (const edg_wll_QueryRec **)conditions, flags, &jobsOut, &statesOut);
-                               }
-                               
-                               switch ( retCode ) {
-                                       // case EPERM : ret = HTTP_UNAUTH;
-                                       //              /* soft-error fall through */
-                                       case 0: if (html) ret =  HTTP_NOTIMPL;
-                                               else ret = HTTP_OK;
-
-                                               break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM: ret = HTTP_UNAUTH; break;
-                                       case E2BIG: ret = HTTP_UNAUTH; break;
-                                       case EINVAL: ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               if (!html && !fatal)
-                                       if (edg_wll_QueryJobsToXML(ctx, jobsOut, statesOut, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-
-                       if (conditions) {
-                               for (j = 0; conditions[j]; j++) {
-                                       for (i = 0; (conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&conditions[j][i]);
-                                       free(conditions[j]);
-                               }
-                               free(conditions);
-                       }
-
-                       if (jobsOut) {
-                               for (i=0; jobsOut[i]; i++) edg_wlc_JobIdFree(jobsOut[i]);
-                               free(jobsOut);
-                       }
-                       if (statesOut) {
-                               for (i=0; statesOut[i].state != EDG_WLL_JOB_UNDEF; i++) 
-                                       edg_wll_FreeStatus(&(statesOut[i]));
-                               edg_wll_FreeStatus(&(statesOut[i])); /* free last line */
-                               free(statesOut);
-                       }
-               }
-               else if (!strncmp(requestPTR,KEY_PURGE_REQUEST,sizeof(KEY_PURGE_REQUEST)-1)) {
-                       edg_wll_PurgeRequest    request;
-
-                       ctx->p_tmp_timeout.tv_sec = 86400;  
-
-                       if ( !parsePurgeRequest(ctx,messageBody,(int (*)()) edg_wll_StringToStat,&request) )
-                               edg_wll_PurgeServer(ctx, (const edg_wll_PurgeRequest *)&request);
-
-                       if ( request.jobs )
-                       {
-                               int i;
-                               for ( i = 0; request.jobs[i]; i++ )
-                                       free(request.jobs[i]);
-                               free(request.jobs);
-                       }
-
-                       /*
-                        * response allready sent from edg_wll_PurgeServer() - return NULL results
-                        */
-                       *response = NULL;
-                       *headersOut = NULL;
-                       *bodyOut = NULL;
-                       return edg_wll_Error(ctx,NULL,NULL);
-               }
-               else if (!strncmp(requestPTR,KEY_DUMP_REQUEST,sizeof(KEY_DUMP_REQUEST)-1)) {
-                       edg_wll_DumpRequest     request;
-                       edg_wll_DumpResult      result;
-               
-                       ctx->p_tmp_timeout.tv_sec = 86400;  
-
-                       memset(&request,0,sizeof(request));     
-                       memset(&result,0,sizeof(result));
-                       
-                       if (parseDumpRequest(ctx, messageBody, &request))
-                               ret = HTTP_BADREQ;
-                       else {
-                               int     fatal = 0;
-                               
-                               switch (edg_wll_DumpEvents(ctx,(const edg_wll_DumpRequest *) &request, &result)) {
-                                       case 0: if (html) ret = HTTP_NOTIMPL;
-                                               else      ret = HTTP_OK; 
-                                               break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM : ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               /* glue errors (if eny) to XML responce */ 
-                               if (!html && !fatal)
-                                       if (edg_wll_DumpResultToXML(ctx, &result, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-
-                       free(result.server_file);
-               }
-               else if (!strncmp(requestPTR,KEY_LOAD_REQUEST,sizeof(KEY_LOAD_REQUEST)-1)) {
-                       edg_wll_LoadRequest     request;
-                       edg_wll_LoadResult      result;
-               
-                       ctx->p_tmp_timeout.tv_sec = 86400;  
-
-                       memset(&request,0,sizeof(request));     
-                       memset(&result,0,sizeof(result));
-                       
-                       if (parseLoadRequest(ctx, messageBody, &request))
-                               ret = HTTP_BADREQ;
-                       else {
-                               int     fatal = 0;
-                               
-                               switch (edg_wll_LoadEvents(ctx,(const edg_wll_LoadRequest *) &request, &result)) {
-                                       case 0: if (html) ret = HTTP_NOTIMPL;
-                                               else      ret = HTTP_OK; 
-                                               break;
-                                       case EEXIST: ret = HTTP_OK; break;
-                                       case EINVAL: ret = HTTP_INVALID; break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM : ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               /* glue errors (if eny) to XML responce */ 
-                               if (!html && !fatal)
-                                       if (edg_wll_LoadResultToXML(ctx, &result, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-
-                       free(result.server_file);
-               }
-               else if (!strncmp(requestPTR,KEY_INDEXED_ATTRS,sizeof(KEY_INDEXED_ATTRS)-1)) {
-                       if (!html)
-                               if (edg_wll_IndexedAttrsToXML(ctx, &message))
-                                       ret = HTTP_INTERNAL;
-               }
-               else if (!strncmp(requestPTR,KEY_NOTIF_REQUEST,sizeof(KEY_NOTIF_REQUEST)-1)) {
-                       char *function, *address;
-                       edg_wll_NotifId notifId;
-                       edg_wll_NotifChangeOp op;
-                       edg_wll_QueryRec **conditions;
-                       time_t validity = -1;
-                       int i,j;
-                       
-                       
-                       if (parseNotifRequest(ctx, messageBody, &function, &notifId, 
-                                               &address, &op, &conditions))
-                               ret = HTTP_BADREQ;
-                       else {
-                               int     fatal = 0, err = 0;
-                               
-                               // XXX presne poradi parametru zatim neni znamo
-                               // navratove chyby nejsou zname, nutno predelat dle aktualni situace
-                               if (!strcmp(function,"New")) 
-                                       err = edg_wll_NotifNewServer(ctx,
-                                                               (edg_wll_QueryRec const * const *)conditions,
-                                                               address, notifId, &validity);
-                               else if (!strcmp(function,"Bind"))
-                                       err = edg_wll_NotifBindServer(ctx, notifId, address, &validity);
-                               else if (!strcmp(function,"Change"))
-                                       err = edg_wll_NotifChangeServer(ctx, notifId,
-                                                               (edg_wll_QueryRec const * const *)conditions, op);
-                               else if (!strcmp(function,"Refresh"))
-                                       err = edg_wll_NotifRefreshServer(ctx, notifId, &validity);
-                               else if (!strcmp(function,"Drop"))
-                                       err = edg_wll_NotifDropServer(ctx, notifId);
-                               
-                               switch (err) {
-                                       case 0: if (html) ret = HTTP_NOTIMPL;
-                                               else      ret = HTTP_OK; 
-                                               break;
-                                       case EEXIST: ret = HTTP_OK; break;
-                                       case EINVAL: ret = HTTP_INVALID; break;
-                                       case ENOENT: ret = HTTP_NOTFOUND; break;
-                                       case EPERM : ret = HTTP_UNAUTH; break;
-                                       case EDG_WLL_ERROR_NOINDEX: ret = HTTP_UNAUTH; break;
-                                       case ENOMEM: fatal = 1; ret = HTTP_INTERNAL; break;
-                                       default: ret = HTTP_INTERNAL; break;
-                               }
-                               /* glue errors (if eny) to XML responce */ 
-                               if (!html && !fatal)
-                                       if (edg_wll_NotifResultToXML(ctx, validity, &message))
-                                               ret = HTTP_INTERNAL;
-                       }
-                       
-                       free(function);
-                       free(address);
-                       edg_wll_NotifIdFree(notifId);
-                       if (conditions) {
-                               for (j = 0; conditions[j]; j++) {
-                                       for (i = 0; (conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                               edg_wll_QueryRecFree(&conditions[j][i]);
-                                       free(conditions[j]);
-                               }
-                               free(conditions);
-                       }
-               }
-                       
-        /* POST [something else]: not understood */
-               else ret = HTTP_BADREQ;
-
-/* other HTTP methods */
-       } else ret = HTTP_NOTALLOWED;
-
-err:   asprintf(response,"HTTP/1.1 %d %s",ret,edg_wll_HTTPErrorMessage(ret));
-       *headersOut = (char **) response_headers;
-       if ((ret != HTTP_OK) && html)
-               *bodyOut = edg_wll_ErrorToHTML(ctx,ret);
-       else
-               *bodyOut = message;
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.server/src/lb_proto.h b/org.glite.lb.server/src/lb_proto.h

deleted file mode 100644 (file)

index aea3957..0000000
--- a/org.glite.lb.server/src/lb_proto.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _LB_PROTO_H
-#define _LB_PROTO_H
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-
-extern const char* const response_headers[];
-
-/* Handle a single request of the LB server protocol 
- * returns a complete response string (may contain a formatted error
- * message)
- * or NULL on fatal error*/
-
-extern edg_wll_ErrorCode edg_wll_Proto(
-       edg_wll_Context,        /* INOUT: context */
-       char *,         /* IN: HTTP request line */
-       char **,        /* IN: HTTP message headers */
-       char *,         /* IN: HTTP message body */
-       char **,        /* OUT: HTTP response line */
-       char ***,       /* OUT: HTTP response headers */
-       char **         /* OUT: HTTP response body */
-);
-
-extern char *edg_wll_HTTPErrorMessage(int);
-
-#endif
diff --git a/org.glite.lb.server/src/lb_xml_parse.c.T b/org.glite.lb.server/src/lb_xml_parse.c.T

deleted file mode 100644 (file)

index 13254e4..0000000
--- a/org.glite.lb.server/src/lb_xml_parse.c.T
+++ /dev/null
@@ -1,1731 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <expat.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-#include "glite/lb/xml_conversions.h"
-
-#include "glite/lb/purge.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/load.h"
-
-#include "lb_xml_parse.h"
-
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-
-#define QUERY_EVENTS_BEGIN     "<edg_wll_QueryEventsResult"
-#define QUERY_EVENTS_END       "</edg_wll_QueryEventsResult>\r\n"
-#define QUERY_JOBS_BEGIN       "<edg_wll_QueryJobsResult"
-#define QUERY_JOBS_END         "</edg_wll_QueryJobsResult>\r\n"
-#define PURGE_RESULT_BEGIN     "<edg_wll_PurgeResult"
-#define PURGE_RESULT_END       "</edg_wll_PurgeResult>\r\n"
-#define DUMP_RESULT_BEGIN      "<edg_wll_DumpResult"
-#define DUMP_RESULT_END                "</edg_wll_DumpResult>\r\n"
-#define LOAD_RESULT_BEGIN      "<edg_wll_LoadResult"
-#define LOAD_RESULT_END                "</edg_wll_LoadResult>\r\n"
-#define INDEXED_ATTRS_BEGIN    "<edg_wll_GetIndexedAttributesResult"
-#define INDEXED_ATTRS_END      "</edg_wll_GetIndexedAttributesResult>\r\n"
-#define NOTIF_RESULT_BEGIN     "<edg_wll_NotifResult"
-#define NOTIF_RESULT_END       "</edg_wll_NotifResult>\r\n"
-
-
-
-// XXX will be redundant soon
-#define USERJOBS_BEGIN         "<edg_wll_UserJobs"
-#define USERJOBS_END           "</edg_wll_UserJobs>\r\n"
-
-
-static char    *ops[] = { "equal","less","greater","within","unequal" },
-               *attrs[] = {    "jobid","owner","status","location","destination",
-                               "donecode","usertag","time","level","host","source",
-                               "instance","type","chkpt_tag", "resubmitted", "parent_job", "exitcode" };
-
-static const struct timeval null_timeval = {0,0};
-
-#define unexp() {\
-       char    *e;\
-\
-       if (XMLCtx->errtxt) {\
-               asprintf(&e,"%s\nunexpected <%s> at line %d",XMLCtx->errtxt,\
-                       el,XML_GetCurrentLineNumber(XMLCtx->p));\
-               free(XMLCtx->errtxt);\
-       } else asprintf(&e,"unexpected <%s> at line %d",\
-               el,XML_GetCurrentLineNumber(XMLCtx->p));\
-       XMLCtx->errtxt = e;\
-}
-
-
-
-static void startJobQueryRec(void *data, const char *el, const char **attr)
-{
-       unsigned int    i;
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"and")) unexp()
-                       break;
-               case 1: if (strcasecmp(el,"orJobConditions")) unexp()
-                       else {
-                               XMLCtx->position = -1;
-                               XMLCtx->job_conditions = realloc(XMLCtx->job_conditions,
-                                       (++XMLCtx->row+2)*sizeof(*XMLCtx->job_conditions));
-                               XMLCtx->job_conditions[XMLCtx->row] = NULL;
-                               XMLCtx->job_conditions[XMLCtx->row+1] = NULL;
-                       }
-                       break;
-               case 2:
-                       for (i=0; i<sizeof(ops)/sizeof(ops[0]); i++)
-                               if (!strcasecmp(el,ops[i])) break;
-                       if (i == sizeof(ops)/sizeof(ops[0])) unexp()
-                       else {
-                               if (!XMLCtx->job_conditions) break;
-
-                               /* malloc also terminator and set it to 0 (= EDG_WLL_QUERY_ATTR_UNDEF) */
-                               XMLCtx->job_conditions[XMLCtx->row] = realloc(XMLCtx->job_conditions[XMLCtx->row],
-                                       (++XMLCtx->position+2)*sizeof(**XMLCtx->job_conditions));
-                               memset(&XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position],0,2*sizeof(**XMLCtx->job_conditions));
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].op = i;
-                               XMLCtx->bound = 0;
-                       }
-                       break;
-               case 3: for (i=0; i<sizeof(attrs)/sizeof(attrs[0]) && 
-                               strcasecmp(el,attrs[i]); i++);
-                       if (i == sizeof(attrs)/sizeof(attrs[0])) unexp()
-                       else {
-                               if (!XMLCtx->job_conditions) break;
-                               if (!XMLCtx->job_conditions[XMLCtx->row]) break;
-
-                               if ( (i+1) == EDG_WLL_QUERY_ATTR_USERTAG) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                       if (strcmp(attr[0],"name")) { unexp() break;}
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.tag = strdup(attr[1]);
-                               } 
-                               else if ( (i+1) == EDG_WLL_QUERY_ATTR_TIME) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                        if (attr[0] && strcmp(attr[0],"state")) { unexp() break;}
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]);
-                               }
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr = i+1;
-                       }               
-                       break;
-               default: unexp(); break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startQueryJobsRequest(void *data, const char *el, const char **attr)
-{
-       unsigned int    i;
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_QueryJobsRequest")) { unexp() break; }
-                       for ( i = 0; attr[i] && attr[i+1]; i += 2 )
-                       {
-                               if ( !strcmp(attr[i],"softLimit") )
-                                       XMLCtx->ctx->softLimit = atoi(attr[i+1]);
-                               else if ( !strcmp(attr[i],"queryRes") )
-                                       XMLCtx->ctx->p_query_results = atoi(attr[i+1]);
-                               else { unexp() break; }
-                       }
-                       break;
-               case 1: if (!strcasecmp(el,"and")) {
-                               XMLCtx->jobQueryRec_begin = XML_GetCurrentByteIndex(XMLCtx->p);
-                               break;
-                       }
-                       else if (!strcasecmp(el,"flags")) break;
-                       else unexp()
-                       break;
-               case 2: /* fall through */
-               case 3: /* do not check xml tags, processed in startJobQueryRec */
-               case 4: break;
-               default: unexp(); break;
-       }
-       XMLCtx->level++;
-}
-
-
-static void startQueryEventsRequest(void *data, const char *el, const char **attr UNUSED_VAR)
-{
-       unsigned int    i;
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_QueryEventsRequest")) { unexp() break; }
-                       for ( i = 0; attr[i] && attr[i+1]; i += 2 )
-                       {
-                               if ( !strcmp(attr[i],"softLimit") )
-                                       XMLCtx->ctx->softLimit = atoi(attr[i+1]);
-                               else if ( !strcmp(attr[i],"queryRes") )
-                                       XMLCtx->ctx->p_query_results = atoi(attr[i+1]);
-                               else { unexp() break; }
-                       }
-                       break;
-               case 1: if (strcasecmp(el,"and")) unexp()
-                       break;
-               case 2: if (!strcasecmp(el,"orJobConditions")) {
-                               XMLCtx->type = EDG_WLL_QUERY_TYPE_JOB_CONDITION;
-                               XMLCtx->position = -1;
-                                XMLCtx->job_conditions = realloc(XMLCtx->job_conditions,
-                                        (++XMLCtx->row+2)*sizeof(*XMLCtx->job_conditions));
-                                XMLCtx->job_conditions[XMLCtx->row] = NULL;
-                                XMLCtx->job_conditions[XMLCtx->row+1] = NULL;
-
-                       }
-                       else if (!strcasecmp(el,"orEventConditions")) {
-                               XMLCtx->type = EDG_WLL_QUERY_TYPE_EVENT_CONDITION;
-                               XMLCtx->position2 = -1;
-                                XMLCtx->event_conditions = realloc(XMLCtx->event_conditions,
-                                        (++XMLCtx->row2+2)*sizeof(*XMLCtx->event_conditions));
-                                XMLCtx->event_conditions[XMLCtx->row2] = NULL;
-                                XMLCtx->event_conditions[XMLCtx->row2+1] = NULL;
-                       }
-                       else unexp()
-                       break;
-               case 3:
-                       for (i=0; i<sizeof(ops)/sizeof(ops[0]); i++)
-                               if (!strcasecmp(el,ops[i])) break;
-                       if (i == sizeof(ops)/sizeof(ops[0])) unexp()
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_JOB_CONDITION) {
-                               if (!XMLCtx->job_conditions) break;
-
-                               /* malloc also terminator and set it to 0 (= EDG_WLL_QUERY_ATTR_UNDEF) */
-                               XMLCtx->job_conditions[XMLCtx->row] = realloc(XMLCtx->job_conditions[XMLCtx->row],
-                                       (++XMLCtx->position+2)*sizeof(**XMLCtx->job_conditions));
-                               memset(&XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position],0,2*sizeof(**XMLCtx->job_conditions));
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].op = i;
-                               XMLCtx->bound = 0;
-                       }
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_EVENT_CONDITION) {
-                               if (!XMLCtx->event_conditions) break;
-                               /* malloc also terminator and set it to 0 (= EDG_WLL_QUERY_ATTR_UNDEF) */
-                               XMLCtx->event_conditions[XMLCtx->row2] = realloc(XMLCtx->event_conditions[XMLCtx->row2],
-                                       (++XMLCtx->position2+2)*sizeof(**XMLCtx->event_conditions));
-                               memset(&XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2],0,2*sizeof(**XMLCtx->event_conditions));
-                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].op = i;
-                               XMLCtx->bound = 0;
-                       }
-                       
-                       break;
-               case 4: for (i=0; i<sizeof(attrs)/sizeof(attrs[0]) && 
-                               strcasecmp(el,attrs[i]); i++);
-                       if (i == sizeof(attrs)/sizeof(attrs[0])) unexp()
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_JOB_CONDITION) { 
-                               if (!XMLCtx->job_conditions[XMLCtx->row]) break;
-                               if ( (i+1) == EDG_WLL_QUERY_ATTR_USERTAG) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                       if (attr[0] && strcmp(attr[0],"name")) { unexp() break;}
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.tag = strdup(attr[1]);
-                               } 
-                               else if ( (i+1) == EDG_WLL_QUERY_ATTR_TIME) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                        if (attr[0] && strcmp(attr[0],"state")) { unexp() break;}
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]);
-                                       printf("\nchecking time attr\n%s = %s (%d)\n\n", attr[0], attr[1], edg_wll_StringToStat(attr[1]));
-                               }
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr = i+1;
-                       }
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_EVENT_CONDITION) {
-                               if (!XMLCtx->event_conditions[XMLCtx->row2]) break;
-                               if ( (i+1) == EDG_WLL_QUERY_ATTR_USERTAG) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                       if (attr[0] && strcmp(attr[0],"name")) { unexp() break;}
-                                       XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position].attr_id.tag = strdup(attr[1]);
-                               } 
-                               else if ( (i+1) == EDG_WLL_QUERY_ATTR_TIME) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                        if (attr[0] && strcmp(attr[0],"state")) { unexp() break;}
-                                       XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]);
-                               }
-                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].attr = i+1;
-                       }
-                       break;
-               default: unexp(); break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startPurgeRequest(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_PurgeRequest")) unexp()
-                       break;
-               case 1: if (strcasecmp(el,"jobs") && strcasecmp(el,"timeout")
-                               && strcasecmp(el,"flags")) unexp()
-                       else 
-                               XMLCtx->position = 0;
-                       break;
-               case 2: if (!strcasecmp(el,"jobId")) {
-                               XMLCtx->purgeRequestGlobal.jobs = realloc(XMLCtx->purgeRequestGlobal.jobs,
-                                               (XMLCtx->position+2) * sizeof(XMLCtx->purgeRequestGlobal.jobs));
-
-                                if (!XMLCtx->purgeRequestGlobal.jobs) { 
-                                       edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); 
-                                       unexp() return;
-                               }
-                                XMLCtx->purgeRequestGlobal.jobs[XMLCtx->position+1] = NULL;
-                       }
-                       else if (XMLCtx->tagToIndex(el) >= 0 ) {
-                               /* static array, no need to initialize & allocate anything */
-                       }
-                       else 
-                               unexp()
-                       break;
-               default: unexp() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-
-static void startDumpRequest(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_DumpRequest")) unexp()
-                       break;
-               case 1: if (strcasecmp(el,"from") && strcasecmp(el,"to")) unexp()
-                       break;
-               default: unexp() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startLoadRequest(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_LoadRequest")) unexp()
-                       break;
-               case 1: if (strcasecmp(el,"server_file")) unexp()
-                       break;
-               default: unexp() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startNotifRequest(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (!strcasecmp(el,"edg_wll_NotifRequest") && attr[0] && attr[1]) {
-                               if (strcmp(attr[0],"function")) { unexp() break;}
-                               else XMLCtx->notifFunction = strdup(attr[1]);
-                       }
-                       else unexp()
-                       break;
-               case 1: if (!strcasecmp(el,"and")) {
-                               XMLCtx->jobQueryRec_begin = XML_GetCurrentByteIndex(XMLCtx->p);
-                       }
-                       else if ( (strcasecmp(el,"notifId")) && (strcasecmp(el,"clientAddress")) && 
-                               (strcasecmp(el,"notifChangeOp")) ) unexp()
-                       break;
-               case 2: /* fall through */
-               case 3: /* do not check xml tags, processed in startJobQueryRec */
-               case 4: break;
-               default: unexp() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-#undef unexp
-
-
-static void char_handler(void *data, const char *s, int len)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        int i, found = -1, temp_len1;
-       char *temp_s, *temp_s1;
-
-
-       /* if date are only spaces, t\, \r, \n ... don't bother with them */
-        for (i=0; i<len; i++)  
-                       if (!isspace(s[i])) { found = i; break; }
-        if (found == -1) return;
-
-       temp_s = malloc(len+1);
-
-       /* otherwise use them */
-       memcpy(temp_s,s,len);
-       temp_s[len] = 0;        
-       temp_s1 = edg_wll_UnescapeXML((const char *) temp_s);
-       temp_len1 = strlen(temp_s1);
-
-        if (XMLCtx->char_buf_len) XMLCtx->char_buf =
-               realloc(XMLCtx->char_buf,XMLCtx->char_buf_len+temp_len1 + 1);
-        else XMLCtx->char_buf = malloc(temp_len1 + 1);
-
-        memcpy(XMLCtx->char_buf+XMLCtx->char_buf_len,temp_s1,temp_len1 + 1);
-        XMLCtx->char_buf_len += temp_len1;
-       free(temp_s1);
-       free(temp_s);
-}
-
-
-
-static void endJobQueryRec(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       char *e;
-
-
-       if (XMLCtx->level == 4 &&
-               XMLCtx->job_conditions != NULL &&
-               XMLCtx->job_conditions[XMLCtx->row] != NULL) {
-               switch (XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr) {
-                       case EDG_WLL_QUERY_ATTR_JOBID:
-                       case EDG_WLL_QUERY_ATTR_PARENT:
-                               if ( (XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.j = 
-                                       edg_wll_from_string_to_jobid(XMLCtx)) == NULL )
-                               {
-                                       if (XMLCtx->errtxt) {
-                                               asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                                       XMLCtx->errtxt, XMLCtx->char_buf,
-                                                       XML_GetCurrentLineNumber(XMLCtx->p));
-                                               free(XMLCtx->errtxt);
-                                       } else asprintf(&e,"%s: invalid JobId at line %d",
-                                               XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                       XMLCtx->errtxt = e;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_OWNER:
-                       // XXX - this is way how to pass NULL, user will be extracted from ssl partner later
-                               if (XMLCtx->char_buf != NULL && !strcmp(XMLCtx->char_buf,"NULL")) {  
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.c = NULL; 
-                                       break; 
-                               }
-                               else /* fall through */
-                       case EDG_WLL_QUERY_ATTR_LOCATION:
-                       case EDG_WLL_QUERY_ATTR_DESTINATION:
-                       case EDG_WLL_QUERY_ATTR_USERTAG:
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.c = 
-                                       edg_wll_from_string_to_string(XMLCtx);
-                               break;
-                       case EDG_WLL_QUERY_ATTR_STATUS:
-                               if ( !XMLCtx->bound )
-                               {
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.i = 
-                                               edg_wll_from_string_to_edg_wll_JobStatCode(XMLCtx);
-                                       XMLCtx->bound++;
-                               }
-                               else
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.i = 
-                                               edg_wll_from_string_to_edg_wll_JobStatCode(XMLCtx);
-
-                               break;
-                       case EDG_WLL_QUERY_ATTR_DONECODE:
-                       case EDG_WLL_QUERY_ATTR_EXITCODE:
-                       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                               if ( !XMLCtx->bound )
-                               {
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.i = 
-                                               edg_wll_from_string_to_int(XMLCtx);
-                                       XMLCtx->bound++;
-                               }
-                               else
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.i = 
-                                               edg_wll_from_string_to_int(XMLCtx);
-
-                               break;
-                       case EDG_WLL_QUERY_ATTR_TIME:
-                               if ( !XMLCtx->bound )
-                               {
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.t.tv_sec = 
-                                               edg_wll_from_string_to_time_t(XMLCtx);
-                                       XMLCtx->bound++;
-                               }
-                               else
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.t.tv_sec =
-                                               edg_wll_from_string_to_time_t(XMLCtx);
-                               break;
-                       default: 
-                               edg_wll_freeBuf(XMLCtx);
-                               XMLCtx->level--;
-                               if (XMLCtx->errtxt) {
-                                       asprintf(&e,"%s\n%s: invalid attribute type at line %d",
-                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                       free(XMLCtx->errtxt);
-                               } else asprintf(&e,"%s: invalid attribute type at line %d",
-                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                               XMLCtx->errtxt = e;
-                               break;
-               }
-       }
-        XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-static void endQueryJobsRequest(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       if (XMLCtx->level == 2) {
-               if (!strcmp(XMLCtx->element,"flags") && XMLCtx->char_buf) {
-                       // XXX: check if it works
-                        XMLCtx->flags = edg_wll_string_to_stat_flags(XMLCtx->char_buf);
-               }
-               else if (!strcmp(el,"and")) {
-                       long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                                       -  XMLCtx->jobQueryRec_begin;
-
-                       parseJobQueryRec(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->jobQueryRec_begin, len,
-                               &XMLCtx->job_conditions);
-               }
-       }
-        XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-static void endQueryEventsRequest(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       char *e;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"orJobConditions")) {
-                        /* make end-of-row */
-                        XMLCtx->job_conditions[XMLCtx->row] = realloc(XMLCtx->job_conditions[XMLCtx->row],
-                                (++XMLCtx->position+1)*sizeof(**XMLCtx->job_conditions));
-                        memset(&XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position],0,sizeof(**XMLCtx->job_conditions));
-                }
-               else if (!strcmp(XMLCtx->element,"orEventConditions")) {
-                        /* make end-of-row */
-                        XMLCtx->event_conditions[XMLCtx->row2] = realloc(XMLCtx->event_conditions[XMLCtx->row2],
-                                (++XMLCtx->position2+1)*sizeof(**XMLCtx->event_conditions));
-                        memset(&XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2],0,sizeof(**XMLCtx->event_conditions));
-                }
-       }
-       else if (XMLCtx->level == 5) {
-               if (XMLCtx->type == EDG_WLL_QUERY_TYPE_JOB_CONDITION &&
-                       XMLCtx->job_conditions != NULL &&
-                       XMLCtx->job_conditions[XMLCtx->row] !=NULL) {
-                       switch (XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr) {
-                               case EDG_WLL_QUERY_ATTR_JOBID:
-                               case EDG_WLL_QUERY_ATTR_PARENT:
-                                       if ( (XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.j = 
-                                               edg_wll_from_string_to_jobid(XMLCtx)) == NULL )
-                                       {
-                                               if (XMLCtx->errtxt) {
-                                                       asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                                       free(XMLCtx->errtxt);
-                                               } else asprintf(&e,"%s: invalid JobId at line %d",
-                                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                               XMLCtx->errtxt = e;
-                                       }
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_OWNER:
-                               case EDG_WLL_QUERY_ATTR_LOCATION:
-                               case EDG_WLL_QUERY_ATTR_DESTINATION:
-                               case EDG_WLL_QUERY_ATTR_USERTAG:
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.c = 
-                                               edg_wll_from_string_to_string(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_STATUS:
-                               case EDG_WLL_QUERY_ATTR_DONECODE:
-                               case EDG_WLL_QUERY_ATTR_EXITCODE:
-                               case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.i = 
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.i = 
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_TIME:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.t.tv_sec = 
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.t.tv_sec =
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                       break;
-                               default: 
-                                       edg_wll_freeBuf(XMLCtx);
-                                       XMLCtx->level--;
-                                       if (XMLCtx->errtxt) {
-                                               asprintf(&e,"%s\n%s: invalid attribute type at line %d",
-                                                       XMLCtx->errtxt, XMLCtx->char_buf,
-                                                       XML_GetCurrentLineNumber(XMLCtx->p));
-                                               free(XMLCtx->errtxt);
-                                       } else asprintf(&e,"%s: invalid attribute type at line %d",
-                                               XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                       XMLCtx->errtxt = e;
-                                       break;
-                       }
-               }
-               else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_EVENT_CONDITION &&
-                       XMLCtx->event_conditions != NULL &&
-                       XMLCtx->event_conditions[XMLCtx->row2] != NULL) {
-                       switch (XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].attr) {
-                               case EDG_WLL_QUERY_ATTR_TIME:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value.t.tv_sec = 
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value2.t.tv_sec =
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_LEVEL:
-                               case EDG_WLL_QUERY_ATTR_SOURCE:
-                               case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value.i =
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value2.i =
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_HOST:
-                               case EDG_WLL_QUERY_ATTR_INSTANCE:
-                               case EDG_WLL_QUERY_ATTR_USERTAG:
-                                       XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value.c =
-                                               edg_wll_from_string_to_string(XMLCtx);
-                                       break;
-                               default: 
-                                       edg_wll_freeBuf(XMLCtx);
-                                       XMLCtx->level--;
-                                       if (XMLCtx->errtxt) {
-                                               asprintf(&e,"%s\n%s: invalid attribute type at line %d",
-                                                       XMLCtx->errtxt, XMLCtx->char_buf,
-                                                       XML_GetCurrentLineNumber(XMLCtx->p));
-                                               free(XMLCtx->errtxt);
-                                       } else asprintf(&e,"%s: invalid attribute type at line %d",
-                                               XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                       XMLCtx->errtxt = e;
-                                       break;
-                       }
-               } 
-       
-               XMLCtx->char_buf = NULL;
-               XMLCtx->char_buf_len = 0;
-       }
-       XMLCtx->level--;
-}
-
-
-static void endPurgeRequest(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        char *e;
-       int index;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"flags")) 
-                       XMLCtx->purgeRequestGlobal.flags = edg_wll_string_to_purge_flags(XMLCtx->char_buf);
-       }
-       else if (XMLCtx->level == 3) {
-               if (!strcmp(XMLCtx->element,"jobId") && XMLCtx->purgeRequestGlobal.jobs != NULL) {
-                       if ( (XMLCtx->purgeRequestGlobal.jobs[XMLCtx->position++] = 
-                               edg_wll_from_string_to_string(XMLCtx)) == NULL )
-                       {
-                               if (XMLCtx->errtxt) {
-                                       asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                       free(XMLCtx->errtxt);
-                               } else asprintf(&e,"%s: invalid JobId at line %d",
-                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                               XMLCtx->errtxt = e;
-                       }
-               }
-               else if ( ((index = XMLCtx->tagToIndex(XMLCtx->element)) >= 0 ) && XMLCtx->char_buf ) {
-                       XMLCtx->purgeRequestGlobal.timeout[index] = 
-                               edg_wll_from_string_to_time_t(XMLCtx);
-               }
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-static void endDumpRequest(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"from")) {
-                       if (isdigit(XMLCtx->char_buf[0]))
-                       XMLCtx->dumpRequestGlobal.from = edg_wll_from_string_to_time_t(XMLCtx);
-                       else
-                               XMLCtx->dumpRequestGlobal.from = edg_wll_StringToDumpConst(XMLCtx->char_buf);
-               }
-               else if (!strcmp(XMLCtx->element,"to")) {
-                       if (isdigit(XMLCtx->char_buf[0]))
-                        XMLCtx->dumpRequestGlobal.to = edg_wll_from_string_to_time_t(XMLCtx);
-                       else
-                               XMLCtx->dumpRequestGlobal.to = edg_wll_StringToDumpConst(XMLCtx->char_buf);
-               }
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-static void endLoadRequest(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"server_file")) 
-                       XMLCtx->loadRequestGlobal.server_file = edg_wll_from_string_to_string(XMLCtx);
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-static void endNotifRequest(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-       char *pom;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"notifId")) {
-                       pom = edg_wll_from_string_to_string(XMLCtx);
-                       edg_wll_NotifIdParse(pom, &XMLCtx->notifId);
-                       free(pom);
-               }
-               else if (!strcmp(XMLCtx->element,"clientAddress")) {
-                       XMLCtx->notifClientAddress = edg_wll_from_string_to_string(XMLCtx);
-               }
-               else if (!strcmp(XMLCtx->element,"notifChangeOp")) {
-                       pom = edg_wll_from_string_to_string(XMLCtx);
-                       XMLCtx->notifChangeOp = edg_wll_StringToNotifChangeOp(pom);
-                       free(pom);
-               }
-               else if (!strcmp(el,"and")) {
-                       long len = (XML_GetCurrentByteIndex(XMLCtx->p) + XML_GetCurrentByteCount(XMLCtx->p))
-                                       -  XMLCtx->jobQueryRec_begin;
-       
-                       parseJobQueryRec(XMLCtx->ctx, XMLCtx->message_body + XMLCtx->jobQueryRec_begin, len,
-                               &XMLCtx->job_conditions);
-               }
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-
-int parseJobQueryRec(edg_wll_Context ctx, const char *messageBody, long len, edg_wll_QueryRec ***conditions)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.row = -1;
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startJobQueryRec, endJobQueryRec);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, len, 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i,j;
-
-               if (XMLCtx.job_conditions) {
-                       for (j = 0; XMLCtx.job_conditions[j]; j++) {
-                               for (i = 0; (XMLCtx.job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.job_conditions[j][i]);
-                               free(XMLCtx.job_conditions[j]);
-                       }
-                       free(XMLCtx.job_conditions);
-               }
-
-               /* empty list terminators */
-               conditions[0] = NULL;
-       } else {
-               *conditions = XMLCtx.job_conditions;
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-/* parse queryJobs request from client */
-int parseQueryJobsRequest(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***conditions, int *flags)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       XMLCtx.message_body = messageBody;
-       XMLCtx.position = 0;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startQueryJobsRequest, endQueryJobsRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i,j;
-
-               if (XMLCtx.job_conditions) {
-                       for (j = 0; XMLCtx.job_conditions[j]; j++) {
-                               for (i = 0; (XMLCtx.job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.job_conditions[j][i]);
-                               free(XMLCtx.job_conditions[j]);
-                       }
-                       free(XMLCtx.job_conditions);
-               }
-
-               /* empty list terminators */
-               conditions[0] = NULL;
-               *flags = 0;
-       } else {
-               *conditions = XMLCtx.job_conditions;
-               *flags = XMLCtx.flags;
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-/* parse queryEvents request from client */
-int parseQueryEventsRequest(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***job_conditions, edg_wll_QueryRec ***event_conditions)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.row = -1;
-       XMLCtx.row2 = -1;
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startQueryEventsRequest, endQueryEventsRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i,j;
-
-               if (XMLCtx.job_conditions) {
-                       for (j = 0; XMLCtx.job_conditions[j]; j++) {
-                               for (i = 0 ; (XMLCtx.job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.job_conditions[j][i]);
-                               free(XMLCtx.job_conditions[j]);
-                       }
-                       free(XMLCtx.job_conditions);
-               }
-               if (XMLCtx.event_conditions) {
-                       for (j = 0; XMLCtx.event_conditions[j]; j++) {
-                               for (i = 0 ; (XMLCtx.event_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.event_conditions[j][i]);
-                               free(XMLCtx.event_conditions[j]);
-                       }
-                       free(XMLCtx.event_conditions);
-               }
-
-               /* empty list terminators */
-               job_conditions[0] = NULL;
-               event_conditions[0] = NULL;
-       } else {
-               *job_conditions = XMLCtx.job_conditions;
-               *event_conditions = XMLCtx.event_conditions;
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-
-/* parse purge request from client */
-int parsePurgeRequest(edg_wll_Context ctx, char *messageBody, int (*tagToIndex)(), edg_wll_PurgeRequest *request)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-       XMLCtx.tagToIndex = tagToIndex;
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startPurgeRequest, endPurgeRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i;
-
-               if (XMLCtx.purgeRequestGlobal.jobs) {
-                       for (i=0; XMLCtx.purgeRequestGlobal.jobs[i]; i++) 
-                               free(XMLCtx.purgeRequestGlobal.jobs[i]);
-                       free(XMLCtx.purgeRequestGlobal.jobs);
-               }
-               memset(request,0,sizeof(*request));
-               
-       } else {
-               memcpy(request, &XMLCtx.purgeRequestGlobal, sizeof(XMLCtx.purgeRequestGlobal));
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-
-/* parse dump request from client */
-int parseDumpRequest(edg_wll_Context ctx, char *messageBody, edg_wll_DumpRequest *request)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startDumpRequest, endDumpRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) 
-               memset(request,0,sizeof(*request));
-               
-       else {
-               memcpy(request, &XMLCtx.dumpRequestGlobal, sizeof(XMLCtx.dumpRequestGlobal));
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-/* parse load request from client */
-int parseLoadRequest(edg_wll_Context ctx, char *messageBody, edg_wll_LoadRequest *request)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startLoadRequest, endLoadRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) 
-               memset(request,0,sizeof(*request));
-               
-       else {
-               memcpy(request, &XMLCtx.loadRequestGlobal, sizeof(XMLCtx.loadRequestGlobal));
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-
-/* parse Notif request from client */
-int parseNotifRequest(edg_wll_Context ctx, char *messageBody, char **function, edg_wll_NotifId *notifId, char **address, edg_wll_NotifChangeOp *op, edg_wll_QueryRec ***conditions) 
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       
-       /* returns emty variables as default; only some variables will be filled in */
-       /* depending on vaule of XMLCtx.notifFunction */
-       *function = NULL;
-       *notifId = NULL;
-       *address = NULL;
-       *op = EDG_WLL_NOTIF_NOOP;
-       *conditions = NULL;
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       XMLCtx.message_body = messageBody;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startNotifRequest, endNotifRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i,j;
-
-               if (XMLCtx.job_conditions) {
-                       for (j = 0; XMLCtx.job_conditions[j]; j++) {
-                               for (i = 0; (XMLCtx.job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.job_conditions[j][i]);
-                               free(XMLCtx.job_conditions[j]);
-                       }
-                       free(XMLCtx.job_conditions);
-               }
-               free(XMLCtx.notifFunction);
-               edg_wll_NotifIdFree(&XMLCtx.notifId);
-               free(XMLCtx.notifClientAddress);
-
-               *function = NULL;
-               *notifId = NULL;
-               *address = NULL;
-               *op = EDG_WLL_NOTIF_NOOP;
-               *conditions = NULL;
-       } else {
-               *function = XMLCtx.notifFunction;
-               *notifId = XMLCtx.notifId;
-               *address = XMLCtx.notifClientAddress;
-               *op = XMLCtx.notifChangeOp;
-               *conditions = XMLCtx.job_conditions;
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-int edg_wll_QueryEventsToXML(edg_wll_Context ctx, edg_wll_Event *eventsOut, char **message)
-{
-        char *pomA, *pomB;
-       char **list = NULL;
-        int i = 0, len, tot_len = 0;
-       int *len_list = NULL;
-
-
-        while (eventsOut && eventsOut[i].any.type != EDG_WLL_EVENT_UNDEF) {
-               pomB = edg_wll_EventToString(eventsOut[i].any.type);
-                trio_asprintf(&pomA,"      <edg_wll_Event name=\"%|Xs\">\r\n", pomB);
-               free(pomB);
-               pomB = pomA;
-
-
-@@@{
-        selectType $event '_common_';
-        for (getFieldsOrdered $event) {
-                my $f = selectField $event $_;
-                my $ft = $f->{type};
-               my $n = $f->{null};
-                gen "\tedg_wll_add_$ft\_to_XMLBody(&pomB, eventsOut[i].any.$_, \"$_\", $n);\n";
-        }
-
-        gen "\tswitch (eventsOut[i].any.type) {\n";
-        for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} } getTypes $event) {
-                if ($t ne 'any') {
-                        selectType $event $t;
-                        my $u = uc $t;
-                        gen "\t    case EDG_WLL_EVENT_$u :\n";
-                        for (getFieldsOrdered $event) {
-                                my $f = selectField $event $_;
-                                my $ft = $f->{type};
-                               my $n = $f->{null};
-                               $t = lcfirst $t;
-                                gen "\t\tedg_wll_add_$ft\_to_XMLBody(&pomB, eventsOut[i].$t.$_, \"$_\", $n);\n";
-                        }
-                       gen "\t\tbreak;\n";
-               }
-        }
-        gen "\t    default : break;\n";
-        gen "\t}\n";
-@@@}
-
-
-
-                len = asprintf(&pomA,"%s      </edg_wll_Event>\r\n", pomB);
-                free(pomB);
-                i++;
-               tot_len += len;
-
-               list      = (char **) realloc(list, i * sizeof(*list));
-               list[i-1] = pomA;
-               len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-               len_list[i-1] = len;
-               
-        }
-
-       /* list termination */
-       list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-       /* test errors */
-       if (ctx->errDesc || ctx->errCode)
-               len = trio_asprintf(&pomB," code=\"%d\" desc=\"%|Xs\">\r\n",ctx->errCode,ctx->errDesc);
-       else
-               len = asprintf(&pomB,">\r\n");
-
-       /* glueing all list fields together & freeing the list */
-       pomA = (char *) malloc(tot_len  * sizeof(char) + 
-                               sizeof(QUERY_EVENTS_BEGIN) + len + sizeof(QUERY_EVENTS_END) - 1);
-       
-       memcpy(pomA, QUERY_EVENTS_BEGIN, sizeof(QUERY_EVENTS_BEGIN));
-       memcpy(pomA + sizeof(QUERY_EVENTS_BEGIN) - 1, pomB, len);
-       free(pomB);
-       pomB = pomA + sizeof(QUERY_EVENTS_BEGIN) + len - 1;     
-
-       i = 0;
-       while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-               pomB += len_list[i];
-
-               /* freeing the list */
-               free(list[i]);
-
-                i++;
-        }
-
-       strcpy(pomB, QUERY_EVENTS_END);
-
-
-       free(list);
-       free(len_list);
-
-
-        *message = pomA;
-
-        return 0;
-}
-
-int edg_wll_QueryJobsToXML(edg_wll_Context ctx, edg_wlc_JobId *jobsIn, edg_wll_JobStat *statesIn, char **message) 
-{
-        char *pomA, *pomB, *pomC;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0, nres = 0;
-        int *len_list = NULL;
-
-       
-       if (jobsIn) for (nres = 0; jobsIn[nres]; nres++);
-       else if (statesIn) for (nres = 0; statesIn[nres].state; nres++);
-
-        while (i < nres) {
-                trio_asprintf(&pomA,"\t<edg_wll_Job>\r\n");
-                pomB = pomA;
-               
-               if (jobsIn) {
-                       trio_asprintf(&pomA,"%s\t\t<jobId>%|Xs</jobId>\r\n",
-                               pomB, pomC=edg_wlc_JobIdUnparse(jobsIn[i]));
-                       free(pomC);
-                       free(pomB);
-                       pomB = pomA;
-               }
-
-               if (statesIn) {
-                       edg_wll_JobStatusToXML(ctx, statesIn[i], &pomC);        
-                       trio_asprintf(&pomA,"%s\t\t%s",pomB,pomC);
-               }
-               else {
-                       pomC = edg_wll_StatToString(EDG_WLL_JOB_UNKNOWN);
-                       trio_asprintf(&pomA,"%s\t\t<jobStat name=\"%|Xs\">\r\n\r\n\t\t</jobStat>\r\n",
-                               pomB, pomC);
-               }
-
-               free(pomB);
-               free(pomC);
-               pomB = pomA;
-       
-
-                len = asprintf(&pomA,"%s\t</edg_wll_Job>\r\n", pomB);
-                free(pomB);
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;   
-       }
-       
-       /* list termination */
-       list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* test errors */
-        if (ctx->errDesc || ctx->errCode)
-                len = trio_asprintf(&pomB," code=\"%d\" desc=\"%|Xs\">\r\n",ctx->errCode,ctx->errDesc);
-        else
-                len = asprintf(&pomB,">\r\n");
-
-       /* glueing all list fields together & freeing the list */
-       pomA = (char *) malloc(tot_len  * sizeof(char) + 
-                               sizeof(QUERY_JOBS_BEGIN) + len + sizeof(QUERY_JOBS_END) - 1);
-       
-       memcpy(pomA, QUERY_JOBS_BEGIN, sizeof(QUERY_JOBS_BEGIN));       
-        memcpy((pomA + sizeof(QUERY_JOBS_BEGIN) - 1), pomB, len);
-        free(pomB);
-       pomB = pomA + sizeof(QUERY_JOBS_BEGIN) + len - 1;       
-
-       i = 0;
-       while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-               pomB += len_list[i];
-
-               /* freeing the list */
-               free(list[i]);
-
-                i++;
-        }
-
-       strcpy(pomB, QUERY_JOBS_END);
-
-
-       free(list);
-       free(len_list);
-
-
-        *message = pomA;
-
-       return 0;
-}
-
-/* construct Message-Body of Response-Line for edg_wll_UserJobs */
-int edg_wll_UserJobsToXML(edg_wll_Context ctx, edg_wlc_JobId *jobsOut, char **message)
-{
-        char *pomA, *pomB;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0;
-        int *len_list = NULL;
-
-
-        while (jobsOut[i]) {
-               len = trio_asprintf(&pomA,"      <jobId>%|Xs</jobId>\r\n",
-                       pomB=edg_wlc_JobIdUnparse(jobsOut[i]));
-
-                free(pomB);
-
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-               pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* test errors */
-        if (ctx->errDesc || ctx->errCode)
-                len = trio_asprintf(&pomB," code=\"%d\" desc=\"%|Xs\">\r\n",ctx->errCode,ctx->errDesc);
-        else
-                len = asprintf(&pomB,">\r\n");
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) +
-                                sizeof(USERJOBS_BEGIN) + len + sizeof(USERJOBS_END) - 1);
-
-        memcpy(pomA, USERJOBS_BEGIN, sizeof(USERJOBS_BEGIN));
-        memcpy((pomA + sizeof(USERJOBS_BEGIN) - 1), pomB, len);
-        free(pomB);
-        pomB = pomA + sizeof(USERJOBS_BEGIN) + len - 1;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-
-        strcpy(pomB, USERJOBS_END);
-
-
-        free(list);
-        free(len_list);
-
-
-        *message = pomA;
-
-        return 0;
-}
-
-static void edg_wll_add_stslist_to_XMLBody(edg_wll_Context ctx, char **body, const edg_wll_JobStat *toAdd, const char *tag, const char *UNUSED_subTag, const int null)
-{
-        char *pomA, *pomB, *newBody;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0;
-        int *len_list = NULL;
-
-
-        while (toAdd[i].state != null) {
-                edg_wll_JobStatusToXML(ctx, toAdd[i], &pomA);
-                len = strlen(pomA);
-
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) + 1);
-       pomB = pomA;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-       *pomB = '\0';
-        free(list);
-        free(len_list);
-
-        asprintf(&newBody,"%s\t\t\t<%s>\r\n%s\t\t\t</%s>\r\n", *body, tag, pomA, tag);
-        free(*body);
-        free(pomA);
-        *body = newBody;
-}
-
-
-
-/* construct Message-Body of Response-Line for edg_wll_JobStatus */
-int edg_wll_JobStatusToXML(edg_wll_Context ctx, edg_wll_JobStat stat, char **message)
-{
-        char *pomA, *pomB, *pomC;
-
-       
-       pomB = strdup("");
-
-@@@{
-       selectType $status '_common_';
-        for (getFieldsOrdered $status) {
-                my $f = selectField $status $_;
-               next if defined($f->{special}) && $f->{special} eq 'XMLstructured';
-                my $ft = $f->{type};
-               my $n = $f->{null};
-                gen "edg_wll_add_$ft\_to_XMLBody(&pomB, stat.$_, \"$_\", $n);\n";
-        }
-@@@}
-       if (stat.children) edg_wll_add_strlist_to_XMLBody(&pomB, stat.children, "children", "jobId", "\t\t\t", NULL);
-       if (stat.children_hist) edg_wll_add_intlist_to_XMLBody(&pomB, stat.children_hist, "children_hist", edg_wll_StatToString, "\t\t\t", 1, stat.children_hist[0]);
-       if (stat.children_states) edg_wll_add_stslist_to_XMLBody(ctx, &pomB, stat.children_states, "children_states", "", EDG_WLL_JOB_UNDEF);
-       if (stat.user_tags) edg_wll_add_taglist_to_XMLBody(&pomB, stat.user_tags, "user_tags", "tag", "name", "\t\t\t", NULL);
-       if (stat.stateEnterTimes) edg_wll_add_intlist_to_XMLBody(&pomB, stat.stateEnterTimes, "stateEnterTimes", edg_wll_StatToString, "\t\t\t",1, stat.stateEnterTimes[0]);
-
-       pomC = edg_wll_StatToString(stat.state);
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomA,"<jobStat name=\"%|Xs\" code=\"%d\" desc=\"%|Xs\">\r\n%s</jobStat>",
-                       pomC, ctx->errCode,ctx->errDesc, pomB);
-       else
-               trio_asprintf(&pomA,"<jobStat name=\"%|Xs\">\r\n%s</jobStat>",
-                       pomC, pomB);
-
-        free(pomB);
-       free(pomC);
-
-        *message = pomA;
-
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Purge */
-int edg_wll_PurgeResultToXML(
-                edg_wll_Context ctx,
-               edg_wll_PurgeResult *result,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!result) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       edg_wll_add_strlist_to_XMLBody(&pomA, result->jobs, "jobs", "jobId", "\t", NULL);
-       edg_wll_add_string_to_XMLBody(&pomA, result->server_file, "server_file", NULL); 
-
-       if (ctx->errDesc || ctx->errCode)
-                trio_asprintf(&pomB,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       PURGE_RESULT_BEGIN, ctx->errCode, ctx->errDesc, pomA, PURGE_RESULT_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", PURGE_RESULT_BEGIN, pomA, PURGE_RESULT_END);
-       free(pomA);
-
-        *message = pomB;
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Dump */
-int edg_wll_DumpResultToXML(
-                edg_wll_Context ctx,
-               edg_wll_DumpResult *result,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!result) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       edg_wll_add_string_to_XMLBody(&pomA, result->server_file, "server_file", NULL);
-        if (result->from < 0)
-                edg_wll_add_string_to_XMLBody(&pomA,
-                        edg_wll_DumpConstToString(result->from), "from", NULL);
-        else
-       edg_wll_add_time_t_to_XMLBody(&pomA, result->from, "from", 0);
-        if (result->to < 0)
-                edg_wll_add_string_to_XMLBody(&pomA,
-                        edg_wll_DumpConstToString(result->to), "to", NULL);
-        else
-       edg_wll_add_time_t_to_XMLBody(&pomA, result->to, "to", 0);
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomB,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       DUMP_RESULT_BEGIN, ctx->errCode, ctx->errDesc, pomA, DUMP_RESULT_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", DUMP_RESULT_BEGIN, pomA, DUMP_RESULT_END);
-       free(pomA);
-
-        *message = pomB;
-        return 0;
-}
-
-
-/* construct Message-Body of Request-Line for edg_wll_Load */
-int edg_wll_LoadResultToXML(
-                edg_wll_Context ctx,
-               edg_wll_LoadResult *result,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!result) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       edg_wll_add_string_to_XMLBody(&pomA, result->server_file, "server_file", NULL);
-       edg_wll_add_time_t_to_XMLBody(&pomA, result->from, "from", 0);
-       edg_wll_add_time_t_to_XMLBody(&pomA, result->to, "to", 0);
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomB,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       LOAD_RESULT_BEGIN, ctx->errCode, ctx->errDesc, pomA, LOAD_RESULT_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", LOAD_RESULT_BEGIN, pomA, LOAD_RESULT_END);
-       free(pomA);
-
-        *message = pomB;
-        return 0;
-}
-
-
-/* construct Message-Body of Request-Line for edg_wll_GetIndexedAttrs */
-int edg_wll_IndexedAttrsToXML(
-                edg_wll_Context ctx,
-                char **message)
-{
-       int i,j;
-       char *pomA, *pomB;
-
-       pomA = strdup("");
-       if (ctx->job_index) {
-               for (i=0; ctx->job_index[i]; i++) {
-                       asprintf(&pomB, "%s\t%s\r\n",pomA,"<index>");
-                       free(pomA);
-                       pomA = pomB;
-
-                       for (j=0; ctx->job_index[i][j].attr != EDG_WLL_QUERY_ATTR_UNDEF; j++) {
-                               asprintf(&pomB, "%s\t\t%s\r\n",pomA,"<QueryRec>");
-                               free(pomA);
-                               pomA = pomB;
-
-                               edg_wll_add_string_to_XMLBody(&pomA, 
-                                       edg_wll_query_attrToString(ctx->job_index[i][j].attr), 
-                                       "attribute", NULL);
-
-                               if (ctx->job_index[i][j].attr == EDG_WLL_QUERY_ATTR_TIME)
-                                       edg_wll_add_string_to_XMLBody(&pomA,
-                                               edg_wll_StatToString(ctx->job_index[i][j].attr_id.state),
-                                               "state", NULL);
-
-                               if (ctx->job_index[i][j].attr == EDG_WLL_QUERY_ATTR_USERTAG)
-                                        edg_wll_add_string_to_XMLBody(&pomA,
-                                               ctx->job_index[i][j].attr_id.tag,
-                                               "name", NULL);
-
-                               asprintf(&pomB, "%s\t\t%s\r\n",pomA,"</QueryRec>");
-                               free(pomA);
-                               pomA = pomB;
-                       }
-                       
-                       asprintf(&pomB, "%s\t%s\r\n",pomA,"</index>");
-                       free(pomA);
-                       pomA = pomB;
-               }
-       }
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomB,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       INDEXED_ATTRS_BEGIN, ctx->errCode, ctx->errDesc, pomA, INDEXED_ATTRS_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", INDEXED_ATTRS_BEGIN, pomA, INDEXED_ATTRS_END);
-       free(pomA);
-
-
-        *message = pomB;
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Notif */
-int edg_wll_NotifResultToXML(
-                edg_wll_Context ctx,
-               time_t validity,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       pomA = strdup("");
-       edg_wll_add_time_t_to_XMLBody(&pomA, validity, "validity", -1);
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomB,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       NOTIF_RESULT_BEGIN, ctx->errCode, ctx->errDesc, pomA, NOTIF_RESULT_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", NOTIF_RESULT_BEGIN, pomA, NOTIF_RESULT_END);
-       free(pomA);
-
-        *message = pomB;
-        return 0;
-}
-
-
diff --git a/org.glite.lb.server/src/lb_xml_parse.h b/org.glite.lb.server/src/lb_xml_parse.h

deleted file mode 100644 (file)

index 587d150..0000000
--- a/org.glite.lb.server/src/lb_xml_parse.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _LB_XML_PARSE_H
-#define _LB_XML_PARSE_H
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/notification.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/load.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-       
-/* function for parsing/unparsing XML requests from client */
-
-int parseJobQueryRec(edg_wll_Context ctx, const char *messageBody, long len, edg_wll_QueryRec ***conditions);
-int parseQueryJobsRequest(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***conditions, int *flags);
-int parseQueryEventsRequest(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***job_conditions, edg_wll_QueryRec ***event_conditions);
-int parsePurgeRequest(edg_wll_Context ctx, char *messageBody, int (*tagToIndex)(), edg_wll_PurgeRequest *request);
-int parseDumpRequest(edg_wll_Context ctx, char *messageBody, edg_wll_DumpRequest *request);
-int parseLoadRequest(edg_wll_Context ctx, char *messageBody, edg_wll_LoadRequest *request);
-int parseNotifRequest(edg_wll_Context ctx, char *messageBody, char **function, edg_wll_NotifId *notifId, char **address, edg_wll_NotifChangeOp *op, edg_wll_QueryRec ***conditions);
-int edg_wll_QueryEventsToXML(edg_wll_Context, edg_wll_Event *, char **);
-int edg_wll_QueryJobsToXML(edg_wll_Context, edg_wlc_JobId *, edg_wll_JobStat *, char **);
-int edg_wll_JobStatusToXML(edg_wll_Context, edg_wll_JobStat, char **);
-int edg_wll_UserJobsToXML(edg_wll_Context, edg_wlc_JobId *, char **);
-int edg_wll_PurgeResultToXML(edg_wll_Context ctx, edg_wll_PurgeResult *result, char **message);
-int edg_wll_DumpResultToXML(edg_wll_Context ctx, edg_wll_DumpResult *result, char **message);
-int edg_wll_LoadResultToXML(edg_wll_Context ctx, edg_wll_LoadResult *result, char **message);
-int edg_wll_IndexedAttrsToXML(edg_wll_Context ctx, char **message);
-int edg_wll_NotifResultToXML(edg_wll_Context ctx, time_t validity, char **message);
-
-#ifdef __cplusplus
-}
-#endif
-       
-#endif
diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.c.T b/org.glite.lb.server/src/lb_xml_parse_V21.c.T

deleted file mode 100644 (file)

index c3e3233..0000000
--- a/org.glite.lb.server/src/lb_xml_parse_V21.c.T
+++ /dev/null
@@ -1,1239 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <ctype.h>
-#include <expat.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/escape.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-#include "glite/lb/xml_conversions.h"
-
-#include "glite/lb/purge.h"
-#include "glite/lb/dump.h"
-
-#include "lb_xml_parse_V21.h"
-
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-
-#define QUERY_EVENTS_BEGIN     "<edg_wll_QueryEventsResult"
-#define QUERY_EVENTS_END       "</edg_wll_QueryEventsResult>\r\n"
-#define QUERY_JOBS_BEGIN       "<edg_wll_QueryJobsResult"
-#define QUERY_JOBS_END         "</edg_wll_QueryJobsResult>\r\n"
-#define PURGE_RESULT_BEGIN     "<edg_wll_PurgeResult"
-#define PURGE_RESULT_END       "</edg_wll_PurgeResult>\r\n"
-#define DUMP_RESULT_BEGIN      "<edg_wll_DumpResult"
-#define DUMP_RESULT_END                "</edg_wll_DumpResult>\r\n"
-
-// XXX will be redundant soon
-#define USERJOBS_BEGIN         "<edg_wll_UserJobs"
-#define USERJOBS_END           "</edg_wll_UserJobs>\r\n"
-
-
-static char    *ops[] = { "equal","less","greater","within" },
-               *attrs[] = {    "jobid","owner","status","location","destination",
-                               "donecode","usertag","time","level","host","source",
-                               "instance","type","chkpt_tag", "resubmitted", "parent_job", "exitcode" };
-
-static const struct timeval null_timeval = {0,0};
-
-#define unexp() {\
-       char    *e;\
-\
-       if (XMLCtx->errtxt) {\
-               asprintf(&e,"%s\nunexpected <%s> at line %d",XMLCtx->errtxt,\
-                       el,XML_GetCurrentLineNumber(XMLCtx->p));\
-               free(XMLCtx->errtxt);\
-       } else asprintf(&e,"unexpected <%s> at line %d",\
-               el,XML_GetCurrentLineNumber(XMLCtx->p));\
-       XMLCtx->errtxt = e;\
-}
-
-
-/* Dummy function, returns only const string "el"; just for compatibility */
-static char *return_string_el(edg_wll_JobStatCode statCode) {
-       return("el");
-}
-
-
-static void startQueryJobsRequest(void *data, const char *el, const char **attr)
-{
-       unsigned int    i;
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_QueryJobsRequest")) { unexp() break; }
-                       for ( i = 0; attr[i] && attr[i+1]; i += 2 )
-                       {
-                               if ( !strcmp(attr[i],"softLimit") )
-                                       XMLCtx->ctx->softLimit = atoi(attr[i+1]);
-                               else if ( !strcmp(attr[i],"queryRes") )
-                                       XMLCtx->ctx->p_query_results = atoi(attr[i+1]);
-                               else { unexp() break; }
-                       }
-                       break;
-               case 1: if (strcasecmp(el,"and") && strcasecmp(el,"flags")) unexp()
-                       break;
-               case 2: if (strcasecmp(el,"or")) unexp()
-                       else {
-                               XMLCtx->position = -1;
-                               XMLCtx->conditions = realloc(XMLCtx->conditions,
-                                       (++XMLCtx->row+2)*sizeof(*XMLCtx->conditions));
-                               XMLCtx->conditions[XMLCtx->row] = NULL;
-                               XMLCtx->conditions[XMLCtx->row+1] = NULL;
-                       }
-                       break;
-               case 3:
-                       for (i=0; i<sizeof(ops)/sizeof(ops[0]); i++)
-                               if (!strcasecmp(el,ops[i])) break;
-                       if (i == sizeof(ops)/sizeof(ops[0])) unexp()
-                       else {
-                               /* malloc also terminator and set it to 0 (= EDG_WLL_QUERY_ATTR_UNDEF) */
-                               XMLCtx->conditions[XMLCtx->row] = realloc(XMLCtx->conditions[XMLCtx->row],
-                                       (++XMLCtx->position+2)*sizeof(**XMLCtx->conditions));
-                               memset(&XMLCtx->conditions[XMLCtx->row][XMLCtx->position],0,2*sizeof(**XMLCtx->conditions));
-                               XMLCtx->conditions[XMLCtx->row][XMLCtx->position].op = i;
-                               XMLCtx->bound = 0;
-                       }
-                       break;
-               case 4: for (i=0; i<sizeof(attrs)/sizeof(attrs[0]) && 
-                               strcasecmp(el,attrs[i]); i++);
-                       if (i == sizeof(attrs)/sizeof(attrs[0])) unexp()
-                       else {
-                               if ( (i+1) == EDG_WLL_QUERY_ATTR_USERTAG) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                       if (strcmp(attr[0],"name")) { unexp() break;}
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].attr_id.tag = strdup(attr[1]);
-                               } 
-                               else if ( (i+1) == EDG_WLL_QUERY_ATTR_TIME) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                        if (attr[0] && strcmp(attr[0],"state")) { unexp() break;}
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]);
-                               }
-                               XMLCtx->conditions[XMLCtx->row][XMLCtx->position].attr = i+1;
-                       }               
-                       break;
-               default: unexp(); break;
-       }
-       XMLCtx->level++;
-}
-
-
-static void startQueryEventsRequest(void *data, const char *el, const char **attr UNUSED_VAR)
-{
-       unsigned int    i;
-       edg_wll_XML_ctx *XMLCtx = data;
-
-
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_QueryEventsRequest")) { unexp() break; }
-                       for ( i = 0; attr[i] && attr[i+1]; i += 2 )
-                       {
-                               if ( !strcmp(attr[i],"softLimit") )
-                                       XMLCtx->ctx->softLimit = atoi(attr[i+1]);
-                               else if ( !strcmp(attr[i],"queryRes") )
-                                       XMLCtx->ctx->p_query_results = atoi(attr[i+1]);
-                               else { unexp() break; }
-                       }
-                       break;
-               case 1: if (strcasecmp(el,"and")) unexp()
-                       break;
-               case 2: if (!strcasecmp(el,"orJobConditions")) {
-                               XMLCtx->type = EDG_WLL_QUERY_TYPE_JOB_CONDITION;
-                               XMLCtx->position = -1;
-                                XMLCtx->job_conditions = realloc(XMLCtx->job_conditions,
-                                        (++XMLCtx->row+2)*sizeof(*XMLCtx->job_conditions));
-                                XMLCtx->job_conditions[XMLCtx->row] = NULL;
-                                XMLCtx->job_conditions[XMLCtx->row+1] = NULL;
-
-                       }
-                       else if (!strcasecmp(el,"orEventConditions")) {
-                               XMLCtx->type = EDG_WLL_QUERY_TYPE_EVENT_CONDITION;
-                               XMLCtx->position2 = -1;
-                                XMLCtx->event_conditions = realloc(XMLCtx->event_conditions,
-                                        (++XMLCtx->row2+2)*sizeof(*XMLCtx->event_conditions));
-                                XMLCtx->event_conditions[XMLCtx->row2] = NULL;
-                                XMLCtx->event_conditions[XMLCtx->row2+1] = NULL;
-                       }
-                       else unexp()
-                       break;
-               case 3:
-                       for (i=0; i<sizeof(ops)/sizeof(ops[0]); i++)
-                               if (!strcasecmp(el,ops[i])) break;
-                       if (i == sizeof(ops)/sizeof(ops[0])) unexp()
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_JOB_CONDITION) {
-                               /* malloc also terminator and set it to 0 (= EDG_WLL_QUERY_ATTR_UNDEF) */
-                               XMLCtx->job_conditions[XMLCtx->row] = realloc(XMLCtx->job_conditions[XMLCtx->row],
-                                       (++XMLCtx->position+2)*sizeof(**XMLCtx->job_conditions));
-                               memset(&XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position],0,2*sizeof(**XMLCtx->job_conditions));
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].op = i;
-                               XMLCtx->bound = 0;
-                       }
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_EVENT_CONDITION) {
-                               /* malloc also terminator and set it to 0 (= EDG_WLL_QUERY_ATTR_UNDEF) */
-                               XMLCtx->event_conditions[XMLCtx->row2] = realloc(XMLCtx->event_conditions[XMLCtx->row2],
-                                       (++XMLCtx->position2+2)*sizeof(**XMLCtx->event_conditions));
-                               memset(&XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2],0,2*sizeof(**XMLCtx->event_conditions));
-                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].op = i;
-                               XMLCtx->bound = 0;
-                       }
-                       
-                       break;
-               case 4: for (i=0; i<sizeof(attrs)/sizeof(attrs[0]) && 
-                               strcasecmp(el,attrs[i]); i++);
-                       if (i == sizeof(attrs)/sizeof(attrs[0])) unexp()
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_JOB_CONDITION) { 
-                               if ( (i+1) == EDG_WLL_QUERY_ATTR_USERTAG) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                       if (attr[0] && strcmp(attr[0],"name")) { unexp() break;}
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.tag = strdup(attr[1]);
-                               } 
-                               else if ( (i+1) == EDG_WLL_QUERY_ATTR_TIME) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                        if (attr[0] && strcmp(attr[0],"state")) { unexp() break;}
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]);
-                                       printf("\nchecking time attr\n%s = %s (%d)\n\n", attr[0], attr[1], edg_wll_StringToStat(attr[1]));
-                               }
-                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr = i+1;
-                       }
-                       else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_EVENT_CONDITION) {
-                               if ( (i+1) == EDG_WLL_QUERY_ATTR_USERTAG) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                       if (attr[0] && strcmp(attr[0],"name")) { unexp() break;}
-                                       XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position].attr_id.tag = strdup(attr[1]);
-                               } 
-                               else if ( (i+1) == EDG_WLL_QUERY_ATTR_TIME) {
-                                       if (!attr[0] || !attr[1]) { unexp() break;}
-                                        if (attr[0] && strcmp(attr[0],"state")) { unexp() break;}
-                                       XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]);
-                               }
-                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].attr = i+1;
-                       }
-                       break;
-               default: unexp(); break;
-       }
-       XMLCtx->level++;
-}
-
-
-
-static void startPurgeRequest(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_PurgeRequest")) unexp()
-                       break;
-               case 1: if (strcasecmp(el,"jobs") && strcasecmp(el,"timeout")
-                               && strcasecmp(el,"flags")) unexp()
-                       else 
-                               XMLCtx->position = 0;
-                       break;
-               case 2: if (!strcasecmp(el,"jobId")) {
-                               XMLCtx->purgeRequestGlobal.jobs = realloc(XMLCtx->purgeRequestGlobal.jobs,
-                                               (XMLCtx->position+2) * sizeof(XMLCtx->purgeRequestGlobal.jobs));
-
-                                if (!XMLCtx->purgeRequestGlobal.jobs) { 
-                                       edg_wll_SetError(XMLCtx->ctx, ENOMEM, NULL); 
-                                       unexp() return;
-                               }
-                                XMLCtx->purgeRequestGlobal.jobs[XMLCtx->position+1] = NULL;
-                       }
-                       else if (!strcasecmp(el,"time")) {
-                               /* static array, no need to initialize & allocate anything */
-                       }
-                       else 
-                               unexp()
-                       break;
-               default: unexp() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-
-static void startDumpRequest(void *data, const char *el, const char **attr)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-
-       
-       strcpy(XMLCtx->element, el);
-
-       switch (XMLCtx->level) {
-               case 0: if (strcasecmp(el,"edg_wll_DumpRequest")) unexp()
-                       break;
-               case 1: if (strcasecmp(el,"from") && strcasecmp(el,"to")) unexp()
-                       break;
-               default: unexp() 
-                        break;
-       }
-       XMLCtx->level++;
-}
-
-#undef unexp
-
-
-static void char_handler(void *data, const char *s, int len)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        int i, found = -1, temp_len1;
-       char *temp_s, *temp_s1;
-
-
-       /* if date are only spaces, t\, \r, \n ... don't bother with them */
-        for (i=0; i<len; i++)  
-                       if (!isspace(s[i])) { found = i; break; }
-        if (found == -1) return;
-
-       temp_s = malloc(len+1);
-
-       /* otherwise use them */
-       memcpy(temp_s,s,len);
-       temp_s[len] = 0;        
-       temp_s1 = edg_wll_UnescapeXML((const char *) temp_s);
-       temp_len1 = strlen(temp_s1);
-
-        if (XMLCtx->char_buf_len) XMLCtx->char_buf =
-               realloc(XMLCtx->char_buf,XMLCtx->char_buf_len+temp_len1 + 1);
-        else XMLCtx->char_buf = malloc(temp_len1 + 1);
-
-        memcpy(XMLCtx->char_buf+XMLCtx->char_buf_len,temp_s1,temp_len1 + 1);
-        XMLCtx->char_buf_len += temp_len1;
-       free(temp_s1);
-       free(temp_s);
-}
-
-
-
-static void endQueryJobsRequest(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       char *e;
-
-
-       if (XMLCtx->level == 2) {
-               if (!strcmp(XMLCtx->element,"flags") && XMLCtx->char_buf) {
-// XXX: check if it works
-                        XMLCtx->flags = edg_wll_string_to_stat_flags(XMLCtx->char_buf);
-               }
-       }
-       else if (XMLCtx->level == 5) {
-               switch (XMLCtx->conditions[XMLCtx->row][XMLCtx->position].attr) {
-                       case EDG_WLL_QUERY_ATTR_JOBID:
-                       case EDG_WLL_QUERY_ATTR_PARENT:
-                               if ( (XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value.j = 
-                                       edg_wll_from_string_to_jobid(XMLCtx)) == NULL )
-                               {
-                                       if (XMLCtx->errtxt) {
-                                               asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                                       XMLCtx->errtxt, XMLCtx->char_buf,
-                                                       XML_GetCurrentLineNumber(XMLCtx->p));
-                                               free(XMLCtx->errtxt);
-                                       } else asprintf(&e,"%s: invalid JobId at line %d",
-                                               XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                       XMLCtx->errtxt = e;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_OWNER:
-                       // XXX - this is way how to pass NULL, user will be extracted from ssl partner later
-                               if (XMLCtx->char_buf != NULL && !strcmp(XMLCtx->char_buf,"NULL")) {  
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value.c = NULL; 
-                                       break; 
-                               }
-                               else /* fall through */
-                       case EDG_WLL_QUERY_ATTR_LOCATION:
-                       case EDG_WLL_QUERY_ATTR_DESTINATION:
-                       case EDG_WLL_QUERY_ATTR_USERTAG:
-                               XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value.c = 
-                                       edg_wll_from_string_to_string(XMLCtx);
-                               break;
-                       case EDG_WLL_QUERY_ATTR_STATUS:
-                       case EDG_WLL_QUERY_ATTR_DONECODE:
-                       case EDG_WLL_QUERY_ATTR_EXITCODE:
-                       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                               if ( !XMLCtx->bound )
-                               {
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value.i = 
-                                               edg_wll_from_string_to_int(XMLCtx);
-                                       XMLCtx->bound++;
-                               }
-                               else
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value2.i = 
-                                               edg_wll_from_string_to_int(XMLCtx);
-
-                               break;
-                       case EDG_WLL_QUERY_ATTR_TIME:
-                               if ( !XMLCtx->bound )
-                               {
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value.t.tv_sec = 
-                                               edg_wll_from_string_to_time_t(XMLCtx);
-                                       XMLCtx->bound++;
-                               }
-                               else
-                                       XMLCtx->conditions[XMLCtx->row][XMLCtx->position].value2.t.tv_sec =
-                                               edg_wll_from_string_to_time_t(XMLCtx);
-                               break;
-                       default: 
-                               edg_wll_freeBuf(XMLCtx);
-                               XMLCtx->level--;
-                               if (XMLCtx->errtxt) {
-                                       asprintf(&e,"%s\n%s: invalid attribute type at line %d",
-                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                       free(XMLCtx->errtxt);
-                               } else asprintf(&e,"%s: invalid attribute type at line %d",
-                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                               XMLCtx->errtxt = e;
-                               break;
-               }
-       }
-        XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-static void endQueryEventsRequest(void *data, const char *el UNUSED_VAR)
-{
-       edg_wll_XML_ctx *XMLCtx = data;
-       char *e;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"orJobConditions")) {
-                        /* make end-of-row */
-                        XMLCtx->job_conditions[XMLCtx->row] = realloc(XMLCtx->job_conditions[XMLCtx->row],
-                                (++XMLCtx->position+1)*sizeof(**XMLCtx->job_conditions));
-                        memset(&XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position],0,sizeof(**XMLCtx->job_conditions));
-                }
-               else if (!strcmp(XMLCtx->element,"orEventConditions")) {
-                        /* make end-of-row */
-                        XMLCtx->event_conditions[XMLCtx->row2] = realloc(XMLCtx->event_conditions[XMLCtx->row2],
-                                (++XMLCtx->position2+1)*sizeof(**XMLCtx->event_conditions));
-                        memset(&XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2],0,sizeof(**XMLCtx->event_conditions));
-                }
-       }
-       else if (XMLCtx->level == 5) {
-               if (XMLCtx->type == EDG_WLL_QUERY_TYPE_JOB_CONDITION) {
-                       switch (XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr) {
-                               case EDG_WLL_QUERY_ATTR_JOBID:
-                               case EDG_WLL_QUERY_ATTR_PARENT:
-                                       if ( (XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.j = 
-                                               edg_wll_from_string_to_jobid(XMLCtx)) == NULL )
-                                       {
-                                               if (XMLCtx->errtxt) {
-                                                       asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                                       free(XMLCtx->errtxt);
-                                               } else asprintf(&e,"%s: invalid JobId at line %d",
-                                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                               XMLCtx->errtxt = e;
-                                       }
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_OWNER:
-                               case EDG_WLL_QUERY_ATTR_LOCATION:
-                               case EDG_WLL_QUERY_ATTR_DESTINATION:
-                               case EDG_WLL_QUERY_ATTR_USERTAG:
-                                       XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.c = 
-                                               edg_wll_from_string_to_string(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_STATUS:
-                               case EDG_WLL_QUERY_ATTR_DONECODE:
-                               case EDG_WLL_QUERY_ATTR_EXITCODE:
-                               case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.i = 
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.i = 
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_TIME:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value.t.tv_sec = 
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].value2.t.tv_sec =
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                       break;
-                               default: 
-                                       edg_wll_freeBuf(XMLCtx);
-                                       XMLCtx->level--;
-                                       if (XMLCtx->errtxt) {
-                                               asprintf(&e,"%s\n%s: invalid attribute type at line %d",
-                                                       XMLCtx->errtxt, XMLCtx->char_buf,
-                                                       XML_GetCurrentLineNumber(XMLCtx->p));
-                                               free(XMLCtx->errtxt);
-                                       } else asprintf(&e,"%s: invalid attribute type at line %d",
-                                               XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                       XMLCtx->errtxt = e;
-                                       break;
-                       }
-               }
-               else if (XMLCtx->type == EDG_WLL_QUERY_TYPE_EVENT_CONDITION) {
-                       switch (XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].attr) {
-                               case EDG_WLL_QUERY_ATTR_TIME:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value.t.tv_sec = 
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value2.t.tv_sec =
-                                                       edg_wll_from_string_to_time_t(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_LEVEL:
-                               case EDG_WLL_QUERY_ATTR_SOURCE:
-                               case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-                                       if ( !XMLCtx->bound )
-                                       {
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value.i =
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                               XMLCtx->bound++;
-                                       }
-                                       else
-                                               XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value2.i =
-                                                       edg_wll_from_string_to_int(XMLCtx);
-                                       break;
-                               case EDG_WLL_QUERY_ATTR_HOST:
-                               case EDG_WLL_QUERY_ATTR_INSTANCE:
-                               case EDG_WLL_QUERY_ATTR_USERTAG:
-                                       XMLCtx->event_conditions[XMLCtx->row2][XMLCtx->position2].value.c =
-                                               edg_wll_from_string_to_string(XMLCtx);
-                                       break;
-                               default: 
-                                       edg_wll_freeBuf(XMLCtx);
-                                       XMLCtx->level--;
-                                       if (XMLCtx->errtxt) {
-                                               asprintf(&e,"%s\n%s: invalid attribute type at line %d",
-                                                       XMLCtx->errtxt, XMLCtx->char_buf,
-                                                       XML_GetCurrentLineNumber(XMLCtx->p));
-                                               free(XMLCtx->errtxt);
-                                       } else asprintf(&e,"%s: invalid attribute type at line %d",
-                                               XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                                       XMLCtx->errtxt = e;
-                                       break;
-                       }
-               } 
-       
-               XMLCtx->char_buf = NULL;
-               XMLCtx->char_buf_len = 0;
-       }
-       XMLCtx->level--;
-}
-
-
-static void endPurgeRequest(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-        char *e;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"flags")) 
-                       XMLCtx->purgeRequestGlobal.flags = edg_wll_from_string_to_int(XMLCtx);
-       }
-       else if (XMLCtx->level == 3) {
-               if (!strcmp(XMLCtx->element,"jobId")) {
-                       if ( (XMLCtx->purgeRequestGlobal.jobs[XMLCtx->position++] = 
-                               edg_wll_from_string_to_string(XMLCtx)) == NULL )
-                       {
-                               if (XMLCtx->errtxt) {
-                                       asprintf(&e,"%s\n%s: invalid JobId at line %d",
-                                               XMLCtx->errtxt, XMLCtx->char_buf,
-                                               XML_GetCurrentLineNumber(XMLCtx->p));
-                                       free(XMLCtx->errtxt);
-                               } else asprintf(&e,"%s: invalid JobId at line %d",
-                                       XMLCtx->char_buf,XML_GetCurrentLineNumber(XMLCtx->p));
-                               XMLCtx->errtxt = e;
-                       }
-               }
-               else if (!strcmp(XMLCtx->element,"time") && XMLCtx->char_buf) {
-                       XMLCtx->purgeRequestGlobal.timeout[XMLCtx->position++] = 
-                               edg_wll_from_string_to_time_t(XMLCtx);
-               }
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-
-static void endDumpRequest(void *data, const char *el UNUSED_VAR)
-{
-        edg_wll_XML_ctx *XMLCtx = data;
-
-        if (XMLCtx->level == 2) {
-                if (!strcmp(XMLCtx->element,"from")) 
-                       XMLCtx->dumpRequestGlobal.from = edg_wll_from_string_to_time_t(XMLCtx);
-               else if (!strcmp(XMLCtx->element,"to")) 
-                        XMLCtx->dumpRequestGlobal.to = edg_wll_from_string_to_time_t(XMLCtx);
-       }
-
-       XMLCtx->char_buf = NULL;
-        XMLCtx->char_buf_len = 0;
-       XMLCtx->level--;
-}
-
-/* parse queryJobs request from client */
-int parseQueryJobsRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***conditions, int *flags)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.row = -1;
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startQueryJobsRequest, endQueryJobsRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i,j;
-
-               if (XMLCtx.conditions) {
-                       for (j = 0; XMLCtx.conditions[j]; j++) {
-                               for (i = 0; (XMLCtx.conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.conditions[j][i]);
-                               free(XMLCtx.conditions[j]);
-                       }
-                       free(XMLCtx.conditions);
-               }
-
-               /* empty list terminators */
-               conditions[0] = NULL;
-               *flags = 0;
-       } else {
-               *conditions = XMLCtx.conditions;
-               *flags = XMLCtx.flags;
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-/* parse queryEvents request from client */
-int parseQueryEventsRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***job_conditions, edg_wll_QueryRec ***event_conditions)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.row = -1;
-       XMLCtx.row2 = -1;
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startQueryEventsRequest, endQueryEventsRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i,j;
-
-               if (XMLCtx.job_conditions) {
-                       for (j = 0; XMLCtx.job_conditions[j]; j++) {
-                               for (i = 0 ; (XMLCtx.job_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.job_conditions[j][i]);
-                               free(XMLCtx.job_conditions[j]);
-                       }
-                       free(XMLCtx.job_conditions);
-               }
-               if (XMLCtx.event_conditions) {
-                       for (j = 0; XMLCtx.event_conditions[j]; j++) {
-                               for (i = 0 ; (XMLCtx.event_conditions[j][i].attr != EDG_WLL_QUERY_ATTR_UNDEF); i++ )
-                                       edg_wll_QueryRecFree(&XMLCtx.event_conditions[j][i]);
-                               free(XMLCtx.event_conditions[j]);
-                       }
-                       free(XMLCtx.event_conditions);
-               }
-
-               /* empty list terminators */
-               job_conditions[0] = NULL;
-               event_conditions[0] = NULL;
-       } else {
-               *job_conditions = XMLCtx.job_conditions;
-               *event_conditions = XMLCtx.event_conditions;
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-
-/* parse purge request from client */
-int parsePurgeRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_PurgeRequest *request)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startPurgeRequest, endPurgeRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) {
-               int i;
-
-               if (XMLCtx.purgeRequestGlobal.jobs) {
-                       for (i=0; XMLCtx.purgeRequestGlobal.jobs[i]; i++) 
-                               free(XMLCtx.purgeRequestGlobal.jobs[i]);
-                       free(XMLCtx.purgeRequestGlobal.jobs);
-               }
-               memset(request,0,sizeof(*request));
-               
-       } else {
-               memcpy(request, &XMLCtx.purgeRequestGlobal, sizeof(XMLCtx.purgeRequestGlobal));
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-
-/* parse dump request from client */
-int parseDumpRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_DumpRequest *request)
-{
-       int     ret;
-       edg_wll_XML_ctx         XMLCtx;
-       XML_Char *encoding = "ISO-8859-1";
-
-       errno = 0;
-       edg_wll_initXMLCtx(&XMLCtx);
-       XMLCtx.ctx = ctx;
-       edg_wll_ResetError(ctx);
-
-
-        /* initialize parser */
-        XMLCtx.p = XML_ParserCreate(encoding);
-        XML_SetElementHandler(XMLCtx.p, startDumpRequest, endDumpRequest);
-        XML_SetCharacterDataHandler(XMLCtx.p, char_handler);
-        XML_SetUserData(XMLCtx.p, (void *) &XMLCtx);
-
-
-        if (! XML_Parse(XMLCtx.p, messageBody, strlen(messageBody), 1)) {
-                char *errorMessage;
-
-                asprintf(&errorMessage, "Parse error at line %d:\n%s\n",
-                        XML_GetCurrentLineNumber(XMLCtx.p),
-                        XML_ErrorString(XML_GetErrorCode(XMLCtx.p)));
-
-                edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, errorMessage);
-                free(errorMessage);
-        } else if (XMLCtx.errtxt) edg_wll_SetError(ctx, EDG_WLL_ERROR_XML_PARSE, XMLCtx.errtxt);
-
-
-       if ((ret = edg_wll_Error(ctx,NULL,NULL))) 
-               memset(request,0,sizeof(*request));
-               
-       else {
-               memcpy(request, &XMLCtx.dumpRequestGlobal, sizeof(XMLCtx.dumpRequestGlobal));
-       }
-
-       
-        XML_ParserFree(XMLCtx.p);
-       edg_wll_freeXMLCtx(&XMLCtx);
-       return ret;
-}
-
-
-
-int edg_wll_QueryEventsToXMLV21(edg_wll_Context ctx UNUSED_VAR, edg_wll_Event *eventsOut, char **message)
-{
-        char *pomA, *pomB;
-       char **list = NULL;
-        int i = 0, len, tot_len = 0;
-       int *len_list = NULL;
-
-
-        while (eventsOut && eventsOut[i].any.type != EDG_WLL_EVENT_UNDEF) {
-               pomB = edg_wll_EventToString(eventsOut[i].any.type);
-                trio_asprintf(&pomA,"      <edg_wll_Event name=\"%|Xs\">\r\n", pomB);
-               free(pomB);
-               pomB = pomA;
-
-
-@@@{
-        selectType $event '_common_';
-        for (getFieldsOrdered $event) {
-                my $f = selectField $event $_;
-                my $ft = $f->{type};
-               my $n = $f->{null};
-                gen "\tedg_wll_add_$ft\_to_XMLBody(&pomB, eventsOut[i].any.$_, \"$_\", $n);\n";
-        }
-
-        gen "\tswitch (eventsOut[i].any.type) {\n";
-        for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} } getTypes $event) {
-                if ($t ne 'any') {
-                        selectType $event $t;
-                        my $u = uc $t;
-                        gen "\t    case EDG_WLL_EVENT_$u :\n";
-                        for (getFieldsOrdered $event) {
-                                my $f = selectField $event $_;
-                                my $ft = $f->{type};
-                               my $n = $f->{null};
-                               $t = lcfirst $t;
-                                gen "\t\tedg_wll_add_$ft\_to_XMLBody(&pomB, eventsOut[i].$t.$_, \"$_\", $n);\n";
-                        }
-                       gen "\t\tbreak;\n";
-               }
-        }
-        gen "\t    default : break;\n";
-        gen "\t}\n";
-@@@}
-
-
-
-                len = asprintf(&pomA,"%s      </edg_wll_Event>\r\n", pomB);
-                free(pomB);
-                i++;
-               tot_len += len;
-
-               list      = (char **) realloc(list, i * sizeof(*list));
-               list[i-1] = pomA;
-               len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-               len_list[i-1] = len;
-               
-        }
-
-       /* list termination */
-       list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-       /* test errors */
-       if (ctx->errDesc || ctx->errCode)
-               len = trio_asprintf(&pomB," code=\"%d\" desc=\"%|Xs\">\r\n",ctx->errCode,ctx->errDesc);
-       else
-               len = asprintf(&pomB,">\r\n");
-
-       /* glueing all list fields together & freeing the list */
-       pomA = (char *) malloc(tot_len  * sizeof(char) + 
-                               sizeof(QUERY_EVENTS_BEGIN) + len + sizeof(QUERY_EVENTS_END) - 1);
-       
-       memcpy(pomA, QUERY_EVENTS_BEGIN, sizeof(QUERY_EVENTS_BEGIN));
-       memcpy(pomA + sizeof(QUERY_EVENTS_BEGIN) - 1, pomB, len);
-       free(pomB);
-       pomB = pomA + sizeof(QUERY_EVENTS_BEGIN) + len - 1;     
-
-       i = 0;
-       while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-               pomB += len_list[i];
-
-               /* freeing the list */
-               free(list[i]);
-
-                i++;
-        }
-
-       strcpy(pomB, QUERY_EVENTS_END);
-
-
-       free(list);
-       free(len_list);
-
-
-        *message = pomA;
-
-        return 0;
-}
-
-int edg_wll_QueryJobsToXMLV21(edg_wll_Context ctx, edg_wlc_JobId *jobsIn, edg_wll_JobStat *statesIn, char **message) 
-{
-        char *pomA, *pomB, *pomC;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0, nres = 0;
-        int *len_list = NULL;
-
-       
-       if (jobsIn) for (nres = 0; jobsIn[nres]; nres++);
-       else if (statesIn) for (nres = 0; statesIn[nres].state; nres++);
-
-        while (i < nres) {
-                trio_asprintf(&pomA,"\t<edg_wll_Job>\r\n");
-                pomB = pomA;
-               
-               if (jobsIn) {
-                       trio_asprintf(&pomA,"%s\t\t<jobId>%|Xs</jobId>\r\n",
-                               pomB, pomC=edg_wlc_JobIdUnparse(jobsIn[i]));
-                       free(pomC);
-                       free(pomB);
-                       pomB = pomA;
-               }
-
-               if (statesIn) {
-                       edg_wll_JobStatusToXMLV21(ctx, statesIn[i], &pomC);     
-                       trio_asprintf(&pomA,"%s\t\t%s",pomB,pomC);
-               }
-               else {
-                       pomC = edg_wll_StatToString(EDG_WLL_JOB_UNKNOWN);
-                       trio_asprintf(&pomA,"%s\t\t<jobStat name=\"%|Xs\">\r\n\r\n\t\t</jobStat>\r\n",
-                               pomB, pomC);
-               }
-
-               free(pomB);
-               free(pomC);
-               pomB = pomA;
-       
-
-                len = asprintf(&pomA,"%s\t</edg_wll_Job>\r\n", pomB);
-                free(pomB);
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;   
-       }
-       
-       /* list termination */
-       list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* test errors */
-        if (ctx->errDesc || ctx->errCode)
-                len = trio_asprintf(&pomB," code=\"%d\" desc=\"%|Xs\">\r\n",ctx->errCode,ctx->errDesc);
-        else
-                len = asprintf(&pomB,">\r\n");
-
-       /* glueing all list fields together & freeing the list */
-       pomA = (char *) malloc(tot_len  * sizeof(char) + 
-                               sizeof(QUERY_JOBS_BEGIN) + len + sizeof(QUERY_JOBS_END) - 1);
-       
-       memcpy(pomA, QUERY_JOBS_BEGIN, sizeof(QUERY_JOBS_BEGIN));       
-        memcpy((pomA + sizeof(QUERY_JOBS_BEGIN) - 1), pomB, len);
-        free(pomB);
-       pomB = pomA + sizeof(QUERY_JOBS_BEGIN) + len - 1;       
-
-       i = 0;
-       while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-               pomB += len_list[i];
-
-               /* freeing the list */
-               free(list[i]);
-
-                i++;
-        }
-
-       strcpy(pomB, QUERY_JOBS_END);
-
-
-       free(list);
-       free(len_list);
-
-
-        *message = pomA;
-
-       return 0;
-}
-
-/* construct Message-Body of Response-Line for edg_wll_UserJobs */
-int edg_wll_UserJobsToXMLV21(edg_wll_Context ctx UNUSED_VAR, edg_wlc_JobId *jobsOut, char **message)
-{
-        char *pomA, *pomB;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0;
-        int *len_list = NULL;
-
-
-        while (jobsOut[i]) {
-               len = trio_asprintf(&pomA,"      <jobId>%|Xs</jobId>\r\n",
-                       pomB=edg_wlc_JobIdUnparse(jobsOut[i]));
-
-                free(pomB);
-
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-               pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* test errors */
-        if (ctx->errDesc || ctx->errCode)
-                len = trio_asprintf(&pomB," code=\"%d\" desc=\"%|Xs\">\r\n",ctx->errCode,ctx->errDesc);
-        else
-                len = asprintf(&pomB,">\r\n");
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) +
-                                sizeof(USERJOBS_BEGIN) + len + sizeof(USERJOBS_END) - 1);
-
-        memcpy(pomA, USERJOBS_BEGIN, sizeof(USERJOBS_BEGIN));
-        memcpy((pomA + sizeof(USERJOBS_BEGIN) - 1), pomB, len);
-        free(pomB);
-        pomB = pomA + sizeof(USERJOBS_BEGIN) + len - 1;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-
-        strcpy(pomB, USERJOBS_END);
-
-
-        free(list);
-        free(len_list);
-
-
-        *message = pomA;
-
-        return 0;
-}
-
-static void edg_wll_add_stslist_to_XMLBodyV21(edg_wll_Context ctx, char **body, const edg_wll_JobStat *toAdd, const char *tag, const char *UNUSED_subTag, const int null)
-{
-        char *pomA, *pomB, *newBody;
-        char **list = NULL;
-        int i = 0, len, tot_len = 0;
-        int *len_list = NULL;
-
-
-        while (toAdd[i].state != null) {
-                edg_wll_JobStatusToXMLV21(ctx, toAdd[i], &pomA);
-                len = strlen(pomA);
-
-                i++;
-                tot_len += len;
-
-                list      = (char **) realloc(list, i * sizeof(*list));
-                list[i-1] = pomA;
-                pomA = NULL;
-                len_list      = (int *) realloc(len_list, i * sizeof(*len_list));
-                len_list[i-1] = len;
-        }
-
-        /* list termination */
-        list = (char **) realloc(list, (i+1) * sizeof(*list));
-        list[i] = NULL;
-
-        /* glueing all list fields together & freeing the list */
-        pomA = (char *) malloc(tot_len  * sizeof(char) + 1);
-       pomB = pomA;
-
-        i = 0;
-        while (list[i]) {
-                memcpy(pomB, list[i], len_list[i] );
-                pomB += len_list[i];
-
-                /* freeing the list */
-                free(list[i]);
-
-                i++;
-        }
-       *pomB = '\0';
-        free(list);
-        free(len_list);
-
-        asprintf(&newBody,"%s\t\t\t<%s>\r\n%s\t\t\t</%s>\r\n", *body, tag, pomA, tag);
-        free(*body);
-        free(pomA);
-        *body = newBody;
-}
-
-
-/* construct Message-Body of Response-Line for edg_wll_JobStatus */
-int edg_wll_JobStatusToXMLV21(edg_wll_Context ctx, edg_wll_JobStat stat, char **message)
-{
-        char *pomA, *pomB, *pomC;
-
-       
-       pomB = strdup("");
-
-@@@{
-       selectType $status '_common_';
-        for (getFieldsOrdered $status) {
-                my $f = selectField $status $_;
-               next if defined($f->{special}) && $f->{special} eq 'XMLstructured';
-                my $ft = $f->{type};
-               my $n = $f->{null};
-                gen "edg_wll_add_$ft\_to_XMLBody(&pomB, stat.$_, \"$_\", $n);\n";
-        }
-@@@}
-       if (stat.children) edg_wll_add_strlist_to_XMLBody(&pomB, stat.children, "children", "jobId", "\t\t\t", NULL);
-       if (stat.children_hist) edg_wll_add_intlist_to_XMLBody(&pomB, stat.children_hist, "children_hist", return_string_el, "\t\t\t", 1, stat.children_hist[0]);
-       if (stat.children_states) edg_wll_add_stslist_to_XMLBodyV21(ctx, &pomB, stat.children_states, "children_states", "", EDG_WLL_JOB_UNDEF);
-       if (stat.user_tags) edg_wll_add_taglist_to_XMLBody(&pomB, stat.user_tags, "user_tags", "tag", "name", "\t\t\t", NULL);
-       if (stat.stateEnterTimes) edg_wll_add_intlist_to_XMLBody(&pomB, stat.stateEnterTimes, "stateEnterTimes", return_string_el, "\t\t\t",1, stat.stateEnterTimes[0]);
-
-       pomC = edg_wll_StatToString(stat.state);
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomA,"<jobStat name=\"%|Xs\" code=\"%d\" desc=\"%|Xs\">\r\n%s</jobStat>",
-                       pomC, ctx->errCode,ctx->errDesc, pomB);
-       else
-               trio_asprintf(&pomA,"<jobStat name=\"%|Xs\">\r\n%s</jobStat>",
-                       pomC, pomB);
-
-        free(pomB);
-       free(pomC);
-
-        *message = pomA;
-
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Purge */
-int edg_wll_PurgeResultToXMLV21(
-                edg_wll_Context ctx,
-               edg_wll_PurgeResult *result,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!result) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       edg_wll_add_strlist_to_XMLBody(&pomA, result->jobs, "jobs", "jobId", "\t", NULL);
-       edg_wll_add_string_to_XMLBody(&pomA, result->server_file, "server_file", NULL); 
-
-       if (ctx->errDesc || ctx->errCode)
-                trio_asprintf(&pomA,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       PURGE_RESULT_BEGIN, ctx->errCode, ctx->errDesc, pomA, PURGE_RESULT_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", PURGE_RESULT_BEGIN, pomA, PURGE_RESULT_END);
-       free(pomA);
-
-        *message = pomB;
-        return 0;
-}
-
-
-
-/* construct Message-Body of Request-Line for edg_wll_Dump */
-int edg_wll_DumpResultToXMLV21(
-                edg_wll_Context ctx,
-               edg_wll_DumpResult *result,
-                char **message)
-{
-        char *pomA, *pomB;
-
-
-       if (!result) { *message = NULL; return(-1); }
-
-       pomA = strdup("");
-       edg_wll_add_string_to_XMLBody(&pomA, result->server_file, "server_file", NULL);
-       edg_wll_add_time_t_to_XMLBody(&pomA, result->from, "from", 0);
-       edg_wll_add_time_t_to_XMLBody(&pomA, result->to, "to", 0);
-
-       if (ctx->errDesc || ctx->errCode)
-               trio_asprintf(&pomB,"%s code=\"%d\" desc=\"%|Xs\">\r\n%s%s",
-                       DUMP_RESULT_BEGIN, ctx->errCode, ctx->errDesc, pomA, DUMP_RESULT_END);
-       else
-               trio_asprintf(&pomB,"%s>\r\n%s%s", DUMP_RESULT_BEGIN, pomA, DUMP_RESULT_END);
-       free(pomA);
-
-        *message = pomB;
-        return 0;
-}
diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.h b/org.glite.lb.server/src/lb_xml_parse_V21.h

deleted file mode 100644 (file)

index ea731dc..0000000
--- a/org.glite.lb.server/src/lb_xml_parse_V21.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef _LB_XML_PARSE_H_V21
-#define _LB_XML_PARSE_H_V21
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-
-/* function for parsing/unparsing XML requests from client */
-
-int parseQueryJobsRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***conditions, int *flags);
-int parseQueryEventsRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_QueryRec ***job_conditions, edg_wll_QueryRec ***event_conditions);
-int parsePurgeRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_PurgeRequest *request);
-int parseDumpRequestV21(edg_wll_Context ctx, char *messageBody, edg_wll_DumpRequest *request);
-int edg_wll_QueryEventsToXMLV21(edg_wll_Context, edg_wll_Event *, char **);
-int edg_wll_QueryJobsToXMLV21(edg_wll_Context, edg_wlc_JobId *, edg_wll_JobStat *, char **);
-int edg_wll_JobStatusToXMLV21(edg_wll_Context, edg_wll_JobStat, char **);
-int edg_wll_UserJobsToXMLV21(edg_wll_Context, edg_wlc_JobId *, char **);
-int edg_wll_PurgeResultToXMLV21(edg_wll_Context ctx, edg_wll_PurgeResult *result, char **message);
-int edg_wll_DumpResultToXMLV21(edg_wll_Context ctx, edg_wll_DumpResult *result, char **message);
-
-#endif
diff --git a/org.glite.lb.server/src/lbs_db.c b/org.glite.lb.server/src/lbs_db.c

deleted file mode 100644 (file)

index a54f133..0000000
--- a/org.glite.lb.server/src/lbs_db.c
+++ /dev/null
@@ -1,224 +0,0 @@
-#ident "$Header$"
-
-#include "mysql.h"     // MySql header file
-#include "mysqld_error.h"
-#include "errmsg.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <time.h>
-
-#include "lbs_db.h"
-#include "glite/lb/context-int.h"
-
-
-#define DEFAULTCS      "lbserver/@localhost:lbserver20"
-
-#define my_err() edg_wll_SetError(ctx,EDG_WLL_ERROR_DB_CALL,mysql_error((MYSQL *) ctx->mysql))
-
-struct _edg_wll_Stmt {
-       MYSQL_RES       *result;
-       edg_wll_Context ctx;
-};
-
-edg_wll_ErrorCode edg_wll_DBConnect(edg_wll_Context ctx,char *cs)
-{
-       char    *buf = NULL;
-       char    *host,*user,*pw,*db; 
-       char    *slash,*at,*colon;
-
-       if (!cs) cs = DEFAULTCS;
-
-       if (!(ctx->mysql = (void *) mysql_init(NULL))) 
-               return edg_wll_SetError(ctx,ENOMEM,NULL);
-
-       mysql_options(ctx->mysql, MYSQL_READ_DEFAULT_FILE, "my");
-
-       host = user = pw = db = NULL;
-
-       buf = strdup(cs);
-       slash = strchr(buf,'/');
-       at = strrchr(buf,'@');
-       colon = strrchr(buf,':');
-
-       if (!slash || !at || !colon) {
-               free(buf);
-               return edg_wll_SetError(ctx,EINVAL,"DB connect string");
-       }
-
-       *slash = *at = *colon = 0;
-       host = at+1;
-       user = buf;
-       pw = slash+1;
-       db = colon+1;
-
-       /* ljocha: CLIENT_FOUND_ROWS added to make authorization check
-        * working in update_notif(). 
-        * Hope it does not break anything else */ 
-       if (!mysql_real_connect((MYSQL *) ctx->mysql,host,user,pw,db,0,NULL,CLIENT_FOUND_ROWS)) {
-               free(buf);
-               return my_err();
-       }
-
-       free(buf);
-       return edg_wll_ResetError(ctx);
-}
-
-void edg_wll_DBClose(edg_wll_Context ctx)
-{
-       mysql_close((MYSQL *) ctx->mysql);
-       ctx->mysql = NULL;
-}
-
-int edg_wll_ExecStmt(edg_wll_Context ctx,char *txt,edg_wll_Stmt *stmt)
-{
-       int     err;
-       int     retry_nr = 0;
-       int     do_reconnect = 0;
-
-       edg_wll_ResetError(ctx);
-
-       if (stmt) {
-               *stmt = NULL;
-       }
-
-       while (retry_nr == 0 || do_reconnect) {
-               do_reconnect = 0;
-               if (mysql_query((MYSQL *) ctx->mysql,txt)) {
-                       /* error occured */
-                       switch (err = mysql_errno((MYSQL *) ctx->mysql)) {
-                               case 0:
-                                       break;
-                               case ER_DUP_ENTRY: 
-                                       edg_wll_SetError(ctx,EEXIST,mysql_error((MYSQL *) ctx->mysql));
-                                       return -1;
-                                       break;
-                               case CR_SERVER_LOST:
-                                       if (retry_nr <= 0) 
-                                               do_reconnect = 1;
-                                       break;
-                               default:
-                                       my_err();
-                                       return -1;
-                                       break;
-                       }
-               }
-               retry_nr++;
-       }
-
-       if (stmt) {
-               *stmt = malloc(sizeof(**stmt));
-               if (!*stmt) {
-                       edg_wll_SetError(ctx,ENOMEM,NULL);
-                       return -1;
-               }
-               memset(*stmt,0,sizeof(**stmt));
-               (**stmt).ctx = ctx;
-               (**stmt).result = mysql_store_result((MYSQL *) ctx->mysql);
-               if (!(**stmt).result) {
-                       if (mysql_errno((MYSQL *) ctx->mysql)) {
-                               my_err();
-                               return -1;
-                       }
-               }
-       } else {
-               MYSQL_RES       *r = mysql_store_result((MYSQL *) ctx->mysql);
-               mysql_free_result(r);
-       }
-       
-       return mysql_affected_rows((MYSQL *) ctx->mysql);
-}
-
-int edg_wll_FetchRow(edg_wll_Stmt stmt,char **res)
-{
-       MYSQL_ROW       row;
-       edg_wll_Context ctx = stmt->ctx;
-       int             nr,i;
-       unsigned long   *len;
-
-       edg_wll_ResetError(ctx);
-
-       if (!stmt->result) return 0;
-
-       if (!(row = mysql_fetch_row(stmt->result))) {
-               if (mysql_errno((MYSQL *) ctx->mysql)) {
-                       my_err();
-                       return -1;
-               } else return 0;
-       }
-
-       nr = mysql_num_fields(stmt->result);
-       len = mysql_fetch_lengths(stmt->result);
-       for (i=0; i<nr; i++) res[i] = len[i] ? strdup(row[i]) : strdup("");
-
-       return nr;
-}
-
-int edg_wll_QueryColumns(edg_wll_Stmt stmt,char **cols)
-{
-       int     i = 0;
-       MYSQL_FIELD     *f;
-
-       while ((f = mysql_fetch_field(stmt->result))) cols[i++] = f->name;
-       return i == 0;
-}
-
-void edg_wll_FreeStmt(edg_wll_Stmt *stmt)
-{
-       if (*stmt) {
-               if ((**stmt).result) mysql_free_result((**stmt).result);
-               free(*stmt);
-               *stmt = NULL;
-       }
-}
-
-
-char *edg_wll_TimeToDB(time_t t)
-{
-       struct tm       *tm = gmtime(&t);
-       char    tbuf[256];
-
-       sprintf(tbuf,"'%4d-%02d-%02d %02d:%02d:%02d'",tm->tm_year+1900,tm->tm_mon+1,
-               tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec);
-       
-       return strdup(tbuf);
-}
-
-time_t edg_wll_DBToTime(char *t)
-{
-       struct tm       tm;
-
-       memset(&tm,0,sizeof(tm));
-       setenv("TZ","UTC",1); tzset();
-       sscanf(t,"%4d-%02d-%02d %02d:%02d:%02d",
-               &tm.tm_year,&tm.tm_mon,&tm.tm_mday,
-               &tm.tm_hour,&tm.tm_min,&tm.tm_sec);
-       tm.tm_year -= 1900;
-       tm.tm_mon--;
-
-       return mktime(&tm);
-}
-
-int edg_wll_DBCheckVersion(edg_wll_Context ctx)
-{
-       MYSQL   *m = (MYSQL *) ctx->mysql;
-       const   char *ver_s = mysql_get_server_info(m);
-       int     major,minor,sub,version;
-
-       if (!ver_s || 3 != sscanf(ver_s,"%d.%d.%d",&major,&minor,&sub))
-               return edg_wll_SetError(ctx,EINVAL,"retreiving MySQL version");
-
-       version = 10000*major + 100*minor + sub;
-
-       if (version < EDG_WLL_MYSQL_VERSION) {
-               char    msg[300];
-
-               snprintf(msg,sizeof msg,"Your MySQL version is %d. At least %d required.",version,EDG_WLL_MYSQL_VERSION);
-               return edg_wll_SetError(ctx,EINVAL,msg);
-       }
-
-       return edg_wll_ResetError(ctx);
-}
diff --git a/org.glite.lb.server/src/lbs_db.h b/org.glite.lb.server/src/lbs_db.h

deleted file mode 100644 (file)

index 3d7a344..0000000
--- a/org.glite.lb.server/src/lbs_db.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#ifndef _LBS_DB_H
-#define _LBS_DB_H
-
-#ident "$Header$"
-
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include "glite/lb/consumer.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EDG_WLL_MYSQL_VERSION  40001
-
-typedef struct _edg_wll_Stmt *edg_wll_Stmt;
-
-edg_wll_ErrorCode edg_wll_DBConnect(
-       edg_wll_Context,        /* INOUT: */
-       char *          /* IN: connect string user/password@host:database */
-);
-
-void edg_wll_DBClose(edg_wll_Context);
-
-
-/* Parse and execute SQL statement. Returns number of rows selected, created 
- * or affected by update, or -1 on error */
-
-int edg_wll_ExecStmt(
-       edg_wll_Context,        /* INOUT: */
-       char *,         /* IN: SQL statement */
-       edg_wll_Stmt *  /* OUT: statement handle. Usable for select only */
-);
-
-
-/* Fetch next row of select statement. 
- * All columns are returned as fresh allocated strings 
- *
- * return values:
- *     >0 - number of fields of the retrieved row
- *      0 - no more rows
- *     -1 - error
- *
- * Errors are stored in context passed to previous edg_wll_ExecStmt() */
-
-int edg_wll_FetchRow(
-       edg_wll_Stmt,   /* IN: statement */
-       char **         /* OUT: array of fetched values. 
-                        *      As number of columns is fixed and known,
-                        *      expects allocated array of pointers here */
-);
-
-/* Retrieve column names of a query statement */
-
-int edg_wll_QueryColumns(
-       edg_wll_Stmt,   /* IN: statement */
-       char **         /* OUT: result set column names. Expects allocated array. */
-);
-
-/* Free the statement structure */
-
-void edg_wll_FreeStmt(
-       edg_wll_Stmt *    /* INOUT: statement */
-);
-
-
-/* convert time_t into database-specific time string 
- * returns pointer to static area that is changed by subsequent calls */
-char *edg_wll_TimeToDB(time_t);
-time_t edg_wll_DBToTime(char *);
-
-extern edg_wll_ErrorCode edg_wll_Open(edg_wll_Context ctx, char *cs);
-
-/**
- * Check database version.
- */
-int edg_wll_DBCheckVersion(edg_wll_Context);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/org.glite.lb.server/src/load.c b/org.glite.lb.server/src/load.c

deleted file mode 100644 (file)

index 0f08964..0000000
--- a/org.glite.lb.server/src/load.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#ident "$Header$"
-
-#include <time.h>
-#include <stdio.h>
-#include <string.h>
-#include <syslog.h>
-#include <assert.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <ctype.h>
-
-#include "glite/lb/trio.h"
-
-#include "glite/lb/context-int.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/ulm_parse.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/events.h"
-#include "glite/lb/dump.h"
-#include "glite/lb/load.h"
-
-#include "store.h"
-#include "purge.h"
-#include "lbs_db.h"
-#include "query.h"
-#include "get_events.h"
-#include "server_state.h"
-
-
-static int read_line(char **buff, int fd);
-
-int edg_wll_LoadEvents(edg_wll_Context ctx,const edg_wll_LoadRequest *req,edg_wll_LoadResult *result)
-{
-       int                                     fd,
-                                               reject_fd = -1,
-                                               readret, i;
-       char                       *line = NULL,
-                                               buff[30];
-       edg_wll_Event      *event;
-       edg_wlc_JobId           jobid = NULL;
-
-
-       edg_wll_ResetError(ctx);
-       
-       if ( !req->server_file )
-               return edg_wll_SetError(ctx, EINVAL, "Server file is not specified for load");
-
-       if ( (fd = open(req->server_file, O_RDONLY)) == -1 )
-               return edg_wll_SetError(ctx, errno, "Server can not open the file");
-
-       memset(result,0,sizeof(*result));
-       i = 0;
-       while ( 1 )
-       {
-               /*      Read one line
-                */
-               if ( (readret = read_line(&line, fd)) == -1 )
-                       return edg_wll_SetError(ctx, errno, "reading dump file");
-
-               if ( readret == 0 )
-                       break;
-
-               i++;
-               if (   sscanf(line, "DG.ARRIVED=%s %*s", buff) != 1
-                       || edg_wll_ParseEvent(ctx, line, &event) )
-               {
-                       char errs[100];
-                       sprintf(errs, "Error parsing event at line %d", i);
-                       if ( !edg_wll_Error(ctx,NULL,NULL) )
-                               edg_wll_SetError(ctx, EINVAL, errs);
-                       fprintf(stderr, errs);
-                       continue;
-               }
-               edg_wll_ULMDateToTimeval(buff, &(event->any.arrived));
-
-               if ( i == 1 )
-               {
-                       result->from = event->any.arrived.tv_sec;
-                       result->to = event->any.arrived.tv_sec;
-               }
-               ctx->event_load = 1;
-               if ( edg_wll_StoreEvent(ctx, event, NULL) )
-               {
-                       int             len = strlen(line),
-                                       total = 0,
-                                       written;
-
-                       fprintf(stderr, "Can't store event\n");
-                       if ( reject_fd == -1 )
-                       {
-                               char   *s, *s1;
-
-                               if ( result->server_file != NULL )
-                                       goto cycle_clean;
-
-                               s1 = strdup(req->server_file);
-                               s = strrchr(s1, '/');
-                               if ( s )
-                               {
-                                       *s = '\0';
-                                       reject_fd = edg_wll_CreateFileStorage(ctx,FILE_TYPE_LOAD,s1,&(result->server_file));
-                               }
-                               else
-                                       reject_fd = edg_wll_CreateFileStorage(ctx,FILE_TYPE_LOAD,NULL,&(result->server_file));
-                               if ( reject_fd == -1 )
-                                       goto cycle_clean;
-                               printf("New reject file %s created\n", result->server_file);
-                               free(s1);
-                       }
-                       /*      Save the line into "reject_file"
-                        */
-                       while (total != len) {
-                               written = write(reject_fd, line+total, len-total);
-                               if (written < 0 && errno != EAGAIN) {
-                                       edg_wll_SetError(ctx, errno, "writing load reject file");
-                                       free(line);
-                                       break;
-                               }
-                               total += written;
-                       }
-                       write(reject_fd,"\n",1);
-               }
-               else
-               {
-                       result->to = event->any.arrived.tv_sec;
-                       if ( jobid )
-                       {
-                               char *md5_jobid = edg_wlc_JobIdGetUnique(jobid);
-                               
-                               if ( strcmp(md5_jobid, edg_wlc_JobIdGetUnique(event->any.jobId)) )
-                               {
-                                       edg_wll_JobStat st;
-
-                                       edg_wll_JobStatus(ctx, jobid, 0, &st);
-                                       edg_wll_FreeStatus(&st);
-
-                                       edg_wlc_JobIdFree(jobid);
-                                       edg_wlc_JobIdDup(event->any.jobId, &jobid);
-                               }
-                               free(md5_jobid);
-                       }
-                       else
-                               edg_wlc_JobIdDup(event->any.jobId, &jobid);
-               }
-
-
-cycle_clean:
-               ctx->event_load = 0;
-               edg_wll_FreeEvent(event);
-       }
-
-       if ( jobid )
-       {
-               edg_wll_JobStat st;
-
-               edg_wll_JobStatus(ctx, jobid, 0, &st);
-               edg_wll_FreeStatus(&st);
-               edg_wlc_JobIdFree(jobid);
-       }
-
-       if ( reject_fd != -1 )
-               close(reject_fd);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-#define BUFFSZ                 1024
-
-static int read_line(char **buff, int fd)
-{
-       int             ct, i;
-
-
-       if ( *buff == NULL )
-       {
-               *buff = malloc(BUFFSZ); 
-               if ( *buff == NULL )
-                       return -1;
-       }
-
-       i = 0;
-       while ( 1 )
-       {
-               if ( (ct = read(fd, (*buff)+i, 1)) == -1 )
-                       return -1;
-
-               if ( ct == 0 )
-                       return 0;
-
-               if ( (*buff)[i] == '\n' )
-               {
-                       (*buff)[i--] = '\0';
-                       while ( (i != -1) && isspace((*buff)[i]) ) i--;
-                       if ( i == -1 )
-                       {
-                               /**     empty line
-                                */
-                               i = 0;
-                               continue;
-                       }
-                       else
-                               return 1;
-               }
-
-               i++;
-       }
-}
diff --git a/org.glite.lb.server/src/lock.c b/org.glite.lb.server/src/lock.c

deleted file mode 100644 (file)

index 70a817f..0000000
--- a/org.glite.lb.server/src/lock.c
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <unistd.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <errno.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/lb/context-int.h"
-#include "lock.h"
-
-
-int edg_wll_LockUnlockJob(const edg_wll_Context ctx,const edg_wlc_JobId job,int lock)
-{
-       struct sembuf   s;
-       char    *un = edg_wlc_JobIdGetUnique(job);
-       int     n,i;
-       static const char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-       
-       if (!un) return edg_wll_SetError(ctx,EINVAL,"jobid");
-
-       for (n=0; n<sizeof b64 && b64[n] != un[0]; n++);
-       for (i=0; i<sizeof b64 && b64[i] != un[1]; i++);
-       n += i<<6;
-
-       fprintf(stderr,"[%d] semop(%d,%d) \n",getpid(),n % ctx->semaphores,lock);
-
-       s.sem_num = n % ctx->semaphores;
-       s.sem_op = lock;
-       s.sem_flg = SEM_UNDO;
-
-       if (semop(ctx->semset,&s,1)) return edg_wll_SetError(ctx,errno,"edg_wll_LockUnlockJob()");
-       return edg_wll_ResetError(ctx);
-}
diff --git a/org.glite.lb.server/src/lock.h b/org.glite.lb.server/src/lock.h

deleted file mode 100644 (file)

index c67ec6d..0000000
--- a/org.glite.lb.server/src/lock.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#define edg_wll_LockJob(ctx,job) edg_wll_LockUnlockJob((ctx),(job),-1)
-#define edg_wll_UnlockJob(ctx,job) edg_wll_LockUnlockJob((ctx),(job),1)
-
-int edg_wll_LockUnlockJob(const edg_wll_Context,const edg_wlc_JobId,int);
diff --git a/org.glite.lb.server/src/notif_match.c b/org.glite.lb.server/src/notif_match.c

deleted file mode 100644 (file)

index 10d97d4..0000000
--- a/org.glite.lb.server/src/notif_match.c
+++ /dev/null
@@ -1,167 +0,0 @@
-#ident "$Header$"
-
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <syslog.h>
-
-#include "glite/lb/producer.h"
-#include "glite/lb/consumer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-
-#include "lbs_db.h"
-#include "lb_authz.h"
-#include "lb_xml_parse.h"
-#include "query.h"
-#include "il_notification.h"
-
-
-
-static int notif_match_conditions(edg_wll_Context,const edg_wll_JobStat *,const char *);
-static int notif_check_acl(edg_wll_Context,const edg_wll_JobStat *,const char *);
-
-int edg_wll_NotifExpired(edg_wll_Context,const char *);
-
-int edg_wll_NotifMatch(edg_wll_Context ctx, const edg_wll_JobStat *stat)
-{
-       edg_wll_NotifId         nid = NULL;
-       char    *jobq,*ju = NULL,*jobc[5];
-       edg_wll_Stmt    jobs = NULL;
-       int     ret,i;
-       time_t  now = time(NULL);
-
-       edg_wll_ResetError(ctx);
-
-       if ( (ret = edg_wll_NotifIdCreate(ctx->srvName, ctx->srvPort, &nid)) )
-       {
-               edg_wll_SetError(ctx, ret, "edg_wll_NotifMatch()");
-               goto err;
-       }
-       trio_asprintf(&jobq,
-               "select distinct n.notifid,n.destination,n.valid,u.cert_subj,n.conditions "
-               "from notif_jobs j,users u,notif_registrations n "
-               "where j.notifid=n.notifid and n.userid=u.userid "
-               "   and j.jobid = '%|Ss'",ju = edg_wlc_JobIdGetUnique(stat->jobId));
-
-       free(ju);
-
-       if (edg_wll_ExecStmt(ctx,jobq,&jobs) < 0) goto err;
-
-       while ((ret = edg_wll_FetchRow(jobs,jobc)) > 0) {
-               if (now > edg_wll_DBToTime(jobc[2]))
-                       edg_wll_NotifExpired(ctx,jobc[0]);
-               else if (notif_match_conditions(ctx,stat,jobc[4]) &&
-                               notif_check_acl(ctx,stat,jobc[3]))
-               {
-                       char                       *dest, *aux;
-                       int                                     port;
-
-                       fprintf(stderr,"NOTIFY: %s, job %s\n",jobc[0],
-                                       ju = edg_wlc_JobIdGetUnique(stat->jobId));
-                       free(ju);
-
-                       dest = strdup(jobc[1]);
-                       if ( !(aux = strchr(dest, ':')) )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "Can't parse notification destination");
-                               free(dest);
-                               for (i=0; i<sizeof(jobc)/sizeof(jobc[0]); i++) free(jobc[i]);
-                               goto err;
-                       }
-                       *aux = 0;
-                       aux++;
-                       port = atoi(aux);
-                       
-                       if (   edg_wll_NotifIdSetUnique(&nid, jobc[0]) )
-                       {
-                               free(dest);
-                               goto err;
-                       }
-                       /* XXX: only temporary hack!!!
-                        */
-                       ctx->p_instance = strdup("");
-                       if ( edg_wll_NotifJobStatus(ctx, nid, dest, port, jobc[3], *stat) )
-                       {
-                               free(dest);
-                               for (i=0; i<sizeof(jobc)/sizeof(jobc[0]); i++) free(jobc[i]);
-                               goto err;
-                       }
-                       free(dest);
-               }
-               
-               for (i=0; i<sizeof(jobc)/sizeof(jobc[0]); i++) free(jobc[i]);
-       }
-       if (ret < 0) goto err;
-       
-err:
-       if ( nid ) edg_wll_NotifIdFree(nid);
-       free(jobq);
-       edg_wll_FreeStmt(&jobs);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_NotifExpired(edg_wll_Context ctx,const char *notif)
-{
-       /* TODO */
-       return 0;
-}
-
-
-static int notif_match_conditions(edg_wll_Context ctx,const edg_wll_JobStat *stat,const char *cond)
-{
-       edg_wll_QueryRec        **c,**p;
-       int                     match,i;
-
-       if (!cond) return 1;
-
-       if (parseJobQueryRec(ctx,cond,strlen(cond),&c)) {
-               fputs("notif_match_conditions(): parseJobQueryRec failed\n",stderr);
-               syslog(LOG_ERR,"notif_match_conditions(): parseJobQueryRec failed");
-               return 1;
-       }
-
-       match = match_status(ctx,stat,(const edg_wll_QueryRec **) c);
-       if ( c )
-       {
-               for (p = c; *p; p++) {
-                       for (i=0; (*p)[i].attr; i++)
-                               edg_wll_QueryRecFree((*p)+i);
-                       free(*p);
-               }
-               free(c);
-       }
-       return match;
-}
-
-/* FIXME: does not favour any VOMS information in ACL
- * effective VOMS groups of the recipient are not available here, should be 
- * probably stored along with the registration.
- */
-static int notif_check_acl(edg_wll_Context ctx,const edg_wll_JobStat *stat,const char *recip)
-{
-       edg_wll_Acl     acl = calloc(1,sizeof *acl);
-/* XXX: NO_GACL        GACLacl         *gacl; */
-       void            *gacl;
-       int             ret;
-
-       edg_wll_ResetError(ctx);
-       if (ctx->noAuth || strcmp(stat->owner,recip) == 0) return 1;
-
-       ret = edg_wll_DecodeACL(stat->acl,&gacl);
-       if (ret) {
-               edg_wll_SetError(ctx,EINVAL,"decoding ACL");
-               return 0;
-       }
-
-       acl->string = stat->acl; 
-       acl->value = gacl;
-
-       ret = edg_wll_CheckACL(ctx, acl, EDG_WLL_PERM_READ);
-
-       acl->string = NULL;
-       edg_wll_FreeAcl(acl);
-
-       return !ret;
-}
diff --git a/org.glite.lb.server/src/notification.c b/org.glite.lb.server/src/notification.c

deleted file mode 100644 (file)

index 5c88757..0000000
--- a/org.glite.lb.server/src/notification.c
+++ /dev/null
@@ -1,628 +0,0 @@
-#include <string.h>
-#include <time.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "glite/wmsutils/jobid/strmd5.h"
-#include "glite/lb/trio.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/xml_parse.h"
-#include "glite/lb/notification.h"
-#include "lbs_db.h"
-
-
-static char *get_user(edg_wll_Context ctx, int create);
-static int check_notif_request(edg_wll_Context, const edg_wll_NotifId, char **);
-static int split_cond_list(edg_wll_Context, edg_wll_QueryRec const * const *,
-                                               edg_wll_QueryRec ***, char ***);
-static int update_notif(edg_wll_Context, const edg_wll_NotifId,
-                                               const char *, const char *, const char *);
-
-
-int edg_wll_NotifNewServer(
-       edg_wll_Context                                 ctx,
-       edg_wll_QueryRec const * const *conditions,
-       char const                                         *address_override,
-       const edg_wll_NotifId                   nid,
-       time_t                                             *valid)
-{
-       int                                     i;
-       char                       *q                   = NULL,
-                                          *nid_s               = NULL,
-                                          *time_s              = NULL,
-                                          *addr_s              = NULL,
-                                          *xml_conds   = NULL,
-                                          *owner               = NULL,
-                                         **jobs                = NULL;
-       edg_wll_QueryRec  **nconds              = NULL;
-
-
-       /*      Format notification ID
-        */
-       if ( !(nid_s = edg_wll_NotifIdGetUnique(nid)) )
-               goto cleanup;
-
-       /*      Get notification owner
-        */
-       if ( !(owner = get_user(ctx, 1)) )
-               goto cleanup;
-
-       /*      Format conditions
-        *      - separate all jobids
-        *      - format new condition list without jobids
-        */
-       if ( split_cond_list(ctx, conditions, &nconds, &jobs) )
-               goto cleanup;
-
-       /*
-        *      encode new cond. list into a XML string
-        */
-       if ( edg_wll_JobQueryRecToXML(ctx, (edg_wll_QueryRec const * const *) nconds, &xml_conds) )
-       {
-               /*      XXX: edg_wll_JobQueryRecToXML() do not set errors in context!
-                *                      can't get propper error number :(
-                */
-               edg_wll_SetError(ctx, errno, "Can't encode data into xml");
-               goto cleanup;
-       }
-
-       /*      Format time of validity
-        */
-       *valid = time(NULL);
-       if (   ctx->peerProxyValidity
-               && (ctx->peerProxyValidity - *valid) < ctx->notifDuration )
-               *valid = ctx->peerProxyValidity;
-       else
-               *valid += ctx->notifDuration;
-       
-       if ( !(time_s = strdup(edg_wll_TimeToDB(*valid))) )
-       {
-               edg_wll_SetError(ctx, errno, NULL);
-               goto cleanup;
-       }
-       time_s[strlen(time_s)-1] = 0;
-
-       /*      Format the address
-        */
-       if ( address_override )
-       {
-               char   *aux;
-
-               if ( !(aux = strchr(address_override, ':')) )
-               {
-                       edg_wll_SetError(ctx, EINVAL, "Addres overrirde not in format host:port");
-                       goto cleanup;
-               }
-               if ( !strncmp(address_override, "0.0.0.0", aux-address_override) )
-                       trio_asprintf(&addr_s, "%s:%s", ctx->connPool[ctx->connToUse].peerName, aux+1);
-       }
-
-       /*      Format DB insert statement
-        */
-       trio_asprintf(&q,
-                               "insert into notif_registrations(notifid,destination,valid,userid,conditions) "
-                               "values ('%|Ss','%|Ss','%|Ss','%|Ss', '<and>%|Ss</and>')",
-                               nid_s, addr_s? addr_s: address_override, time_s+1, owner, xml_conds);
-
-       if ( edg_wll_ExecStmt(ctx, q, NULL) < 0 )
-               goto cleanup;
-
-       for ( i = 0; jobs[i]; i++ )
-       {
-               free(q);
-               trio_asprintf(&q,
-                               "insert into notif_jobs(notifid,jobid) values ('%|Ss','%|Ss')",
-                               nid_s, jobs[i]);
-               if ( edg_wll_ExecStmt(ctx, q, NULL) < 0 )
-               {
-                       /*      XXX: Remove uncoplete registration?
-                        *               Which error has to be returned?
-                        */
-                       free(q);
-                       trio_asprintf(&q, "delete from notif_jobs where notifid='%|Ss'", nid_s);
-                       edg_wll_ExecStmt(ctx, q, NULL);
-                       free(q);
-                       trio_asprintf(&q, "delete from notif_registrations where notifid='%|Ss'", nid_s);
-                       edg_wll_ExecStmt(ctx, q, NULL);
-                       goto cleanup;
-               }
-       }
-
-
-cleanup:
-       if ( q ) free(q);
-       if ( nid_s ) free(nid_s);
-       if ( time_s ) free(time_s);
-       if ( addr_s ) free(addr_s);
-       if ( xml_conds ) free(xml_conds);
-       if ( owner ) free(owner);
-       if ( jobs )
-       {
-               for ( i = 0; jobs[i]; i++ )
-                       free(jobs[i]);
-               free(jobs);
-       }
-       if ( nconds ) free(nconds);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-int edg_wll_NotifBindServer(
-       edg_wll_Context                                 ctx,
-       const edg_wll_NotifId                   nid,
-       const char                                         *address_override,
-       time_t                                             *valid)
-{
-       char       *time_s = NULL,
-                          *addr_s = NULL;
-
-
-       if ( !address_override )
-       {
-               edg_wll_SetError(ctx, EINVAL, "Address parameter not given");
-               goto cleanup;
-       }
-
-       if ( check_notif_request(ctx, nid, NULL) )
-               goto cleanup;
-
-       /*      Format time of validity
-        */
-       *valid = time(NULL);
-       if (   ctx->peerProxyValidity
-               && (ctx->peerProxyValidity - *valid) < ctx->notifDuration )
-               *valid = ctx->peerProxyValidity;
-       else
-               *valid += ctx->notifDuration;
-
-       if ( !(time_s = strdup(edg_wll_TimeToDB(*valid))) )
-       {
-               edg_wll_SetError(ctx, errno, "Formating validity time");
-               goto cleanup;
-       }
-       time_s[strlen(time_s)-1] = 0;
-
-       /*      Format the address
-        */
-       if ( address_override )
-       {
-               char   *aux;
-
-               if ( !(aux = strchr(address_override, ':')) )
-               {
-                       edg_wll_SetError(ctx, EINVAL, "Addres overrirde not in format host:port");
-                       goto cleanup;
-               }
-               if ( !strncmp(address_override, "0.0.0.0", aux-address_override) )
-                       trio_asprintf(&addr_s, "%s:%s", ctx->connPool[ctx->connToUse].peerName, aux+1);
-       }
-
-
-       update_notif(ctx, nid, NULL, addr_s? addr_s: address_override, (const char *)(time_s+1));
-
-cleanup:
-       if ( time_s ) free(time_s);
-       if ( addr_s ) free(addr_s);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-int edg_wll_NotifChangeServer(
-       edg_wll_Context                                 ctx,
-       const edg_wll_NotifId                   nid,
-       edg_wll_QueryRec const * const *conditions,
-       edg_wll_NotifChangeOp                   op)
-{
-       int                                     i;
-       char                       *q                   = NULL,
-                                          *nid_s               = NULL,
-                                          *xml_conds   = NULL,
-                                         **jobs                = NULL;
-       edg_wll_QueryRec  **nconds              = NULL;
-
-
-       /*      Format notification ID
-        */
-       if ( !(nid_s = edg_wll_NotifIdGetUnique(nid)) )
-               goto cleanup;
-
-       if ( check_notif_request(ctx, nid, NULL) )
-               goto cleanup;
-
-       switch ( op )
-       {
-       case EDG_WLL_NOTIF_REPLACE:
-               /*      Format conditions
-                *      - separate all jobids
-                *      - format new condition list without jobids
-                */
-               if ( split_cond_list(ctx, conditions, &nconds, &jobs) )
-                       goto cleanup;
-
-               /*
-                *      encode new cond. list into a XML string
-                */
-               if ( edg_wll_JobQueryRecToXML(ctx, (edg_wll_QueryRec const * const *) nconds, &xml_conds) )
-               {
-                       /*      XXX: edg_wll_JobQueryRecToXML() do not set errors in context!
-                        *                      can't get propper error number :(
-                        */
-                       edg_wll_SetError(ctx, errno, "Can't encode data into xml");
-                       goto cleanup;
-               }
-
-               /*      Format DB insert statement
-                */
-               if ( update_notif(ctx, nid, xml_conds, NULL, NULL) )
-                       goto cleanup;
-
-               if ( jobs )
-               {
-                       /*      Format DB insert statement
-                        */
-                       trio_asprintf(&q, "delete from  notif_jobs where notifid='%|Ss'", nid_s);
-                       if ( edg_wll_ExecStmt(ctx, q, NULL) < 0 )
-                               goto cleanup;
-
-                       for ( i = 0; jobs[i]; i++ )
-                       {
-                               free(q);
-                               trio_asprintf(&q,
-                                               "insert into notif_jobs(notifid,jobid) values ('%|Ss','%|Ss')",
-                                               nid_s, jobs[i]);
-                               if ( edg_wll_ExecStmt(ctx, q, NULL) < 0 )
-                               {
-                                       /*      XXX: Remove uncoplete registration?
-                                        *               Which error has to be returned?
-                                        */
-                                       free(q);
-                                       trio_asprintf(&q, "delete from notif_jobs where notifid='%|Ss'", nid_s);
-                                       edg_wll_ExecStmt(ctx, q, NULL);
-                                       free(q);
-                                       trio_asprintf(&q,"delete from notif_registrations where notifid='%|Ss'", nid_s);
-                                       edg_wll_ExecStmt(ctx, q, NULL);
-                                       goto cleanup;
-                               }
-                       }
-               }
-               break;
-
-       case EDG_WLL_NOTIF_ADD:
-               break;
-       case EDG_WLL_NOTIF_REMOVE:
-               break;
-       default:
-               break;
-       }
-
-cleanup:
-       if ( q ) free(q);
-       if ( xml_conds ) free(xml_conds);
-       if ( nid_s ) free(nid_s);
-       if ( jobs )
-       {
-               for ( i = 0; jobs[i]; i++ )
-                       free(jobs[i]);
-               free(jobs);
-       }
-       if ( nconds ) free(nconds);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-int edg_wll_NotifRefreshServer(
-       edg_wll_Context                                 ctx,
-       const edg_wll_NotifId                   nid,
-       time_t                                             *valid)
-{
-       char       *time_s = NULL;
-
-
-       if ( check_notif_request(ctx, nid, NULL) )
-               goto cleanup;
-
-       /*      Format time of validity
-        */
-       *valid = time(NULL);
-       if (   ctx->peerProxyValidity
-               && (ctx->peerProxyValidity - *valid) < ctx->notifDuration )
-               *valid = ctx->peerProxyValidity;
-       else
-               *valid += ctx->notifDuration;
-
-       if ( !(time_s = strdup(edg_wll_TimeToDB(*valid))) )
-       {
-               edg_wll_SetError(ctx, errno, "Formating validity time");
-               goto cleanup;
-       }
-       time_s[strlen(time_s)-1] = 0;
-
-       update_notif(ctx, nid, NULL, NULL, time_s+1);
-
-cleanup:
-       if ( time_s ) free(time_s);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-int edg_wll_NotifDropServer(
-       edg_wll_Context                                 ctx,
-       edg_wll_NotifId                            *nid)
-{
-       char       *nid_s = NULL,
-                          *stmt;
-       int                     ret;
-
-
-       if ( check_notif_request(ctx, nid, NULL) )
-               goto cleanup;
-
-       if ( !(nid_s = edg_wll_NotifIdGetUnique(nid)) )
-               goto cleanup;
-
-       trio_asprintf(&stmt, "delete from notif_registrations where notifid='%|Ss'", nid_s);
-       if ( (ret = edg_wll_ExecStmt(ctx, stmt, NULL)) < 0 )
-               goto cleanup;
-       free(stmt);
-       trio_asprintf(&stmt, "delete from notif_jobs where notifid='%|Ss'", nid_s);
-       edg_wll_ExecStmt(ctx, stmt, NULL);
-
-cleanup:
-       if ( nid_s ) free(nid_s);
-       if ( stmt ) free(stmt);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-static char *get_user(edg_wll_Context ctx, int create)
-{
-       edg_wll_Stmt    stmt    = NULL;
-       char               *userid      = NULL,
-                                  *q           = NULL;
-       int                             ret;
-
-
-       if ( !ctx->peerName )
-       {
-               edg_wll_SetError(ctx, EPERM, "Annonymous access not allowed");
-               goto cleanup;
-       }
-       trio_asprintf(&q, "select userid from users where cert_subj='%|Ss'", ctx->peerName);
-       if ( edg_wll_ExecStmt(ctx, q, &stmt) < 0 )
-               goto cleanup;
-
-       /*      returned value:
-        *      0               no user find - continue only when 'create' parameter is set
-        *      >0              user found - return selected value
-        *      <0              SQL error
-        */
-       if ( ((ret = edg_wll_FetchRow(stmt, &userid)) != 0) || !create )
-               goto cleanup;
-
-       if ( !(userid = strdup(strmd5(ctx->peerName, NULL))) )
-       {
-               edg_wll_SetError(ctx, errno, "Creating user ID");
-               goto cleanup;
-       }
-       free(q);
-       trio_asprintf(&q, "insert into users(userid,cert_subj) values ('%|Ss','%|Ss')",
-                       userid, ctx->peerName);
-       if ( edg_wll_ExecStmt(ctx, q, NULL) < 0 )
-       {
-               if ( edg_wll_Error(ctx,NULL,NULL) != EEXIST )
-               {
-                       free(userid);
-                       userid = NULL;
-               }
-               else
-                       edg_wll_ResetError(ctx);
-       }
-
-cleanup:
-       if ( q ) free(q);
-       if ( stmt ) edg_wll_FreeStmt(&stmt);
-
-       return userid;
-}
-
-
-static int check_notif_request(
-       edg_wll_Context                         ctx,
-       const edg_wll_NotifId           nid,
-       char                                      **owner)
-{
-       char       *nid_s = NULL,
-                          *stmt, *user;
-       int                     ret;
-
-
-       if ( !(user = get_user(ctx, 0)) )
-       {
-               if ( !edg_wll_Error(ctx, NULL, NULL) )
-                       edg_wll_SetError(ctx, EPERM, "Unknown user");
-
-               return edg_wll_Error(ctx, NULL, NULL);
-       }
-
-       if ( !(nid_s = edg_wll_NotifIdGetUnique(nid)) )
-               goto cleanup;
-
-       trio_asprintf(&stmt,
-                               "select notifid from notif_registrations "
-                               "where notifid='%|Ss' and userid='%|Ss'",
-                               nid_s, user);
-
-       if ( (ret = edg_wll_ExecStmt(ctx, stmt, NULL)) < 0 )
-               goto cleanup;
-       if ( ret == 0 )
-       {
-               free(stmt);
-               trio_asprintf(&stmt,
-                                       "select notifid from notif_registrations where notifid='%|Ss'", nid_s);
-               ret = edg_wll_ExecStmt(ctx, stmt, NULL);
-               if ( ret == 0 )
-                       edg_wll_SetError(ctx, ENOENT, "Unknown notification ID");
-               else if ( ret > 0 )
-                       edg_wll_SetError(ctx, EPERM, "Only owner could access the notification");
-       }
-
-cleanup:
-       if ( !edg_wll_Error(ctx, NULL, NULL) && owner )
-               *owner = user;
-       else
-               free(user);
-       if ( nid_s ) free(nid_s);
-       if ( stmt ) free(stmt);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-       /*      Format conditions
-        *      - first of all separate all jobids
-        *      - then format new condition list without jobids and encode it into an XML string
-        */
-static int split_cond_list(
-       edg_wll_Context                                         ctx,
-       edg_wll_QueryRec const * const     *conditions,
-       edg_wll_QueryRec                                 ***nconds_out,
-       char                                                     ***jobs_out)
-{
-       edg_wll_QueryRec  **nconds = NULL;
-       char                      **jobs = NULL;
-       int                                     i, j, jobs_ct, nconds_ct;
-
-
-       if ( !conditions || !conditions[0] )
-               return edg_wll_SetError(ctx, EINVAL, "Empty condition list");
-
-       for ( nconds_ct = jobs_ct = i = 0; conditions[i]; i++ )
-       {
-               if ( conditions[i][0].attr && conditions[i][0].attr != EDG_WLL_QUERY_ATTR_JOBID )
-                       nconds_ct++;
-               for ( j = 0; conditions[i][j].attr; j++ )
-                       if ( conditions[i][j].attr == EDG_WLL_QUERY_ATTR_JOBID )
-                               jobs_ct++;
-       }
-
-       if ( jobs_out && jobs_ct )
-               if ( !(jobs = calloc(jobs_ct+1, sizeof(char *))) )
-               {
-                       edg_wll_SetError(ctx, errno, NULL);
-                       goto cleanup;
-               }
-
-       if ( nconds_out && nconds_ct )
-               if ( !(nconds = calloc(nconds_ct+1, sizeof(edg_wll_QueryRec *))) )
-               {
-                       edg_wll_SetError(ctx, errno, NULL);
-                       goto cleanup;
-               }
-
-       if ( jobs ) for ( jobs_ct = i = 0; conditions[i]; i++ )
-               for ( j = 0; conditions[i][j].attr; j++ )
-                       if ( conditions[i][j].attr == EDG_WLL_QUERY_ATTR_JOBID )
-                               if ( !(jobs[jobs_ct++] = edg_wlc_JobIdGetUnique(conditions[i][j].value.j)) )
-                               {
-                                       edg_wll_SetError(ctx, errno, NULL);
-                                       goto cleanup;
-                               }
-
-       if ( nconds ) for ( nconds_ct = i = 0; conditions[i]; i++ )
-               if ( conditions[i][0].attr && conditions[i][0].attr != EDG_WLL_QUERY_ATTR_JOBID )
-                       /*      !!! DO NOT DEALLOCATE this arrays (it is not neccessary to allocate new
-                        *      mem - it's used only once and only for xml parsing
-                        */
-                       nconds[nconds_ct++] = (edg_wll_QueryRec  *) (conditions[i]);
-
-       if ( jobs_out ) { *jobs_out = jobs; jobs = NULL; }
-       if ( nconds_out ) { *nconds_out = nconds; nconds = NULL; }
-
-cleanup:
-       if ( nconds ) free(nconds);
-       if ( jobs )
-       {
-               for ( i = 0; jobs[i]; i++ )
-                       free(jobs[i]);
-               free(jobs);
-       }
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
-static int update_notif(
-       edg_wll_Context                                 ctx,
-       const edg_wll_NotifId                   nid,
-       const char                                         *conds,
-       const char                                         *dest,
-       const char                                         *valid)
-{
-       char       *nid_s       = NULL,
-                          *stmt, *aux;
-       int                     ret;
-
-
-       if ( !(nid_s = edg_wll_NotifIdGetUnique(nid)) )
-               goto cleanup;
-
-       /*      Format SQL update string
-        *      (Only the owner could update the notification registration)
-        */
-       if ( !(stmt = strdup("update notif_registrations set")) )
-       {
-               edg_wll_SetError(ctx, errno, "updating notification records");
-               goto cleanup;
-       }
-       if ( dest )
-       {
-               trio_asprintf(&aux, "%s destination='%|Ss'", stmt, dest);
-               free(stmt);
-               stmt = aux;
-       }
-       if ( valid )
-       {
-               trio_asprintf(&aux, "%s %svalid='%|Ss'", stmt, dest? ",": "", valid);
-               free(stmt);
-               stmt = aux;
-       }
-       if ( conds )
-       {
-               trio_asprintf(&aux, "%s %sconditions='<and>%|Ss</and>'",
-                                               stmt, (dest||valid)? ",": "", conds);
-               free(stmt);
-               stmt = aux;
-       }
-       trio_asprintf(&aux, "%s where notifid='%|Ss'", stmt, nid_s);
-       free(stmt);
-       stmt = aux;
-
-       if ( (ret = edg_wll_ExecStmt(ctx, stmt, NULL)) < 0 )
-               goto cleanup;
-       if ( ret == 0 )
-       {
-               free(stmt);
-               trio_asprintf(&stmt,
-                               "select notifid from notif_registrations where notifid='%|Ss'", nid_s);
-               ret = edg_wll_ExecStmt(ctx, stmt, NULL);
-               if ( ret == 0 )
-                       edg_wll_SetError(ctx, ENOENT, "Unknown notification ID");
-               /*
-                *      XXX: Be happy?
-                *      May be: Rows matched: 1  Changed: 0  Warnings: 0 :-)
-               else if ( ret > 0 )
-                       edg_wll_SetError(ctx, EPERM, "Updating notification records");
-                */
-       }
-
-cleanup:
-       if ( nid_s ) free(nid_s);
-       if ( stmt ) free(stmt);
-
-       return edg_wll_Error(ctx, NULL, NULL);
-}
-
-
diff --git a/org.glite.lb.server/src/openserver.c b/org.glite.lb.server/src/openserver.c

deleted file mode 100644 (file)

index 5b34974..0000000
--- a/org.glite.lb.server/src/openserver.c
+++ /dev/null
@@ -1,18 +0,0 @@
-#ident "$Header$"
-
-#include <stdlib.h>
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/context.h"
-
-#include "lbs_db.h"
-
-edg_wll_ErrorCode edg_wll_Open(edg_wll_Context ctx, char *cs)
-{
-       return edg_wll_DBConnect(ctx,cs) ? edg_wll_Error(ctx,NULL,NULL) : 0;
-}
-
-edg_wll_ErrorCode edg_wll_Close(edg_wll_Context ctx)
-{
-       return edg_wll_ResetError(ctx);
-}
diff --git a/org.glite.lb.server/src/purge.h b/org.glite.lb.server/src/purge.h

deleted file mode 100644 (file)

index 8841e12..0000000
--- a/org.glite.lb.server/src/purge.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_COMMON_PURGE_H__
-#define __EDG_WORKLOAD_LOGGING_COMMON_PURGE_H__
-
-/** Server side implementation
- *  besides output to the SSL stream (in the context) it may produce
- *  the server-side dump files
- */
-int edg_wll_PurgeServer(
-       edg_wll_Context ctx,
-       const edg_wll_PurgeRequest *request
-);
-
-#define                FILE_TYPE_ANY           ""
-#define                FILE_TYPE_PURGE         "purge"
-#define                FILE_TYPE_DUMP          "dump"
-#define                FILE_TYPE_LOAD          "load"
-
-extern int edg_wll_CreateTmpFileStorage(
-       edg_wll_Context ctx,
-       char *prefix,
-       char **fname
-);
-
-extern int edg_wll_CreateFileStorageFromTmp(
-       edg_wll_Context ctx,
-       char *tmp_type,
-       char *file_type,
-       char **fname
-);
-
-extern int edg_wll_CreateFileStorage(
-       edg_wll_Context ctx,
-       char *file_type,
-       char *prefix,
-       char **fname
-);
-
-#define edg_wll_CreateTmpDumpFile(ctx, f)      edg_wll_CreateTmpFileStorage(ctx,ctx->dumpStorage,f)
-#define edg_wll_CreateTmpPurgeFile(ctx, f)     edg_wll_CreateTmpFileStorage(ctx,ctx->purgeStorage,f)
-
-#define edg_wll_CreateDumpFileFromTmp(ctx, f, f2)      \
-                       edg_wll_CreateFileStorageFromTmp(ctx, f, FILE_TYPE_DUMP, f2)
-#define edg_wll_CreatePurgeFileFromTmp(ctx, f, f2)     \
-                       edg_wll_CreateFileStorageFromTmp(ctx, f, FILE_TYPE_PURGE, f2)
-
-#define edg_wll_CreateDumpFile(ctx, f)         edg_wll_CreateFileStorage(ctx,FILE_TYPE_DUMP,NULL,f)
-#define edg_wll_CreatePurgeFile(ctx, f)                edg_wll_CreateFileStorage(ctx,FILE_TYPE_PURGE,NULL,f)
-
-#endif
diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c

deleted file mode 100644 (file)

index d2f4b1b..0000000
--- a/org.glite.lb.server/src/query.c
+++ /dev/null
@@ -1,1414 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <time.h>
-#include <assert.h>
-
-#include "glite/wmsutils/jobid/strmd5.h"
-
-#include "glite/lb/consumer.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-
-
-#include "get_events.h"
-#include "index.h"
-#include "query.h"
-#include "store.h"
-#include "lb_authz.h"
-
-#define FL_SEL_STATUS          1
-#define FL_SEL_TAGS                    (1<<1)
-#define FL_SEL_JOB                     (1<<2)
-
-
-static int check_event_query_index(edg_wll_Context,const edg_wll_QueryRec **,const edg_wll_QueryRec **);
-static int check_job_query_index(edg_wll_Context, const edg_wll_QueryRec **);
-static char *jc_to_head_where(edg_wll_Context, const edg_wll_QueryRec **, int *);
-static char *ec_to_head_where(edg_wll_Context, const edg_wll_QueryRec **);
-static int match_flesh_conditions(const edg_wll_Event *,const edg_wll_QueryRec **);
-static int check_strict_jobid_cond(edg_wll_Context, const edg_wll_QueryRec **);
-
-static int cmp_string(const char *,edg_wll_QueryOp,const char *);
-static int is_all_query(const edg_wll_QueryRec **);
-
-
-
-#define sizofa(a) (sizeof(a)/sizeof((a)[0]))
-
-int edg_wll_QueryEventsServer(
-        edg_wll_Context ctx,
-               int     noAuth,
-        const edg_wll_QueryRec **job_conditions,
-        const edg_wll_QueryRec **event_conditions,
-        edg_wll_Event **events)
-{
-       char               *job_where = NULL,
-                                  *event_where = NULL,
-                                  *qbase = NULL,
-                                  *q = NULL,
-                                  *res[11];
-       edg_wll_Event  *out = NULL;
-       edg_wll_Stmt    sh = NULL;
-       int                             i = 0,
-                                       ret = 0,
-                                       offset = 0, limit = 0,
-                                       limit_loop = 1,
-                                       eperm = 0;
-
-
-       edg_wll_ResetError(ctx);
-
-       if ( (ctx->p_query_results == EDG_WLL_QUERYRES_ALL) &&
-                       (!job_conditions || !job_conditions[0] || job_conditions[1] ||
-                       (job_conditions[0][0].attr != EDG_WLL_QUERY_ATTR_JOBID) ||
-                       (job_conditions[0][1].attr != EDG_WLL_QUERY_ATTR_UNDEF)) )
-       {
-               edg_wll_SetError(ctx, EINVAL, "Invalid parameter EDG_WLL_PARAM_QUERY_RESULTS");
-               goto cleanup;
-       }
-
-       if ((!ctx->noIndex && check_event_query_index(ctx,job_conditions,event_conditions)) ||
-               check_strict_jobid_cond(ctx,job_conditions) ||
-               check_strict_jobid_cond(ctx,event_conditions))
-               goto cleanup;
-
-       if (event_conditions && *event_conditions && (*event_conditions)->attr &&
-               !(event_where = ec_to_head_where(ctx,event_conditions)))
-               goto cleanup;
-
-       if ( job_conditions && *job_conditions && (*job_conditions)->attr &&
-               !(job_where = jc_to_head_where(ctx, job_conditions, &i)) )
-               goto cleanup;
-
-/* XXX: similar query in srv_purge.c ! They has to match due to common
- * convert_event_head() called on the result
- */
-       trio_asprintf(&qbase,"SELECT e.event,j.userid,j.dg_jobid,e.code,"
-               "e.prog,e.host,u.cert_subj,e.time_stamp,e.usec,e.level,e.arrived "
-               "FROM events e,users u,jobs j%s "
-               "WHERE %se.jobid=j.jobid AND e.userid=u.userid AND e.code != %d "
-               "%s %s %s %s",
-               i & FL_SEL_STATUS                       ? ",states s"                           : "",
-               i & FL_SEL_STATUS                       ? "s.jobid=j.jobid AND "        : "",
-               EDG_WLL_EVENT_UNDEF,
-               job_where                                       ? "AND"                                         : "",
-               job_where                                       ? job_where                                     : "",
-               event_where                                     ? "AND"                                         : "",
-               event_where                                     ? event_where                           : "");
-
-       if ( ctx->softLimit )
-       {
-               if ( ctx->hardEventsLimit )
-                       limit = ctx->softLimit < ctx->hardEventsLimit? ctx->softLimit: ctx->hardEventsLimit;
-               else
-                       limit = ctx->softLimit;
-       }
-       else if ( ctx->hardEventsLimit )
-               limit = ctx->hardEventsLimit;
-       else
-               limit = 0;
-
-       i = 0;
-       out = calloc(1, sizeof(*out));
-       do
-       {
-               if ( limit )
-                       trio_asprintf(&q, "%s LIMIT %d, %d", qbase, offset, limit);
-               else if ( !q )
-                       q = qbase;
-
-//             printf("\nquery: %s\n\n", q);
-               ret = edg_wll_ExecStmt(ctx, q, &sh);
-               if ( limit )
-                       free(q);
-               if ( ret < 0 )
-               {
-                       edg_wll_FreeStmt(&sh);
-                       goto cleanup;
-               }
-               if ( ret == 0 )
-               {
-                       limit_loop = 0;
-                       goto limit_cycle_cleanup;
-               }
-               if ( !limit || (ret < limit) )
-                       limit_loop = 0;
-
-               offset += ret;
-               while ( (ret = edg_wll_FetchRow(sh, res)) == sizofa(res) )
-               {
-                       int     n = atoi(res[0]);
-                       free(res[0]);
-
-                       if ( convert_event_head(ctx, res+2, out+i) || edg_wll_get_event_flesh(ctx, n, out+i) )
-                       {
-                               free(res[1]);
-                               memset(out+i, 0, sizeof(*out));
-                               edg_wll_FreeStmt(&sh);
-                               goto cleanup;
-                       }
-
-                       if ( !match_flesh_conditions(out+i,event_conditions) || check_strict_jobid(ctx,out[i].any.jobId) )
-                       {
-                               edg_wll_FreeEvent(out+i);
-                               edg_wll_ResetError(ctx);        /* check_strict_jobid() sets it */
-                               goto fetch_cycle_cleanup;
-                       }
-
-                       if ( !noAuth )
-                       {
-                               if (!ctx->peerName || strcmp(res[1],strmd5(ctx->peerName,NULL))) {
-                                       edg_wll_Acl     acl = NULL;
-                                       char            *jobid = NULL;
-
-                                       ret = edg_wll_GetACL(ctx, out[i].any.jobId, &acl);
-                                       free(jobid);
-                                       if (ret || acl == NULL) {
-                                               eperm = 1;
-                                               edg_wll_FreeEvent(out+i);
-                                               edg_wll_ResetError(ctx); /* XXX: should be reported somewhere at least in debug mode */
-                                               goto fetch_cycle_cleanup;
-                                       }
-
-                                       ret = edg_wll_CheckACL(ctx, acl, EDG_WLL_PERM_READ);
-                                       edg_wll_FreeAcl(acl);
-                                       if (ret) {
-                                               eperm = 1;
-                                               edg_wll_FreeEvent(out+i);
-                                               edg_wll_ResetError(ctx); /* XXX: should be reported somewhere at least in debug mode */
-                                               goto fetch_cycle_cleanup;
-                                       }
-                               }
-                       }
-                       
-                       if ( (ctx->p_query_results != EDG_WLL_QUERYRES_ALL) && limit && (i+1 > limit) )
-                       {
-                               free(res[1]);
-                               memset(out+i, 0, sizeof(*out));
-                               edg_wll_SetError(ctx, E2BIG, "Query result size limit exceeded");
-                               if ( ctx->p_query_results == EDG_WLL_QUERYRES_LIMITED )
-                               {
-                                       limit_loop = 0;
-                                       goto limit_cycle_cleanup;
-                               }
-                               goto cleanup;
-                       }
-
-                       i++;
-                       out = (edg_wll_Event *) realloc(out, (i+1) * sizeof(*out));
-
-fetch_cycle_cleanup:
-                       memset(out+i, 0, sizeof(*out));
-                       free(res[1]);
-               }
-limit_cycle_cleanup:
-               edg_wll_FreeStmt(&sh);
-       } while ( limit_loop );
-
-       if ( i == 0 && eperm )
-               edg_wll_SetError(ctx, EPERM, "matching events found but authorization failed");
-       else if ( i == 0 )
-               edg_wll_SetError(ctx, ENOENT, "no matching events found");
-       else
-       {
-               edg_wll_SortEvents(out);
-               *events = out;
-               out = NULL;
-       }
-
-cleanup:
-       if ( out )
-       {
-               for ( i = 0; out[i].type; i++ )
-                       edg_wll_FreeEvent(out+i);
-               free(out);
-       }
-       free(qbase);
-       free(job_where);
-       free(event_where);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_QueryJobsServer(
-               edg_wll_Context ctx,
-               const edg_wll_QueryRec **conditions,
-               int     flags,
-               edg_wlc_JobId **jobs,
-               edg_wll_JobStat **states)
-{
-       char                       *job_where = NULL,
-                                          *state_where = NULL,
-                                          *tags_where = NULL,
-                                          *q = NULL,
-                                          *qbase = NULL,
-                                          *res[3];
-       edg_wlc_JobId      *jobs_out = NULL;
-       edg_wll_JobStat    *states_out = NULL;
-       edg_wll_Stmt            sh;
-       int                                     i = 0,
-                                               ret = 0,
-                                               eperm = 0,
-                                               limit = 0, offset = 0,
-                                               limit_loop = 1;
-
-
-       memset(res,0,sizeof res);
-       edg_wll_ResetError(ctx);
-
-       if ( !conditions )
-       {
-               edg_wll_SetError(ctx, EINVAL, "empty condition list");
-               goto cleanup;
-       }
-
-       if ( (ctx->p_query_results == EDG_WLL_QUERYRES_ALL) &&
-                       (!conditions[0] || conditions[1] ||
-                       (conditions[0][0].attr != EDG_WLL_QUERY_ATTR_OWNER) ||
-                       (conditions[0][1].attr != EDG_WLL_QUERY_ATTR_UNDEF)) )
-       {
-               edg_wll_SetError(ctx, EINVAL, "Invalid parameter EDG_WLL_PARAM_QUERY_RESULTS");
-               goto cleanup;
-       }
-
-       if ( (!ctx->noIndex && check_job_query_index(ctx, conditions)) || check_strict_jobid_cond(ctx,conditions))
-               goto cleanup;
-
-       if ( !(job_where = jc_to_head_where(ctx, conditions, &i)) )
-               goto cleanup;
-
-       if ( (i & FL_SEL_STATUS) )
-               trio_asprintf(&qbase,"SELECT DISTINCT j.dg_jobid,j.userid "
-                                                "FROM jobs j, states s WHERE j.jobid=s.jobid AND %s", job_where);
-       else
-               trio_asprintf(&qbase,"SELECT DISTINCT j.dg_jobid,j.userid "
-                                                "FROM jobs j WHERE %s", job_where);
-
-       if ( ctx->softLimit )
-       {
-               if ( ctx->hardJobsLimit )
-                       limit = ctx->softLimit < ctx->hardJobsLimit? ctx->softLimit: ctx->hardJobsLimit;
-               else
-                       limit = ctx->softLimit;
-       }
-       else if ( ctx->hardJobsLimit )
-               limit = ctx->hardJobsLimit;
-       else
-               limit = 0;
-
-       jobs_out        = calloc(1, sizeof(*jobs_out));
-       states_out      = calloc(1, sizeof(*states_out));
-       i = 0;
-       do
-       {
-               if ( limit )
-                       trio_asprintf(&q, "%s LIMIT %d, %d", qbase, offset, limit);
-               else if ( !q )
-                       q = qbase;
-
-//             printf("\nquery: %s\n\n", q);
-               ret = edg_wll_ExecStmt(ctx, q, &sh);
-               if ( limit )
-                       free(q);
-               if ( ret < 0 )
-               {
-                       edg_wll_FreeStmt(&sh);
-                       goto cleanup;
-               }
-               if ( ret == 0 )
-               {
-                       limit_loop = 0;
-                       goto limit_cycle_cleanup;
-               }
-               if ( !limit || (ret < limit) )
-                       limit_loop = 0;
-
-               offset += ret;
-               while ( (ret=edg_wll_FetchRow(sh,res)) > 0 )
-               {
-                       if ( (ret = edg_wlc_JobIdParse(res[0], jobs_out+i)) )
-                       {       /* unlikely to happen, internal inconsistency */
-                               char    buf[200];
-                               snprintf(buf,sizeof buf,"JobIdParse(%s)",res[0]);
-                               edg_wll_SetError(ctx,ret,buf);
-                               free(res[0]); free(res[1]); free(res[2]);
-                               jobs_out[i]     = NULL;
-                               goto cleanup;
-                       }
-
-                       if ( check_strict_jobid(ctx, jobs_out[i]) )
-                       {
-                               edg_wlc_JobIdFree(jobs_out[i]);
-                               goto fetch_cycle_cleanup;
-                       }
-
-                       if ( edg_wll_JobStatus(ctx, jobs_out[i], flags, &states_out[i]) )
-                       {
-                               edg_wlc_JobIdFree(jobs_out[i]);
-                               if (edg_wll_Error(ctx,NULL,NULL) == EPERM) eperm = 1;
-                               goto fetch_cycle_cleanup;
-                       }
-
-                       if ( !match_status(ctx, states_out+i, conditions) )
-                       {
-                               edg_wlc_JobIdFree(jobs_out[i]);
-                               edg_wll_FreeStatus(states_out+i);
-                               edg_wll_ResetError(ctx);        /* check_strict_jobid() sets it */
-                               goto fetch_cycle_cleanup;
-                       }
-
-#if 0
-                       if ( !ctx->noAuth && (!ctx->peerName || strcmp(res[1], strmd5(ctx->peerName, NULL))) )
-                       {
-                               eperm = 1;
-                               edg_wlc_JobIdFree(jobs_out[i]);
-                               edg_wll_FreeStatus(states_out+i);
-                               goto fetch_cycle_cleanup;
-                       }
-#endif
-
-                       if ( (ctx->p_query_results != EDG_WLL_QUERYRES_ALL) && limit && (i+1 > limit) )
-                       {
-                               edg_wll_SetError(ctx, E2BIG, "Query result size limit exceeded");
-                               free(res[0]); free(res[1]); free(res[2]);
-                               memset(states_out+i, 0, sizeof(*states_out));
-                               jobs_out[i]     = NULL;
-                               if ( ctx->p_query_results == EDG_WLL_QUERYRES_LIMITED )
-                               {
-                                       limit_loop = 0;
-                                       goto limit_cycle_cleanup;
-                               }
-                               goto cleanup;
-                       }
-
-                       i++;
-                       jobs_out        = (edg_wlc_JobId *) realloc(jobs_out, (i+1) * sizeof(*jobs_out));
-                       states_out      = (edg_wll_JobStat *) realloc(states_out, (i+1) * sizeof(*states_out));
-
-fetch_cycle_cleanup:
-                       free(res[0]); free(res[1]); free(res[2]);
-                       memset(states_out+i, 0, sizeof(*states_out));
-                       jobs_out[i]     = NULL;
-               }
-limit_cycle_cleanup:
-               edg_wll_FreeStmt(&sh);
-       } while ( limit_loop );
-
-       if ( eperm && !*jobs_out )
-               edg_wll_SetError(ctx, EPERM, "matching jobs found but authorization failed");
-
-       if ( i && (ret == 0) )
-       {
-               if ( states )
-               {
-                       *states = states_out;
-                       states_out = NULL;
-               }
-               if ( jobs )
-               {
-                       *jobs = jobs_out;
-                       jobs_out = NULL;
-               }
-       }
-
-
-cleanup:
-       free(qbase);
-       free(state_where);
-       free(tags_where);
-       free(job_where);
-
-       if (jobs_out)
-       {
-               for ( i = 0; jobs_out[i]; i++ )
-                       edg_wlc_JobIdFree(jobs_out[i]);
-               free(jobs_out);
-       }
-
-       if (states_out)
-       {
-               for (i=0; states_out[i].state; i++) edg_wll_FreeStatus(states_out+i);
-               free(states_out);
-       }
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-static int check_event_query_index(edg_wll_Context ctx,const edg_wll_QueryRec **jc,const edg_wll_QueryRec **ec)
-{
-       int     i, j;
-
-       if (check_job_query_index(ctx,jc) == 0) return 0;
-       edg_wll_ResetError(ctx);
-
-       if (ec && *ec) for (i=0; ec[i]; i++) for (j=0; ec[i][j].attr; j++) switch (ec[i][j].attr) {
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       return 0;
-               default: break;
-       }
-       return edg_wll_SetError(ctx,EDG_WLL_ERROR_NOINDEX,
-                       is_all_query(jc) ? "\"-all\" queries denied by server configuration" : NULL);
-}
-
-static int check_job_query_index(edg_wll_Context ctx, const edg_wll_QueryRec **jc)
-{
-       int             i, j, jj;
-
-
-       edg_wll_ResetError(ctx);
-
-       if ( !jc || !*jc )
-               return edg_wll_SetError(ctx,EDG_WLL_ERROR_NOINDEX,"unrestricted queries unsupported");
-
-       /*
-        *      First check presense of jobid - Primary key
-        */
-       for ( i = 0; jc[i]; i++ ) for ( j = 0; jc[i][j].attr; j++ )
-               if ( jc[i][j].attr == EDG_WLL_QUERY_ATTR_JOBID ) return 0;
-
-       if ( !ctx->job_index )
-               return edg_wll_SetError(ctx, EDG_WLL_ERROR_NOINDEX, "no indices configured: jobid required in query");
-
-       for ( j = 0; ctx->job_index[j]; j++ )
-       {
-               if ( !ctx->job_index[j][0].attr )
-                       continue;
-
-               if ( ctx->job_index[j][1].attr )
-               {
-                       /*
-                        * check multi comlumn indexes
-                        */
-                       for ( jj = 0; ctx->job_index[j][jj].attr; jj++ )
-                       {
-                               for ( i = 0; jc[i]; i++ )
-                                       if ( !edg_wll_CmpColumn(&ctx->job_index[j][jj], &jc[i][0]) ) break;
-                               if ( !jc[i] )
-                                       break;
-                       }
-                       if ( !ctx->job_index[j][jj].attr )
-                               return 0;
-               }
-               else
-                       for ( i = 0; jc[i]; i++ )
-                               if ( !edg_wll_CmpColumn(&ctx->job_index[j][0], &jc[i][0]) ) return 0;
-       }
-
-       return edg_wll_SetError(ctx,EDG_WLL_ERROR_NOINDEX,
-                       is_all_query(jc) ? "\"-all\" queries denied by server configuration" : NULL);
-}
-
-#define opToString(op)                                                                         \
-       ((op) == EDG_WLL_QUERY_OP_EQUAL ? "=" :                                 \
-               ((op) == EDG_WLL_QUERY_OP_UNEQUAL ? "!=" :                      \
-                       ((op) == EDG_WLL_QUERY_OP_LESS ? "<" : ">" )))
-
-static char *ec_to_head_where(edg_wll_Context ctx,const edg_wll_QueryRec **ec)
-{
-       int                                     n, ct, m;
-       char                            msg[100],
-                                          *out,
-                                          *aux,
-                                          *conds, *retconds,
-                                          *dbt;
-                       
-
-       /*
-        * check correctness only
-        */
-       for ( ct = m = 0; ec[m]; m++ )
-       {
-               for ( n = 0; ec[m][n].attr; n++ ) switch ( ec[m][n].attr )
-               {
-               case EDG_WLL_QUERY_ATTR_HOST:
-                       if ( ec[m][n].op != EDG_WLL_QUERY_OP_EQUAL && ec[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with host attr");
-                               return NULL;
-                       }
-                       ct++;
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_SOURCE:
-                       if ( ec[m][n].op != EDG_WLL_QUERY_OP_EQUAL && ec[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with host attr");
-                               return NULL;
-                       }
-                       ct++;
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-                       if ( ec[m][n].op != EDG_WLL_QUERY_OP_EQUAL && ec[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with usertag attr");
-                               return NULL;
-                       }
-                       ct++;
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_INSTANCE:
-                       if ( ec[m][n].op != EDG_WLL_QUERY_OP_EQUAL && ec[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with instance attr");
-                               return NULL;
-                       }
-                       ct++;
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-               case EDG_WLL_QUERY_ATTR_LEVEL:
-                       /*
-                        *      Any op allowed - but be careful
-                        */
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       /* any operator allowed */
-                       ct++;
-                       break;
-
-               default:
-                       sprintf(msg, "ec_to_head_where(): attr=%d unsupported", ec[m][n].attr);
-                       edg_wll_SetError(ctx, EINVAL, msg);
-                       return NULL;
-               }
-       }
-
-       if ( ct == 0 )
-       {
-               edg_wll_SetError(ctx,EINVAL,"ec_to_head_where(): empty conditions");
-               return NULL;
-       }
-
-       conds = retconds = NULL;
-       for ( m = 0; ec[m]; m++ )
-       {
-               /* 
-                * conditions captured by match_flesh_conditions() have to be skipped here.
-                * with all conditions in same "or clause"
-                */
-               for ( n = 0; ec[m][n].attr; n++ )
-                       if (    (ec[m][n].attr == EDG_WLL_QUERY_ATTR_USERTAG)
-                                || (ec[m][n].attr == EDG_WLL_QUERY_ATTR_INSTANCE) )
-                               break;
-               if ( ec[m][n].attr )
-                       continue;
-
-               for ( n = 0; ec[m][n].attr; n++ ) switch ( ec[m][n].attr )
-               {
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       dbt = edg_wll_TimeToDB(ec[m][n].value.t.tv_sec);
-                       if ( conds )
-                       {
-                               if ( ec[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                               {
-                                       trio_asprintf(&aux, "%s", dbt);
-                                       dbt = edg_wll_TimeToDB(ec[m][n].value2.t.tv_sec);
-                                       trio_asprintf(&out, "%s OR (e.time_stamp >= %s AND e.time_stamp <= %s)", conds, aux, dbt);
-                                       free(aux);
-                               }
-                               else
-                                       trio_asprintf(&out, "%s OR e.time_stamp %s %s", conds, opToString(ec[m][n].op), dbt);
-                               free(conds);
-                               conds = out;
-                       }
-                       else if ( ec[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                       {
-                               trio_asprintf(&aux, "%s", dbt);
-                               dbt = edg_wll_TimeToDB(ec[m][n].value2.t.tv_sec);
-                               trio_asprintf(&conds, "(e.time_stamp >= %s AND e.time_stamp <= %s)", aux, dbt);
-                               free(aux);
-                       }
-                       else
-                               trio_asprintf(&conds, "e.time_stamp %s %s", opToString(ec[m][n].op), dbt);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_LEVEL:
-                       if ( conds )
-                       {
-                               if ( ec[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                                       trio_asprintf(&out, "%s OR (e.level >= %d AND e.level <= %d)", conds, ec[m][n].value.i, ec[m][n].value2.i);
-                               else
-                                       trio_asprintf(&out, "%s OR e.level %s %d", conds, opToString(ec[m][n].op), ec[m][n].value.i);
-                               free(conds); conds = out;
-                       }
-                       else
-                               if ( ec[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                                       trio_asprintf(&conds, "(e.level >= %d AND e.level <= %d)", ec[m][n].value.i, ec[m][n].value2.i);
-                               else
-                                       trio_asprintf(&conds, "e.level %s %d", opToString(ec[m][n].op), ec[m][n].value.i);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_SOURCE:
-                       aux = edg_wll_SourceToString(ec[m][n].value.i);
-                       if ( conds )
-                       {
-                               trio_asprintf(&out, "%s OR e.prog %s '%|Ss'", conds, opToString(ec[m][n].op), aux);
-                               free(conds); conds = out;
-                       }
-                       else
-                               trio_asprintf(&conds, "e.prog %s '%|Ss'", opToString(ec[m][n].op), aux);
-                       free(aux);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_HOST:
-                       if ( conds )
-                       {
-                               trio_asprintf(&out, "%s OR e.host %s '%|Ss'", conds, opToString(ec[m][n].op), ec[m][n].value.c);
-                               free(conds); conds = out;
-                       }
-                       else
-                               trio_asprintf(&conds, "e.host %s '%|Ss'", opToString(ec[m][n].op), ec[m][n].value.c);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-                       if ( conds )
-                       {
-                               if ( ec[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                                       trio_asprintf(&out, "%s OR (e.code >= %d AND e.code <= %d)", conds, ec[m][n].value.i, ec[m][n].value2.i);
-                               else
-                                       trio_asprintf(&out, "%s OR e.code %s %d", conds, opToString(ec[m][n].op), ec[m][n].value.i);
-                               free(conds); conds = out;
-                       }
-                       else
-                               if ( ec[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                                       trio_asprintf(&conds, "(e.code >= %d AND e.code <= %d)", ec[m][n].value.i, ec[m][n].value2.i);
-                               else
-                                       trio_asprintf(&conds, "e.code %s %d", opToString(ec[m][n].op), ec[m][n].value.i);
-                       break;
-
-               default:
-                       return NULL;
-               }
-
-               if ( !conds )
-                       continue;       
-
-               if ( retconds )
-               {
-                       trio_asprintf(&out, "%s AND (%s)", retconds, conds);
-                       free(retconds); retconds = out;
-                       free(conds); conds = NULL;
-               }
-               else
-               {
-                       trio_asprintf(&retconds, "(%s)", conds);
-                       free(conds); conds = NULL;
-               }
-       }
-
-       return retconds;
-}
-
-static int is_indexed(const edg_wll_QueryRec *cond, const edg_wll_Context ctx)
-{
-       int             i, j;
-
-       if ( !(ctx->job_index) )
-               return 0;
-
-       for ( i = 0; ctx->job_index[i]; i++ ) for ( j = 0; ctx->job_index[i][j].attr; j++ )
-               if ( !edg_wll_CmpColumn(&ctx->job_index[i][j], cond) ) return 1;
-       
-       return 0;
-}
-
-/*
- *     use where_flags to recognize which table to jois in SQL select
- *     
- */
-static char *jc_to_head_where(
-                               edg_wll_Context ctx,
-                               const edg_wll_QueryRec **jc,
-                               int *where_flags)
-{
-       int             ct, n, m;
-       char   *aux,
-                  *tmps,
-                  *dbt,
-                  *cname = NULL,
-                       msg[100];
-       char   *conds, *retconds;
-
-
-       retconds = conds = NULL;
-
-       /*
-        * check correctness only
-        */
-       for ( ct = m = 0; jc[m]; m++ ) for ( n = 0; jc[m][n].attr; n++ )
-       {
-               if (   (jc[m][0].attr != jc[m][n].attr)
-                       || (   (jc[m][n].attr == EDG_WLL_QUERY_ATTR_USERTAG)
-                               && strcmp(jc[m][0].attr_id.tag, jc[m][n].attr_id.tag)) )
-               {
-                       edg_wll_SetError(ctx, EINVAL, "only same attribute types supported in 'or' expressions");
-                       return NULL;
-               }
-
-               switch ( jc[m][n].attr )
-               {
-               case EDG_WLL_QUERY_ATTR_JOBID:
-                       ct++;
-                       if ( jc[m][n].op != EDG_WLL_QUERY_OP_EQUAL && jc[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with jobid");
-                               return NULL;
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_OWNER:
-                       ct++;
-                       if ( jc[m][n].op != EDG_WLL_QUERY_OP_EQUAL && jc[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with job owner");
-                               return NULL;
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_LOCATION:
-                       ct++;
-                       if ( jc[m][n].op != EDG_WLL_QUERY_OP_EQUAL && jc[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with job location");
-                               return NULL;
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_DESTINATION:
-                       ct++;
-                       if ( jc[m][n].op != EDG_WLL_QUERY_OP_EQUAL && jc[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with job destinations");
-                               return NULL;
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_PARENT:
-                       ct++;
-                       if ( jc[m][n].op != EDG_WLL_QUERY_OP_EQUAL && jc[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with job parent");
-                               return NULL;
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                       ct++;
-                       if ( jc[m][n].op != EDG_WLL_QUERY_OP_EQUAL && jc[m][n].op != EDG_WLL_QUERY_OP_UNEQUAL )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "only `=' and '!=' supported with resubmitted attr");
-                               return NULL;
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       if ( jc[m][n].attr_id.state == EDG_WLL_JOB_UNDEF )
-                       {
-                               edg_wll_SetError(ctx, EINVAL, "Time attribut have to be associated with status specification");
-                               return NULL;
-                       }
-                       ct++;
-                       break;
-               case EDG_WLL_QUERY_ATTR_DONECODE:
-               case EDG_WLL_QUERY_ATTR_EXITCODE:
-               case EDG_WLL_QUERY_ATTR_STATUS:
-                       ct++;
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-                       ct++;
-                       break;
-
-               default:
-                       sprintf(msg, "jc_to_head_where(): attr=%d unsupported", jc[m][n].attr);
-                       edg_wll_SetError(ctx, EINVAL, msg);
-                       return NULL;
-               }
-       }
-
-       if ( ct == 0 )
-       {
-               edg_wll_SetError(ctx, EINVAL, "jc_to_head_where(): empty conditions");
-               return NULL;
-       }
-
-       /*
-        * Now process conversion
-        */
-       for ( m = 0; jc[m]; m++ )
-       {
-               for ( n = 0; jc[m][n].attr; n++ ) switch (jc[m][n].attr)
-               {
-               case EDG_WLL_QUERY_ATTR_TIME:
-                       if (   !is_indexed(&(jc[m][n]), ctx)
-                               || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) )
-                               break;
-
-                       *where_flags |= FL_SEL_STATUS;
-
-                       dbt = edg_wll_TimeToDB(jc[m][n].value.t.tv_sec);
-                       if ( conds )
-                       {
-                               if ( jc[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                               {
-                                       trio_asprintf(&aux, "%s", dbt);
-                                       dbt = edg_wll_TimeToDB(jc[m][n].value2.t.tv_sec);
-                                       trio_asprintf(&tmps, "%s OR (s.%s >= %s AND s.%s <= %s)", conds, cname, aux, cname, dbt);
-                                       free(aux);
-                               }
-                               else
-                                       trio_asprintf(&tmps, "%s OR s.%s %s s.%s", conds, cname, opToString(jc[m][n].op), dbt);
-
-                               free(conds);
-                               conds = tmps;
-                       }
-                       else if ( jc[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                       {
-                               trio_asprintf(&aux, "%s", dbt);
-                               dbt = edg_wll_TimeToDB(jc[m][n].value2.t.tv_sec);
-                               trio_asprintf(&conds, "(%s >= s.%s AND s.%s <= %s)", cname, aux, cname, dbt);
-                               free(aux);
-                       }
-                       else
-                               trio_asprintf(&conds, "s.%s %s %s", cname, opToString(jc[m][n].op), dbt);
-
-                       free(cname);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_JOBID:
-                       *where_flags |= FL_SEL_JOB;
-                       aux = edg_wlc_JobIdGetUnique(jc[m][n].value.j);
-                       if ( conds )
-                       {
-                               trio_asprintf(&tmps, "%s OR j.jobid%s'%|Ss'", conds, opToString(jc[m][n].op), aux);
-                               free(conds); conds = tmps;
-                       }
-                       else
-                               trio_asprintf(&conds, "j.jobid%s'%|Ss'", opToString(jc[m][n].op), aux);
-                       free(aux);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_PARENT:
-                       if (   !is_indexed(&(jc[m][n]), ctx)
-                               || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) )
-                               break;
-
-                       *where_flags |= FL_SEL_STATUS;
-                       aux = edg_wlc_JobIdGetUnique(jc[m][n].value.j);
-                       if ( conds )
-                       {
-                               trio_asprintf(&tmps, "%s OR s.%s%s'%|Ss'", conds, cname, opToString(jc[m][n].op), aux);
-                               free(conds); conds = tmps;
-                       }
-                       else
-                               trio_asprintf(&conds, "s.%s%s'%|Ss'", cname, opToString(jc[m][n].op), aux);
-                       free(aux);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_OWNER:
-                       if (   !is_indexed(&(jc[m][n]), ctx)
-                               || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) )
-                               break;
-
-                       if ( !jc[m][n].value.c && !ctx->peerName ) 
-                       { 
-                               edg_wll_SetError(ctx, EPERM, "jc_to_head_where(): ctx->peerName empty");
-                               free(cname); free(conds); free(retconds);
-                               return NULL;
-                       }       
-
-                       *where_flags |= FL_SEL_STATUS;
-                       if ( conds )
-                       {
-                               if ( jc[m][n].value.c ) 
-                                       trio_asprintf(&tmps, "%s OR s.%s%s'%|Ss'", conds, cname, opToString(jc[m][n].op), jc[m][n].value.c);
-                               else
-                                       trio_asprintf(&tmps, "%s OR s.%s%s'%|Ss'", conds, cname, opToString(jc[m][n].op), ctx->peerName);
-                               free(conds); conds = tmps;
-                       }
-                       else
-                       {
-                               if ( jc[m][n].value.c ) 
-                                       trio_asprintf(&conds, "s.%s%s'%|Ss'", cname, opToString(jc[m][n].op), jc[m][n].value.c);
-                               else
-                                       trio_asprintf(&conds, "s.%s%s'%|Ss'", cname, opToString(jc[m][n].op), ctx->peerName);
-                       }
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_DONECODE:
-               case EDG_WLL_QUERY_ATTR_EXITCODE:
-               case EDG_WLL_QUERY_ATTR_STATUS:
-                       if (   !is_indexed(&(jc[m][n]), ctx)
-                               || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) )
-                               break;
-
-                       *where_flags |= FL_SEL_STATUS;
-                       if ( conds )
-                       {
-                               if ( jc[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                                       trio_asprintf(&tmps, "%s OR (s.%s >= %d AND s.%s <= %d)", conds, cname, jc[m][n].value.i, cname, jc[m][n].value2.i);
-                               else
-                                       trio_asprintf(&tmps, "%s OR s.%s %s %d", conds, cname, opToString(jc[m][n].op), jc[m][n].value.i);
-                               free(conds); conds = tmps;
-                       }
-                       else
-                               if ( jc[m][n].op == EDG_WLL_QUERY_OP_WITHIN )
-                                       trio_asprintf(&conds, "(s.%s >= %d AND s.%s <= %d)", cname, jc[m][n].value.i, cname, jc[m][n].value2.i);
-                               else
-                                       trio_asprintf(&conds, "s.%s %s %d", cname, opToString(jc[m][n].op),jc[m][n].value.i);
-
-                       free(cname);
-                       break;
-
-               case EDG_WLL_QUERY_ATTR_DESTINATION:
-               case EDG_WLL_QUERY_ATTR_LOCATION:
-               case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-               case EDG_WLL_QUERY_ATTR_USERTAG:
-                       if (   !is_indexed(&(jc[m][n]), ctx)
-                               || !(cname = edg_wll_QueryRecToColumn(&(jc[m][n]))) )
-                               break;
-
-                       *where_flags |= FL_SEL_STATUS;
-                       if ( conds )
-                       {
-                               trio_asprintf(&tmps, "%s OR s.%s%s'%s'", conds, cname, opToString(jc[m][n].op), jc[m][n].value.c);
-                               free(conds); conds = tmps;
-                       }
-                       else
-                               trio_asprintf(&conds, "s.%s%s'%s'", cname, opToString(jc[m][n].op), jc[m][n].value.c);
-
-                       free(cname);
-                       break;
-
-               default:
-                       /* this may never occure, but keep compiler happy */
-                       break;
-               }
-
-               if ( !conds ) continue;
-
-               if ( retconds )
-               {
-                       trio_asprintf(&tmps, "%s AND (%s)", retconds, conds);
-                       free(retconds); retconds = tmps;
-                       free(conds); conds = NULL;
-               }
-               else
-               {
-                       trio_asprintf(&retconds, "(%s)", conds);
-                       free(conds); conds = NULL;
-               }
-       }
-
-       return retconds;
-}
-
-
-static int match_flesh_conditions(const edg_wll_Event *e,const edg_wll_QueryRec **ec)
-{
-       int                     i, j;
-
-
-       if ( !ec )
-               return 1;
-
-       for ( i = 0; ec[i]; i++ )
-       {
-               j = 0;
-               while (    (ec[i][j].attr)
-                               && (ec[i][j].attr != EDG_WLL_QUERY_ATTR_USERTAG)
-                               && (ec[i][j].attr != EDG_WLL_QUERY_ATTR_INSTANCE) ) j++;
-               if ( !ec[i][j].attr )
-                       continue;
-
-               for ( j = 0; ec[i][j].attr; j++ )
-               {
-                       if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_TIME )
-                       {
-                               if (   ((ec[i][j].op == EDG_WLL_QUERY_OP_EQUAL) && (e->any.timestamp.tv_sec == ec[i][j].value.t.tv_sec))
-                                       || ((ec[i][j].op == EDG_WLL_QUERY_OP_LESS) && (e->any.timestamp.tv_sec < ec[i][j].value.t.tv_sec))
-                                       || ((ec[i][j].op == EDG_WLL_QUERY_OP_GREATER) && (e->any.timestamp.tv_sec < ec[i][j].value.t.tv_sec))
-                                       || (    (ec[i][j].op == EDG_WLL_QUERY_OP_WITHIN)
-                                               && (e->any.timestamp.tv_sec >= ec[i][j].value.t.tv_sec)
-                                               && (e->any.timestamp.tv_sec <= ec[i][j].value2.t.tv_sec)) )
-                                       break;
-                       }
-                       else if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_SOURCE )
-                       {
-                               if ( e->any.source == EDG_WLL_SOURCE_NONE )
-                                       continue;
-                               if (   ((ec[i][j].op == EDG_WLL_QUERY_OP_EQUAL) && (e->any.source == ec[i][j].value.i))
-                                       || ((ec[i][j].op == EDG_WLL_QUERY_OP_LESS) && (e->any.source < ec[i][j].value.i))
-                                       || ((ec[i][j].op == EDG_WLL_QUERY_OP_GREATER) && (e->any.source < ec[i][j].value.i))
-                                       || (   (ec[i][j].op == EDG_WLL_QUERY_OP_WITHIN)
-                                               && (e->any.source >= ec[i][j].value.i)
-                                               && (e->any.source <= ec[i][j].value2.i)) )
-                                       break;
-                       }
-                       else if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_LEVEL )
-                       {
-                               if (   ((ec[i][j].op == EDG_WLL_QUERY_OP_EQUAL) && (e->any.level == ec[i][j].value.i))
-                                       || ((ec[i][j].op == EDG_WLL_QUERY_OP_LESS) && (e->any.level < ec[i][j].value.i))
-                                       || ((ec[i][j].op == EDG_WLL_QUERY_OP_GREATER) && (e->any.level < ec[i][j].value.i))
-                                       || (   (ec[i][j].op == EDG_WLL_QUERY_OP_WITHIN)
-                                               && (e->any.level >= ec[i][j].value.i)
-                                               && (e->any.level <= ec[i][j].value2.i)) )
-                                       break;
-                       }
-                       else if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_HOST )
-                       {
-                               if ( !strcmp(ec[i][j].value.c, e->any.host) )
-                                       break;
-                       }
-                       else if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_EVENT_TYPE )
-                       {
-                               if ( e->any.type == ec[i][j].value.i )
-                                       break;
-                       }
-                       else if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_USERTAG )
-                       {
-                               if (    !strcmp(ec[i][j].attr_id.tag,e->userTag.name) 
-                                        && cmp_string(e->userTag.value,ec[i][j].op,ec[i][j].value.c))
-                                       break;
-                       }
-                       else if ( ec[i][j].attr == EDG_WLL_QUERY_ATTR_INSTANCE )
-                       {
-                               if (    e->any.src_instance
-                                        && cmp_string(ec[i][j].value.c, ec[i][j].op,  e->any.src_instance) )
-                                       break;
-                       }
-               }
-               if ( !ec[i][j].attr )
-                       /*
-                        *      No condition in "or" clause is valid
-                        */
-                       return 0;
-       }
-
-       return 1;
-}
-
-/* XXX: has to match exactly the main query in edg_wll_QueryEvents 
- *      and similar one in srv_purge.c 
- */
-int convert_event_head(edg_wll_Context ctx,char **f,edg_wll_Event *e)
-{
-       int     ret,i;
-
-       memset(e,0,sizeof *e);
-       edg_wll_ResetError(ctx);
-
-
-       if ((ret=edg_wlc_JobIdParse(f[0],&e->any.jobId))) {
-               edg_wll_SetError(ctx,-ret,"edg_wlc_JobIdParse()");
-               goto err;
-       }
-
-       e->type = atoi(f[1]);
-       free(f[1]); f[1] = NULL;
-       
-       e->any.source = edg_wll_StringToSource(f[2]); 
-       free(f[2]); f[2] = NULL;
-       
-       e->any.host = f[3];
-       f[3] = NULL;
-       
-       e->any.user = f[4];
-       f[4] = NULL;
-       
-       e->any.timestamp.tv_sec = edg_wll_DBToTime(f[5]);
-       free(f[5]); f[5] = NULL;
-       
-       e->any.timestamp.tv_usec = atoi(f[6]);
-       free(f[6]); f[6] = NULL;
-
-       e->any.level = atoi(f[7]); 
-       free(f[7]); f[7] = NULL;
-
-       e->any.arrived.tv_sec = edg_wll_DBToTime(f[8]); 
-       e->any.arrived.tv_usec = 0;
-       free(f[8]); f[8] = NULL;
-
-       return 0;
-
-err:
-       edg_wll_FreeEvent(e);
-       memset(e,0,sizeof *e);
-       for (i=0; i<9; i++) free(f[i]);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-
-
-/* FIXME: other op's, ORed conditions */
-int match_status(edg_wll_Context ctx, const edg_wll_JobStat *stat, const edg_wll_QueryRec **conds)
-{
-       int             i, j, n;
-       char   *s, *s1;
-
-
-       if ( !conds ) return 1;
-
-       for ( i = 0; conds[i]; i++ )
-       {
-               for ( j = 0; conds[i][j].attr; j++ )
-               {
-                       if ( is_indexed(&(conds[i][j]), ctx) ) goto or_satisfied;
-
-                       switch ( conds[i][j].attr )
-                       {
-                       case EDG_WLL_QUERY_ATTR_STATUS: 
-                               switch ( conds[i][j].op )
-                               {
-                               case EDG_WLL_QUERY_OP_EQUAL:
-                                       if ( conds[i][j].value.i == stat->state ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_UNEQUAL:
-                                       if ( conds[i][j].value.i != stat->state ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_LESS:
-                                       if ( conds[i][j].value.i > stat->state ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_GREATER:
-                                       if ( conds[i][j].value.i < stat->state ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_WITHIN:
-                                       if (   conds[i][j].value.i <= stat->state
-                                               && conds[i][j].value2.i >= stat->state ) goto or_satisfied;
-                                       break;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-                               if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) {
-                                       if ( conds[i][j].value.i == stat->resubmitted ) goto or_satisfied;
-                               } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL )
-                                       if ( conds[i][j].value.i != stat->resubmitted ) goto or_satisfied;
-                               break;
-                       case EDG_WLL_QUERY_ATTR_DONECODE:
-                               switch ( conds[i][j].op )
-                               {
-                               case EDG_WLL_QUERY_OP_EQUAL:
-                                       if ( conds[i][j].value.i == stat->done_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_UNEQUAL:
-                                       if ( conds[i][j].value.i != stat->done_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_LESS:
-                                       if ( conds[i][j].value.i > stat->done_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_GREATER:
-                                       if ( conds[i][j].value.i < stat->done_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_WITHIN:
-                                       if (   conds[i][j].value.i <= stat->done_code
-                                               && conds[i][j].value2.i >= stat->done_code ) goto or_satisfied;
-                                       break;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_EXITCODE:
-                               switch ( conds[i][j].op )
-                               {
-                               case EDG_WLL_QUERY_OP_EQUAL:
-                                       if ( conds[i][j].value.i == stat->exit_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_UNEQUAL:
-                                       if ( conds[i][j].value.i != stat->exit_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_LESS:
-                                       if ( conds[i][j].value.i > stat->exit_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_GREATER:
-                                       if ( conds[i][j].value.i < stat->exit_code ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_WITHIN:
-                                       if (   conds[i][j].value.i <= stat->exit_code
-                                               && conds[i][j].value2.i >= stat->exit_code ) goto or_satisfied;
-                                       break;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_OWNER:
-                               if (stat->owner) {
-                                       if (conds[i][j].value.c) {
-                                               if (!strcmp(conds[i][j].value.c, stat->owner) ) {
-                                                       if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                               } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-                                       } else if (ctx->peerName) {
-                                               if (!strcmp(ctx->peerName, stat->owner) ) {
-                                                       if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                               } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-                                       }
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_LOCATION:
-                               if ( stat->location )
-                               {
-                                       if ( !strcmp(conds[i][j].value.c, stat->location) ) {
-                                               if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                       } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_DESTINATION:
-                               if ( stat->destination )
-                               {
-                                       if ( !strcmp(conds[i][j].value.c, stat->destination) ) {
-                                               if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                       } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_JOBID:
-                               if ( !stat->jobId )
-                                       break;
-                               s = edg_wlc_JobIdUnparse(stat->jobId);
-                               s1 = edg_wlc_JobIdUnparse(conds[i][j].value.j);
-                               if ( s && s1 )
-                               {
-                                       int r = strcmp(s1, s);
-                                       free(s); free(s1);
-                                       if ( !r ) {
-                                               if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                       } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_PARENT:
-                               if ( !stat->parent_job )
-                                       break;
-                               s = edg_wlc_JobIdUnparse(stat->parent_job);
-                               s1 = edg_wlc_JobIdUnparse(conds[i][j].value.j);
-                               if ( s && s1 )
-                               {
-                                       int r = strcmp(s1, s);
-                                       free(s); free(s1);
-                                       if ( !r ) {
-                                               if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                       } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-                               }
-                               break;
-                       case EDG_WLL_QUERY_ATTR_USERTAG:
-                               if ( !stat->user_tags )
-                               {
-                                       if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL )
-                                               goto or_satisfied;
-
-                                       break;
-                               }
-                               for ( n = 0; stat->user_tags[n].tag; n++ )
-                                       if ( !strcasecmp(conds[i][j].attr_id.tag, stat->user_tags[n].tag) )
-                                       {
-                                               if ( !strcmp(conds[i][j].value.c, stat->user_tags[n].value) ) {
-                                                       if ( conds[i][j].op == EDG_WLL_QUERY_OP_EQUAL ) goto or_satisfied;
-                                               } else if ( conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL ) goto or_satisfied;
-
-                                               break;
-                                       }
-                               if ( !stat->user_tags[n].tag && conds[i][j].op == EDG_WLL_QUERY_OP_UNEQUAL )
-                                       goto or_satisfied;
-                               break;
-                       case EDG_WLL_QUERY_ATTR_TIME:
-                               if ( !stat->stateEnterTimes || !stat->stateEnterTimes[1+conds[i][j].attr_id.state] )
-                                       break;
-                               switch ( conds[i][j].op )
-                               {
-                               case EDG_WLL_QUERY_OP_EQUAL:
-                                       if ( conds[i][j].value.t.tv_sec == stat->stateEnterTimes[1+conds[i][j].attr_id.state] ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_UNEQUAL:
-                                       if ( conds[i][j].value.t.tv_sec != stat->stateEnterTimes[1+conds[i][j].attr_id.state] ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_LESS:
-                                       if ( conds[i][j].value.t.tv_sec > stat->stateEnterTimes[1+conds[i][j].attr_id.state] ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_GREATER:
-                                       if ( conds[i][j].value.t.tv_sec < stat->stateEnterTimes[1+conds[i][j].attr_id.state] ) goto or_satisfied;
-                                       break;
-                               case EDG_WLL_QUERY_OP_WITHIN:
-                                       if (   conds[i][j].value.t.tv_sec <= stat->stateEnterTimes[1+conds[i][j].attr_id.state]
-                                               && conds[i][j].value2.t.tv_sec >= stat->stateEnterTimes[1+conds[i][j].attr_id.state] ) goto or_satisfied;
-                                       break;
-                               }
-                               break;
-                       default:
-                               break;
-                       }
-               }
-
-                       /*
-                        *      No one condition in "or clause satisfied
-                        */
-               return 0;
-
-or_satisfied:
-                // just for escaping from nested cycles
-               ;       /* prevent compiler to complain */
-       }
-
-       return 1;
-}
-
-static int cmp_string(const char *s1,edg_wll_QueryOp op,const char *s2)
-{
-       switch (op) {
-               case EDG_WLL_QUERY_OP_EQUAL:    return !strcmp(s1,s2);
-               case EDG_WLL_QUERY_OP_LESS:     return strcmp(s1,s2)<0;
-               case EDG_WLL_QUERY_OP_GREATER:  return strcmp(s1,s2)>0;
-               default: return 0;
-       }
-       return 0;
-}
-
-
-int check_strict_jobid(edg_wll_Context ctx, const edg_wlc_JobId job)
-{
-       char    *job_host;
-       unsigned int    job_port;
-
-       edg_wll_ResetError(ctx);
-
-       /* Allow all jobids when server name is not set. */
-       if (ctx->srvName == NULL) return edg_wll_Error(ctx,NULL,NULL);
-
-       edg_wlc_JobIdGetServerParts(job,&job_host,&job_port);
-
-       if (strcasecmp(job_host,ctx->srvName) || job_port != ctx->srvPort)
-       {
-               char    *jobid,msg[300];
-
-               jobid = edg_wlc_JobIdUnparse(job);
-               snprintf(msg,sizeof msg,"%s: does not match server address",jobid);
-               msg[sizeof msg - 1] = 0;
-               edg_wll_SetError(ctx,EINVAL,msg);
-               free(jobid);
-       }
-
-       free(job_host);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static int check_strict_jobid_cond(edg_wll_Context ctx, const edg_wll_QueryRec **cond)
-{
-       int     i,j,ret;
-
-       if (!cond) return edg_wll_ResetError(ctx);
-       for (i=0; cond[i]; i++) for (j=0; cond[i][j].attr; j++) 
-               if (cond[i][j].attr == EDG_WLL_QUERY_ATTR_JOBID &&
-                       (ret = check_strict_jobid(ctx,cond[i][j].value.j)))
-                               return ret;
-
-       return 0;
-}
-
-static int is_all_query(const edg_wll_QueryRec **jc)
-{
-       if (!jc || !*jc) return 1;
-
-       if (jc[0][0].attr == EDG_WLL_QUERY_ATTR_OWNER && 
-           jc[0][0].op == EDG_WLL_QUERY_OP_EQUAL &&
-           !jc[0][1].attr && !jc[1]) return 1;
-
-       return 0;
-}
diff --git a/org.glite.lb.server/src/query.h b/org.glite.lb.server/src/query.h

deleted file mode 100644 (file)

index fb421e4..0000000
--- a/org.glite.lb.server/src/query.h
+++ /dev/null
@@ -1,3 +0,0 @@
-int convert_event_head(edg_wll_Context,char **,edg_wll_Event *);
-int check_strict_jobid(edg_wll_Context, const edg_wlc_JobId);
-int match_status(edg_wll_Context, const edg_wll_JobStat *stat,const edg_wll_QueryRec **conditions);
diff --git a/org.glite.lb.server/src/request.c b/org.glite.lb.server/src/request.c

deleted file mode 100644 (file)

index 0424043..0000000
--- a/org.glite.lb.server/src/request.c
+++ /dev/null
@@ -1,96 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "glite/lb/il_string.h"
-#include "glite/lb/context-int.h"
-
-#include "store.h"
-
-#ifdef __GNUC__
-#define UNUSED_VAR __attribute__((unused))
-#else
-#define UNUSED_VAR
-#endif
-    
-int 
-handle_request(edg_wll_Context ctx,char *buf, int len UNUSED_VAR)
-{
-  char *p = buf;
-  char *event, *ucs;
-  int ret;
-
-  edg_wll_ResetError(ctx);
-
-  p = get_string(p, &ucs);
-  if(p == NULL) return edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading UCS");
-
-  p = get_string(p, &event);
-  if(p == NULL) {
-    edg_wll_SetError(ctx,EDG_WLL_IL_PROTO,"reading event string");
-    if(ucs) free(ucs);
-    return EDG_WLL_IL_PROTO;
-  }
-
-  ret = db_store(ctx,ucs, event);
-
-  if(ucs)
-    free(ucs);
-  if(event)
-    free(event);
-
-  return(ret);
-}
-
-
-int 
-create_reply(const edg_wll_Context ctx,char *buf, int max_len)
-{
-  int len, err_code, err_code_min;
-  char *p;
-  char *err_msg;
-
-  err_code_min = 0;
-
-  switch(edg_wll_Error(ctx,NULL,&err_msg)) {
-
-  case 0:
-    err_code = LB_OK;
-    break;
-
-  case ENOMEM:
-    err_code = LB_NOMEM;
-    break;
-
-  case EDG_WLL_IL_PROTO:
-    err_code = LB_PROTO;
-    break;
-    
-  default:
-    err_code = LB_DBERR;
-    err_code_min = edg_wll_Error(ctx,NULL,NULL);
-    break;
-
-  } 
-
-  if (!err_msg) err_msg=strdup("OK");
-  
-  len = 17 + len_int(err_code) + len_int(err_code_min) + len_string(err_msg);
-  if(len > max_len) {
-    free(err_msg);
-    return(0);
-  }
-
-  snprintf(buf, max_len, "%16d\n", len - 17);
-  p = buf + 17;
-  p = put_int(p, err_code);
-  p = put_int(p, err_code_min);
-  p = put_string(p, err_msg);
-  free(err_msg);
-  
-  return(len);
-}
-
-
diff --git a/org.glite.lb.server/src/server_state.c b/org.glite.lb.server/src/server_state.c

deleted file mode 100644 (file)

index d2bf8f0..0000000
--- a/org.glite.lb.server/src/server_state.c
+++ /dev/null
@@ -1,54 +0,0 @@
-#ident "$Header$"
-
-#include "glite/lb/trio.h"
-#include "glite/lb/context-int.h"
-
-#include "lbs_db.h"
-#include "server_state.h"
-
-int edg_wll_GetServerState(edg_wll_Context ctx,const char *name,char **val)
-{
-       char    *stmt = NULL;
-       edg_wll_Stmt    q = NULL;
-
-
-       trio_asprintf(&stmt,"select value from server_state "
-                       "where prefix = 'https://%|Ss:%d' and name = '%|Ss'",
-                       ctx->srvName,ctx->srvPort,name);
-
-       switch (edg_wll_ExecStmt(ctx,stmt,&q)) {
-               case 0: edg_wll_SetError(ctx,ENOENT,name); break;
-               case -1: break;
-               default: edg_wll_FetchRow(q,val); break;
-       }
-
-       edg_wll_FreeStmt(&q);
-       free(stmt);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_SetServerState(edg_wll_Context ctx,const char *name,const char *val)
-{
-       char    *stmt = NULL;
-
-       trio_asprintf(&stmt,"insert into server_state (prefix,name,value) "
-                       "values ('https://%|Ss:%d','%|Ss','%|Ss')",
-                       ctx->srvName,ctx->srvPort,name,val);
-
-       switch(edg_wll_ExecStmt(ctx,stmt,NULL)) {
-               case 1: break;
-               case -1: if (edg_wll_Error(ctx,NULL,NULL) == EEXIST) {
-                                free(stmt);
-                                trio_asprintf(&stmt,"update server_state set value = '%|Ss' "
-                                                "where prefix = 'https://%|Ss:%d' "
-                                                "and name = '%|Ss'",
-                                                val,ctx->srvName,ctx->srvPort,name);
-                                edg_wll_ExecStmt(ctx,stmt,NULL);
-                        }
-                        break;
-
-               default: abort();
-       }
-       free(stmt);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.server/src/server_state.h b/org.glite.lb.server/src/server_state.h

deleted file mode 100644 (file)

index 029fb7c..0000000
--- a/org.glite.lb.server/src/server_state.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _EDG_WORKLOAD_LOGGING_LBSERVER_H_
-#define EDG_WLL_STATE_DUMP_START       "StartDump"
-#define EDG_WLL_STATE_DUMP_END         "EndDump"
-
-#ident "$Header$"
-
-int edg_wll_GetServerState(edg_wll_Context,const char *,char **);
-int edg_wll_SetServerState(edg_wll_Context,const char *,const char *);
-
-#endif
diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c

deleted file mode 100644 (file)

index 58a843d..0000000
--- a/org.glite.lb.server/src/srv_purge.c
+++ /dev/null
@@ -1,562 +0,0 @@
-#ident "$Header$"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <assert.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#include "glite/lb/trio.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/events_parse.h"
-#include "glite/lb/mini_http.h"
-#include "glite/lb/ulm_parse.h"
-
-#include "lb_html.h"
-#include "lb_proto.h"
-#include "store.h"
-#include "lock.h"
-#include "lbs_db.h"
-#include "query.h"
-#include "get_events.h"
-#include "glite/lb/purge.h"
-#include "glite/lb/load.h"
-#include "glite/lb/dump.h"
-#include "purge.h"
-#include "lb_xml_parse.h"
-
-
-#define DUMP_FILE_STORAGE                                      "/tmp/"
-
-#define sizofa(a) (sizeof(a)/sizeof((a)[0]))
-
-static const char* const resp_headers[] = {
-       "Cache-Control: no-cache",
-       "Accept: application/x-dglb",
-       "User-Agent: edg_wll_Server/" PROTO_VERSION "/" COMP_PROTO,
-       "Content-Type: application/x-dglb",
-       NULL
-};
-
-static int purge_one(edg_wll_Context ctx,const edg_wlc_JobId,int,int);
-
-int edg_wll_CreateTmpFileStorage(edg_wll_Context ctx, char *prefix, char **fname)
-{
-       char                    fname_buf[1024];
-       struct timeval  tv;
-       int                             retfd;
-
-
-       while ( 1 )
-       {
-               gettimeofday(&tv, NULL);
-               snprintf(fname_buf, 1024, "%s/%ld_%ld", prefix, tv.tv_sec, tv.tv_usec);
-
-               if ( (retfd = open(fname_buf, O_WRONLY|O_CREAT|O_EXCL|O_APPEND,0600)) == -1 )
-               {
-                       if ( errno != EEXIST )
-                       {
-                               char buff[100];
-
-                               sprintf(buff, "couldn't create temporary server file");
-                               return edg_wll_SetError(ctx, errno, buff);
-                       }
-               }
-               else
-                       break;
-       }
-
-       *fname = strdup(fname_buf);
-
-       return retfd;
-}
-
-int edg_wll_CreateFileStorageFromTmp(edg_wll_Context ctx, char *old_file, char *file_type, char **fname)
-{
-       char                    fname_buf[1024],
-                                       fname_prefix[1024],
-                                       stimebuf[100];
-       char               *stmp;
-       struct timeval  tv;
-       int                             retfd;
-
-
-       if ( (stmp = strrchr(old_file, '/')) )
-       {
-               strncpy(fname_prefix, old_file, stmp - old_file);
-               fname_prefix[stmp - old_file] = '\0';
-       }
-
-       while ( 1 )
-       {
-               gettimeofday(&tv, NULL);
-               edg_wll_ULMTimevalToDate(tv.tv_sec, tv.tv_usec, stimebuf);
-               snprintf(fname_buf, 1024, "%s/%s_%s", fname_prefix, file_type, stimebuf);
-
-               if ( !link(old_file, fname_buf) )
-                       break;
-
-               if ( errno != EEXIST )
-               {
-                       char buff[100];
-
-                       sprintf(buff, "couldn't create server %s file", file_type);
-                       return edg_wll_SetError(ctx, errno, buff);
-               }
-       }
-
-       *fname = strdup(fname_buf);
-
-       return retfd;
-}
-
-int edg_wll_CreateFileStorage(edg_wll_Context ctx, char *file_type, char *prefix, char **fname)
-{
-       char                    fname_buf[1024],
-                                       stimebuf[100];
-       struct timeval  tv;
-       int                             retfd;
-
-       if ( *fname )
-       {
-               snprintf(fname_buf, 1024, "%s/%s", prefix? prefix: "", *fname);
-               if ( (retfd = open(*fname, O_WRONLY|O_CREAT|O_EXCL|O_APPEND,0600)) == -1 )
-               {
-                       char buff[100];
-                       if ( errno == EEXIST )
-                               sprintf(buff, "Server file %s exist", fname_buf);
-                       else
-                               sprintf(buff, "Server couldn't create file %s", fname_buf);
-                       edg_wll_SetError(ctx, errno, buff);
-
-                       return -1;
-               }
-               if ( prefix )
-               {
-                       free(*fname);
-                       *fname = strdup(fname_buf);
-               }
-
-               return retfd;
-       }
-
-       while ( 1 )
-       {
-               gettimeofday(&tv, NULL);
-               edg_wll_ULMTimevalToDate(tv.tv_sec, tv.tv_usec, stimebuf);
-               if ( !prefix )
-               {
-                       if ( strcmp(file_type,FILE_TYPE_PURGE) == 0 )
-                               prefix = ctx->purgeStorage;
-                       else if ( strcmp(file_type,FILE_TYPE_DUMP) == 0 )
-                               prefix = ctx->dumpStorage;
-                       else
-                               prefix = "";
-               }
-               snprintf(fname_buf, 1024, "%s/%s_%s", prefix, file_type, stimebuf);
-
-               if ( (retfd = open(fname_buf, O_WRONLY|O_CREAT|O_EXCL|O_APPEND,0600)) == -1 )
-               {
-                       if ( errno != EEXIST )
-                       {
-                               char buff[100];
-
-                               sprintf(buff, "couldn't create server %s file", file_type);
-                               edg_wll_SetError(ctx, errno, buff);
-
-                               return -1;
-                       }
-               }
-               else
-                       break;
-       }
-
-       *fname = strdup(fname_buf);
-
-       return retfd;
-}
-
-int edg_wll_PurgeServer(edg_wll_Context ctx,const edg_wll_PurgeRequest *request)
-{
-       int     i,parse = 0,dumpfile = -1;
-       edg_wlc_JobId   job;
-       char    *message = NULL, *response = NULL;
-       char    *tmpfname;
-       int     naffected_jobs = 0;
-       edg_wll_PurgeResult result;
-       int             ret = HTTP_OK;
-
-
-       if (!ctx->noAuth) {
-               edg_wll_SetError(ctx,EPERM,"only superusers may purge");
-               goto abort;
-       }
-
-       edg_wll_ResetError(ctx);
-       memset(&result, 0, sizeof(edg_wll_PurgeResult));
-
-
-       if ( (request->flags & EDG_WLL_PURGE_SERVER_DUMP) && 
-                ((dumpfile = edg_wll_CreateTmpPurgeFile(ctx, &tmpfname)) == -1 ) )
-               return edg_wll_Error(ctx, NULL, NULL);
-
-       if (request->flags&EDG_WLL_PURGE_REALLY_PURGE) {
-               edg_wll_DumpRequest     req = {
-                       EDG_WLL_DUMP_LAST_END, EDG_WLL_DUMP_NOW
-               };
-               edg_wll_DumpResult      res;
-
-               if (edg_wll_DumpEvents(ctx,&req,&res)) 
-               {
-                       if ( request->flags & EDG_WLL_PURGE_SERVER_DUMP )
-                               unlink(tmpfname);
-                       return edg_wll_Error(ctx, NULL, NULL);
-               }
-       }
-
-       if (request->jobs) for (i=0; request->jobs[i]; i++) {
-               if (edg_wlc_JobIdParse(request->jobs[i],&job)) {
-                       fprintf(stderr,"%s: parse error\n",request->jobs[i]);
-                       parse = 1;
-               }
-               else {
-                       if (check_strict_jobid(ctx,job)) {
-                               fprintf(stderr,"%s: not my job\n",request->jobs[i]);
-                               parse = 1;
-                       }
-                       else {
-                               switch (purge_one(ctx,job,dumpfile,request->flags&EDG_WLL_PURGE_REALLY_PURGE)) {
-                                       case 0: if (request->flags & EDG_WLL_PURGE_LIST_JOBS) {
-                                                       result.jobs = realloc(result.jobs,(naffected_jobs+2) * sizeof(*result.jobs));
-                                                       result.jobs[naffected_jobs] = strdup(request->jobs[i]);
-                                                       result.jobs[naffected_jobs+1] = NULL;
-                                               }
-                                               naffected_jobs++;
-                                               break;
-                                       case ENOENT: parse = 1;
-                                                    edg_wll_ResetError(ctx);
-                                                    break;
-                                       default: goto abort;
-                               }
-
-                       }
-                       edg_wlc_JobIdFree(job);
-               }
-       }
-       else {
-               edg_wll_Stmt    s;
-               char            *job_s;
-               int             res;
-               time_t          timeout[EDG_WLL_NUMBER_OF_STATCODES],
-                               now = time(NULL);
-
-               for (i=0; i<EDG_WLL_NUMBER_OF_STATCODES; i++)
-                       timeout[i] = request->timeout[i] < 0 ? ctx->purge_timeout[i] : request->timeout[i];
-
-               if (edg_wll_ExecStmt(ctx,"select dg_jobid from jobs",&s) < 0) goto abort;
-               while ((res = edg_wll_FetchRow(s,&job_s)) > 0) {
-                       if (edg_wlc_JobIdParse(job_s,&job)) {
-                               fprintf(stderr,"%s: parse error (internal inconsistency !)\n",job_s);
-                               parse = 1;
-                       }
-                       else {
-                               edg_wll_JobStat stat;
-
-                               if (check_strict_jobid(ctx,job)) {
-                                       edg_wlc_JobIdFree(job);
-                                       free(job_s);
-                                       parse = 1;
-                                       continue;
-                               }
-
-                               memset(&stat,0,sizeof stat);
-                               if (edg_wll_JobStatus(ctx,job,0,&stat)) goto abort; /* XXX: memory leak */
-
-                               switch (stat.state) {
-                                       case EDG_WLL_JOB_CLEARED:
-                                       case EDG_WLL_JOB_ABORTED:
-                                       case EDG_WLL_JOB_CANCELLED:
-                                               i = stat.state;
-                                               break;
-                                       default:
-                                               i = EDG_WLL_PURGE_JOBSTAT_OTHER;
-                               }
-
-                               if (now-stat.lastUpdateTime.tv_sec > timeout[i] && !check_strict_jobid(ctx,job))
-                               {
-                                       if (purge_one(ctx,job,dumpfile,request->flags&EDG_WLL_PURGE_REALLY_PURGE))
-                                               goto abort;
-
-                               /* XXX: change with the streaming interface */
-                                       if (request->flags & EDG_WLL_PURGE_LIST_JOBS) {
-                                               result.jobs = realloc(result.jobs,(naffected_jobs+2) * sizeof(*result.jobs));
-                                               result.jobs[naffected_jobs] = job_s;
-                                               result.jobs[naffected_jobs+1] = NULL;
-                                               job_s = NULL;
-                                       }
-                                       naffected_jobs++;
-                               }
-
-                               edg_wlc_JobIdFree(job);
-                               edg_wll_FreeStatus(&stat);
-                               free(job_s);
-                       }
-               }
-               edg_wll_FreeStmt(&s);
-abort:
-                // just for escaping from nested cycles
-               ;       /* prevent compiler to complain */
-       }
-
-       if (parse && !edg_wll_Error(ctx,NULL,NULL))
-       {
-               if ( naffected_jobs )
-                       edg_wll_SetError(ctx,EINVAL,"Invalid JobId(s) but other jobs purged");
-               else
-                       edg_wll_SetError(ctx,EINVAL,"Invalid JobId(s)");
-       }
-
-       switch ( edg_wll_Error(ctx,NULL,NULL) )
-       {
-               case 0:
-                       ret = HTTP_OK;
-                       break;
-               case EINVAL:
-                       ret = HTTP_INVALID;
-                       break;
-               case EPERM:
-                       ret = HTTP_UNAUTH;
-                       break;
-               
-               /* fatal errors */
-               case ENOMEM:
-                       /* fall through */
-               default:
-                       ret = HTTP_INTERNAL;
-                       break;
-       }
-       
-       if (ret != HTTP_INTERNAL) {
-               if ( request->flags & EDG_WLL_PURGE_SERVER_DUMP )
-               {
-                       edg_wll_CreatePurgeFileFromTmp(ctx, tmpfname, &(result.server_file));
-                       unlink(tmpfname);
-               }
-
-               if ( edg_wll_PurgeResultToXML(ctx, &result, &message) )
-                       ret = HTTP_INTERNAL;
-               else 
-                       printf("%s", message);
-       }
-       
-       if ( result.server_file )
-               free(result.server_file);
-       if ( result.jobs )
-       {
-               for ( i = 0; result.jobs[i]; i++ )
-                       free(result.jobs[i]);
-               free(result.jobs);
-       }
-
-       asprintf(&response, "HTTP/1.1 %d %s", ret, edg_wll_HTTPErrorMessage(ret));
-
-       edg_wll_http_send(ctx, response, resp_headers, message);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static void unlock_and_check(edg_wll_Context ctx,edg_wlc_JobId job)
-{
-       char    *job_s,*et,*ed;
-
-       if (edg_wll_UnlockJob(ctx,job)) {
-               job_s = edg_wlc_JobIdUnparse(job);
-
-               edg_wll_Error(ctx,&et,&ed);
-               fprintf(stderr,"%s: edg_wll_UnlockJob(): %s (%s) -- expect bogus things\n",
-                               job_s,et,ed);
-               syslog(LOG_CRIT,"%s: edg_wll_UnlockJob(): %s (%s) -- expect bogus things",
-                               job_s,et,ed);
-               free(et); free(ed); free(job_s);
-       }
-}
-
-
-int purge_one(edg_wll_Context ctx,const edg_wlc_JobId job,int dump, int purge)
-{
-       char    *dbjob;
-       char    *stmt = NULL;
-       edg_wll_Stmt    q;
-       int             ret,dumped = 0;
-
-       edg_wll_ResetError(ctx);
-       if ( !purge && dump < 0 ) return 0;
-
-       dbjob = edg_wlc_JobIdGetUnique(job);    /* XXX: strict jobid already checked */
-       if (edg_wll_LockJob(ctx,job)) goto clean;
-
-       if ( purge )
-       {
-               trio_asprintf(&stmt,"delete from jobs where jobid = '%|Ss'",dbjob);
-               ret = edg_wll_ExecStmt(ctx,stmt,NULL);
-               if (ret <= 0) {
-                       unlock_and_check(ctx,job);
-                       if (ret == 0) {
-                               fprintf(stderr,"%s: no such job\n",dbjob);
-                               edg_wll_SetError(ctx,ENOENT,dbjob);
-                       }
-                       goto clean;
-               }
-               free(stmt); stmt = NULL;
-
-               trio_asprintf(&stmt,"delete from states where jobid = '%|Ss'",dbjob);
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) {
-                       unlock_and_check(ctx,job);
-                       goto clean;
-               }
-               free(stmt); stmt = NULL;
-
-/* Why on earth ?
-               trio_asprintf(&stmt,"delete from states where jobid = '%|Ss'",dbjob);
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) {
-                       unlock_and_check(ctx,job);
-                       goto clean;
-               }
-               free(stmt); stmt = NULL;
-*/
-
-       }
-
-       if (!ctx->strict_locking) unlock_and_check(ctx,job);
-
-       if ( purge )
-       {
-               trio_asprintf(&stmt,"delete from status_tags where jobid = '%|Ss'",dbjob);
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) goto unlock;
-               free(stmt); stmt = NULL;
-       }
-
-       if (dump >= 0) 
-               trio_asprintf(&stmt,
-                       "select event,code,prog,host,u.cert_subj,time_stamp,usec,level,arrived "
-                       "from events e,users u "
-                       "where e.jobid='%|Ss' "
-                       "and u.userid=e.userid "
-                       "order by event", dbjob);
-       else
-               trio_asprintf(&stmt,"select event from events "
-                       "where jobid='%|Ss' "
-                       "order by event", dbjob);
-
-/* check for events repeatedly -- new one may have arrived in the meantime */
-       while ((ret = edg_wll_ExecStmt(ctx,stmt,&q)) > 0) {
-               char    *res[9];
-
-               dumped = 1;
-               while ((ret = edg_wll_FetchRow(q,res)) > 0) {
-                       int     event;
-
-                       event = atoi(res[0]);
-                       free(res[0]); res[0] = NULL;
-
-                       if (dump >= 0) {
-                               edg_wll_Event   e;
-
-                               assert(ret == 9);
-                               res[0] = edg_wlc_JobIdUnparse(job);
-                               if (convert_event_head(ctx,res,&e) || edg_wll_get_event_flesh(ctx,event,&e))
-                               {
-                                       char    *et,*ed;
-                                       int     i;
-
-                               /* Most likely sort of internal inconsistency. 
-                                * Must not be fatal -- just complain
-                                */
-                                       edg_wll_Error(ctx,&et,&ed);
-                                       fprintf(stderr,"%s event %d: %s (%s)\n",dbjob,event,et,ed);
-                                       syslog(LOG_WARNING,"%s event %d: %s (%s)",dbjob,event,et,ed);
-                                       free(et); free(ed);
-                                       for (i=0; i<sizofa(res); i++) free(res[i]);
-                                       edg_wll_ResetError(ctx);
-                               }
-                               else {
-                                       char    *event_s = edg_wll_UnparseEvent(ctx,&e);
-                                       char    arr_s[100];
-                                       int     len, written, total;
-
-                                       strcpy(arr_s, "DG.ARRIVED=");
-                                       edg_wll_ULMTimevalToDate(e.any.arrived.tv_sec,
-                                                                       e.any.arrived.tv_usec,
-                                                                       arr_s+strlen("DG.ARRIVED="));
-
-                                       len = strlen(arr_s);
-                                       total = 0;
-                                       while (total != len) {
-                                               written = write(dump,arr_s+total,len-total);
-                                               if (written < 0 && errno != EAGAIN) {
-                                                       edg_wll_SetError(ctx,errno,"writing dump file");
-                                                       free(event_s);
-                                                       goto clean;
-                                               }
-                                               total += written;
-                                       }
-                                       write(dump, " ", 1);
-                                       
-                                       len = strlen(event_s);
-                                       total = 0;
-                                       while (total != len) {
-                                               written = write(dump,event_s+total,len-total);
-                                               if (written < 0 && errno != EAGAIN) {
-                                                       perror("dump to file");
-                                                       syslog(LOG_ERR,"dump to file: %m");
-                                                       dump = -1; /* XXX: likely to be a permanent error
-                                                                   * give up writing but do purge */
-                                                       break;
-                                               }
-                                               total += written;
-                                       }
-                                       /* write(dump,"\n",1); edg_wll_UnparseEvent does so */
-                                       free(event_s);
-                               }
-                               edg_wll_FreeEvent(&e);
-                       }
-
-                       if ( purge ) {
-                               if (edg_wll_delete_event(ctx,dbjob,event)) {
-                                       char    *et,*ed;
-
-                               /* XXX: just complain and carry on. Is it OK? */
-                                       edg_wll_Error(ctx,&et,&ed);
-                                       fprintf(stderr,"%s event %d: %s (%s)\n",dbjob,event,et,ed);
-                                       syslog(LOG_WARNING,"%s event %d: %s (%s)",dbjob,event,et,ed);
-                                       free(et); free(ed);
-                                       edg_wll_ResetError(ctx);
-                               }
-                       }
-               }
-               edg_wll_FreeStmt(&q);
-               if (ret < 0 || !purge) break;
-       }
-
-       edg_wll_FreeStmt(&q);
-       if (ret == 0 && dumped == 0) {
-               if (ctx->strict_locking) unlock_and_check(ctx,job);
-               fprintf(stderr,"%s: no events, i.e. no such job or internal inconsistency\n",dbjob);
-               edg_wll_SetError(ctx,ENOENT,dbjob);
-               goto clean;
-       }
-
-unlock:
-       if (ctx->strict_locking) unlock_and_check(ctx,job);
-
-clean:
-       free(dbjob);
-       free(stmt);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T

deleted file mode 100644 (file)

index 47a894f..0000000
--- a/org.glite.lb.server/src/store.c.T
+++ /dev/null
@@ -1,565 +0,0 @@
-#ident "$Header$"
-
-/*
-
-@@@AUTO
-
- * XXX: still lots of hardcoded stuff
- *     there's mapping db.column <-> event struct field
- */
-
-@@@LANG: C
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <errno.h>
-#include <syslog.h>
-
-#include <globus_config.h>
-
-#include "glite/wmsutils/jobid/strmd5.h"
-
-#include "glite/lb/events_parse.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/log_proto.h"        /* for EDG_WLL_LOG_USER_DEFAULT */
-#include "glite/lb/trio.h"
-
-#include "store.h"
-#include "get_events.h"
-#include "lbs_db.h"
-#include "lock.h"
-#include "lb_authz.h"
-
-static int store_user(edg_wll_Context,const char *,const char *); 
-static int store_job(edg_wll_Context,const edg_wlc_JobId,const char *);
-static int store_flesh(edg_wll_Context,edg_wll_Event *,char *,int);
-static int store_seq(edg_wll_Context,edg_wll_Event *,int);
-static int check_dup(edg_wll_Context,edg_wll_Event *);
-static int check_auth(edg_wll_Context,edg_wll_Event *e); 
-static int register_subjobs(edg_wll_Context,const edg_wll_RegJobEvent *);
-
-void edg_wll_StoreAnonymous(edg_wll_Context ctx,int anon) {
-       ctx->allowAnonymous = anon;
-}
-
-int edg_wll_StoreEvent(edg_wll_Context ctx,edg_wll_Event *e,int *seq)
-{
-       edg_wll_ErrorCode       err = 0;
-       char            *userid = NULL,*jobid,*stmt;
-       char            *select_max,*ssrc;
-       edg_wll_Stmt    sh = NULL;
-       int             next = 0xDEAD;
-       char            *now_s = NULL;
-
-       ssrc = jobid = stmt = select_max = NULL;
-
-       if ( ctx->event_load )
-               now_s = strdup(edg_wll_TimeToDB(e->any.arrived.tv_sec));
-       else
-       now_s = strdup(edg_wll_TimeToDB(time(NULL)));
-       edg_wll_ResetError(ctx);
-       switch (err = check_auth(ctx,e)) {
-               case 0: break;
-               case ENOENT: goto clean;
-               case EPERM:
-                       if (!ctx->noAuth) goto clean;
-                       edg_wll_ResetError(ctx);
-                       break;
-               default: goto clean;
-       }
-       if ((err = check_dup(ctx,e))) goto clean;
-
-       userid = strdup(strmd5(e->any.user,NULL));
-
-/* make sure user record is there */
-       if ((err = store_user(ctx,userid,e->any.user))) goto clean;
-
-       jobid = edg_wlc_JobIdGetUnique(e->any.jobId);
-
-/* only REGJOB events determine job owner now */
-       if (e->type == EDG_WLL_EVENT_REGJOB && 
-               (err = store_job(ctx,e->any.jobId,userid))) goto clean;
-
-
-/* obtain next event sequence number */
-       trio_asprintf(&select_max,
-               "select max(event) from events "
-               "where jobid = '%|Ss'",jobid);
-
-       ssrc = edg_wll_SourceToString(e->any.source);
-
-/* try to insert (someone else may be doing the same) */
-       while (1) {
-               char    *max;
-
-               if (edg_wll_ExecStmt(ctx,select_max,&sh) < 0 ||
-                   edg_wll_FetchRow(sh,&max) < 0)
-               {
-                       err = edg_wll_Error(ctx,NULL,NULL);
-                       goto clean;
-               }
-               edg_wll_FreeStmt(&sh); 
-               
-               next = max && *max ? atoi(max)+1 : 0;
-               
-       /* store an UNDEF event first in order to prevent race condition
-        * with readers */
-               trio_asprintf(&stmt,
-                       "insert into events(jobid,event,code,prog,host,time_stamp,usec,arrived,level,userid) "
-                       "values ('%|Ss',%d,%d,'%|Ss','%|Ss',%s,%d,'%|Ss',%d,'%|Ss')",
-                       jobid,next,EDG_WLL_EVENT_UNDEF,ssrc,e->any.host,
-                       edg_wll_TimeToDB(e->any.timestamp.tv_sec),e->any.timestamp.tv_usec,
-                       now_s, e->any.level,userid);
-
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) {
-                       if ((err = edg_wll_Error(ctx,NULL,NULL)) != EEXIST)
-                               goto clean;
-               } else break; /* successful insert */
-
-       /* we were late -- try once again */
-               free(stmt);
-       }
-
-       free(stmt);
-       if ((err = store_seq(ctx,e,next)) ||
-               (err = store_flesh(ctx,e,jobid,next))) {
-       /* attempt to cleanup, ignore new errors */
-               char            *desc;
-               edg_wll_ErrorCode       oerr = edg_wll_Error(ctx,NULL,&desc);
-
-               edg_wll_delete_event(ctx,jobid,next);
-               edg_wll_SetError(ctx,oerr,desc);
-               free(desc);
-       }
-       else {
-       /* emulate commit, i.e. swith to a real event type to make
-        * the record valid */
-               trio_asprintf(&stmt,
-                       "update events set code=%d "
-                       "where jobid='%|Ss' and event=%d",
-                       (int) e->any.type,jobid,next);
-               switch (edg_wll_ExecStmt(ctx,stmt,NULL)) {
-                       case 0: if (ctx->strict_locking)
-                                       err = edg_wll_SetError(ctx,ENOENT,"event disappeared on store while strict locking");
-                       /* purge in progres: drop the garbage, ignore errors */
-                               else {
-                                       edg_wll_delete_event(ctx,jobid,next);
-                                       err = edg_wll_SetError(ctx,ENOENT,"job being purged");
-                               }
-                               break;
-                       case 1: if (ctx->strict_locking) err = 0;
-                               else {
-                       /* check whether the job is still there to prevent garbage
-                        * left while there is a concurrent purge 
-                        */
-                                       free(stmt);
-                                       trio_asprintf(&stmt,
-                                               "select 'x' from jobs where jobid='%|Ss'",
-                                               jobid);
-                                       switch (edg_wll_ExecStmt(ctx,stmt,NULL)) {
-                                               case 1: break;
-                                               case 0: /* purge in progres */
-                                                       edg_wll_delete_event(ctx,jobid,next);
-                                                       err = edg_wll_SetError(ctx,ENOENT,"job being purged");
-                                                       break;
-                                               default: err = edg_wll_SetError(ctx,EDG_WLL_ERROR_DB_CALL,
-                                                               "more job records, what is that?");
-                                                       break;
-                                       }
-                               }
-                               break;
-                       case -1: err = edg_wll_Error(ctx,NULL,NULL);
-                               break;
-
-                       default: err = edg_wll_SetError(ctx,EDG_WLL_ERROR_DB_CALL,
-                               "more event records, what is that?");
-                               break;
-               }
-       }
-
-       if (err == 0 && 
-               e->any.type == EDG_WLL_EVENT_REGJOB &&
-               (e->regJob.jobtype == EDG_WLL_REGJOB_DAG ||
-                e->regJob.jobtype == EDG_WLL_REGJOB_PARTITIONED) &&
-               e->regJob.nsubjobs > 0) err = register_subjobs(ctx,&e->regJob);
-
-
-clean:
-       free(now_s);
-       free(userid);
-       free(jobid);
-       free(stmt);
-       free(ssrc);
-       free(select_max);
-       if (sh) edg_wll_FreeStmt(&sh);
-       if (!err && seq) *seq = next;
-       return err;
-}
-
-static int store_user(edg_wll_Context ctx,const char *userid,const char *subj)
-{
-       char    *stmt;
-
-       trio_asprintf(&stmt,"insert into users(userid,cert_subj) "
-               "values ('%|Ss','%|Ss')",userid,subj);
-
-       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) {
-               if (edg_wll_Error(ctx,NULL,NULL) == EEXIST)
-                       edg_wll_ResetError(ctx);
-       }
-
-       free(stmt);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static int store_job(edg_wll_Context ctx,const edg_wlc_JobId job,const char *userid)
-{
-       char *jobstr = edg_wlc_JobIdUnparse(job);
-       char *jobid = edg_wlc_JobIdGetUnique(job);
-       char *stmt;
-
-/* debug Duplicate key on index: Duplicate entry '(nil)' for key 1
- */
-       if (jobid == NULL || jobstr == NULL) 
-               return edg_wll_SetError(ctx,EINVAL,"store_job()");
-
-       edg_wll_ResetError(ctx);
-       trio_asprintf(&stmt,"insert into jobs(jobid,dg_jobid,userid) "
-               "values ('%|Ss','%|Ss','%|Ss')",jobid,jobstr,userid);
-
-       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) {
-               if (edg_wll_Error(ctx,NULL,NULL) == EEXIST) 
-                       edg_wll_ResetError(ctx);
-       }
-       free(stmt);
-       free(jobstr);
-       free(jobid);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-/*
- * XXX: store it in SHORT_FIELDS for now despite it should go to dedicated
- *     column in EVENTS.
- *
- *     don't want to change the database structure now, will be done anyway
- *     soon
- */
-static int store_seq(edg_wll_Context ctx,edg_wll_Event *e,int no)
-{
-       int     ret;
-       char    *stmt;
-       char    *jobid = edg_wlc_JobIdGetUnique(e->any.jobId);
-
-       edg_wll_ResetError(ctx);
-       trio_asprintf(&stmt,"insert into short_fields(jobid,event,name,value) "
-                       "values ('%|Ss',%d,'SEQCODE','%|Ss')",
-                       jobid,no,e->any.seqcode);
-
-       ret = edg_wll_ExecStmt(ctx,stmt,NULL);
-       free(stmt);
-       free(jobid);
-
-       return ret>=0 ? 0 : edg_wll_Error(ctx,NULL,NULL);
-}
-
-#define SHORT_LEN      255     /* short_fiels.value db column lenght */
-
-static int store_flesh(edg_wll_Context ctx,edg_wll_Event *e,char *jobid,int no)
-{
-       struct {
-               char    *key;
-               char    *val;
-       } f[20];
-
-       char    *stmt;
-       unsigned int    i;
-       int     err = 0;
-
-       edg_wll_ResetError(ctx);
-       memset(f,0,sizeof(f)); assert(f[0].key == NULL);
-
-       switch (e->type) {
-@@@{
-       for my $type (getTypesOrdered $event) {
-               next if $type eq '_common_';
-               selectType $event $type;
-               my $uctype = uc $type;
-               my $flctype = lcfirst $type;
-               gen qq{
-!              case EDG_WLL_EVENT_$uctype:
-};
-               my $idx = 0;
-               for (getFieldsOrdered $event) {
-                       my $f = selectField $event $_;
-                       my $name = getName $f;
-                       my $ucname = uc $name;
-                       my $fucname = ucfirst $name;
-                       my $tos = $f->{codes} ?
-                               "f[$idx].val = edg_wll\_$type${fucname}ToString(e->$flctype.$name);" :
-                               toString $f "e->$flctype.$name","f[$idx].val";
-                       gen qq{
-!                      f[$idx].key = "$ucname";
-!                      $tos
-};
-                       $idx++;
-               }
-               gen qq{
-!                      assert($idx<sizeof f/sizeof f[0]);
-!                      break;
-};
-       }
-@@@}
-               default:
-                       break;
-       }
-
-       for (i=0; i<sizeof(f)/sizeof(f[0]) && !err; i++) if (f[i].key && f[i].val) {
-               trio_asprintf(&stmt,"insert into %s(jobid,event,name,value) "
-                       "values ('%|Ss',%d,'%|Ss','%|Ss')",
-                       strlen(f[i].val) <= SHORT_LEN ? "short_fields" : "long_fields",
-                       jobid,no,f[i].key,f[i].val);
-
-               if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) err = edg_wll_Error(ctx,NULL,NULL);
-               free(stmt);
-       }
-       for (i=0; i<sizeof(f)/sizeof(f[0]); i++) free(f[i].val);
-
-/* XXX: hardcoded, no other suitable place to store it */
-       trio_asprintf(&stmt,"insert into short_fields(jobid,event,name,value) "
-               "values ('%|Ss',%d,'SRC_INSTANCE','%|Ss')",
-               jobid,no,e->any.src_instance);
-       if (edg_wll_ExecStmt(ctx,stmt,NULL) < 0) err = edg_wll_Error(ctx,NULL,NULL);
-       free(stmt);
-
-       return err;
-}
-
-static int check_dup(edg_wll_Context ctx,edg_wll_Event *e)
-{
-       int             i,dup_detected = 0;
-       int             err;
-       char            *es,*es2;
-       edg_wll_QueryRec        jc[2],ec[2];
-       edg_wll_QueryRec        **jca, **eca;
-       edg_wll_Event   *e2;
-
-       edg_wll_ResetError(ctx);
-
-       jc[0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-       jc[0].value.j = e->any.jobId;
-       jc[0].op = EDG_WLL_QUERY_OP_EQUAL;
-       jc[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-       ec[0].attr = EDG_WLL_QUERY_ATTR_TIME;
-       memcpy(&ec[0].value.t,&e->any.timestamp,sizeof(struct timeval));
-       ec[0].op = EDG_WLL_QUERY_OP_EQUAL;
-       ec[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-
-        jca = (edg_wll_QueryRec **) malloc (2 * sizeof(edg_wll_QueryRec **));
-        eca = (edg_wll_QueryRec **) malloc (2 * sizeof(edg_wll_QueryRec **));
-        jca[0] = jc;
-        jca[1] = NULL;
-        eca[0] = ec;
-        eca[1] = NULL;
-
-       err = edg_wll_QueryEventsServer(ctx,1,(const edg_wll_QueryRec **)jca, 
-                                       (const edg_wll_QueryRec **)eca,&e2);
-       switch (err) {
-               case 0: /* continue normally */
-                       break;
-               case ENOENT:
-                       free(jca);
-                       free(eca);
-                       return edg_wll_ResetError(ctx);
-                       break;
-               default:
-                       free(jca);
-                       free(eca);
-                       return edg_wll_Error(ctx,NULL,NULL);
-                       break;
-       }
-
-       es = edg_wll_UnparseEvent(ctx,e);
-       assert(es);
-
-       for (i=0;e2[i].type && !dup_detected;i++) {
-               /* Ignore priority */
-               e2[i].any.priority = e->any.priority;
-               es2 = edg_wll_UnparseEvent(ctx,e2+i);
-               assert(es2);
-               if (!strcmp(es,es2)) {
-                       dup_detected = 1;
-                       edg_wll_SetError(ctx,EEXIST,"duplicate event");
-               }
-               free(es2);
-       }
-
-       free(jca);
-       free(eca);
-       free(es);
-       for (i=0; e2[i].type; i++) edg_wll_FreeEvent(e2+i);
-       free(e2);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static int check_auth(edg_wll_Context ctx,edg_wll_Event *e)
-{
-       char    *jobid = edg_wlc_JobIdGetUnique(e->any.jobId);
-       char    *q = NULL,*owner = NULL;
-       edg_wll_Stmt    stmt = NULL;
-       char    *user;
-
-       edg_wll_ResetError(ctx);
-
-       if (e->type == EDG_WLL_EVENT_REGJOB) 
-               return strcmp(e->any.user,EDG_WLL_LOG_USER_DEFAULT) ?
-                       0 : edg_wll_SetError(ctx,EPERM,"can't register jobs anonymously");
-
-       trio_asprintf(&q,"select userid from jobs where jobid='%|Ss'",jobid);
-
-       if (edg_wll_ExecStmt(ctx,q,&stmt) < 0
-               || edg_wll_FetchRow(stmt,&owner) < 0
-       ) goto clean;
-
-       if (!owner) {
-               edg_wll_SetError(ctx,ENOENT,"job not registered");
-               goto clean;
-       }
-
-       switch (e->any.source) {
-               case EDG_WLL_SOURCE_USER_INTERFACE:
-               case EDG_WLL_SOURCE_LRMS:
-               case EDG_WLL_SOURCE_APPLICATION:
-                       user = strmd5(e->any.user,NULL);
-                       if (strcmp(owner,user)) edg_wll_SetError(ctx,EPERM,"check_auth()");
-                       break;
-               default:
-                       /* XXX: just don't allow anonymous */
-                       if (!strcmp(e->any.user,EDG_WLL_LOG_USER_DEFAULT))
-                               edg_wll_SetError(ctx,EPERM,"check_auth()");
-                       break;
-       }
-
-
-clean:
-       if (stmt) edg_wll_FreeStmt(&stmt);
-       free(q);
-       free(owner);
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-static int register_subjobs(edg_wll_Context ctx,const edg_wll_RegJobEvent *e)
-{
-       int     i,err;
-       edg_wlc_JobId   *subjobs;
-       struct timeval  now;
-
-       edg_wll_ResetError(ctx);
-       if (e->nsubjobs == 0) return 0;
-       if (e->nsubjobs < 0) return edg_wll_SetError(ctx,EINVAL,"negative number of subjobs");
-
-       if ((err = edg_wll_GenerateSubjobIds(ctx,e->jobId,e->nsubjobs,e->seed,&subjobs)))
-               return err;
-
-       gettimeofday(&now,NULL);
-
-       for (i=0; i<e->nsubjobs; i++) {
-               edg_wll_Event   e2;
-               int             seq;
-               char            *et,*ed,*job_s;
-
-               memset(&e2,0,sizeof e2);
-               e2.type = EDG_WLL_EVENT_REGJOB;
-               e2.any.jobId = subjobs[i]; subjobs[i] = NULL;
-               memcpy(&e2.regJob.timestamp,&now,sizeof now);
-               e2.any.host = strdup(ctx->srvName);
-               e2.any.level = e->level;
-               e2.any.priority = e->priority;
-               e2.any.seqcode = NULL;          /* XXX: I'm not sure :-( */
-               e2.any.user = strdup(e->user);
-               e2.any.source = e->source;
-               e2.regJob.ns = strdup(e->ns);
-               edg_wlc_JobIdDup(e->jobId,&e2.regJob.parent);
-               e2.regJob.jobtype = EDG_WLL_REGJOB_SIMPLE;
-               e2.regJob.jdl = strdup("");
-
-               switch (edg_wll_StoreEvent(ctx,&e2,&seq)) {
-
-                       case 0: break;
-                       /* maybe some non-ignorable errors should be handled here */
-
-                       default: 
-                               edg_wll_Error(ctx,&et,&ed);
-                               job_s = edg_wlc_JobIdUnparse(e2.any.jobId);
-                               fprintf(stderr,"register subjob %s: %s (%s)\n",job_s,et,ed);
-                               syslog(LOG_ERR,"register subjob %s: %s (%s)",job_s,et,ed);
-                               free(job_s); free(et); free(ed);
-                               edg_wll_FreeEvent(&e2);
-                               edg_wll_ResetError(ctx);
-                               continue;
-               }
-
-               if (edg_wll_LockJob(ctx,e2.any.jobId)) {
-                       job_s = edg_wlc_JobIdUnparse(e2.any.jobId);
-                       fprintf(stderr,"lock job %s: %s (%s)\n",job_s,et,ed);
-                       syslog(LOG_ERR,"lock job %s: %s (%s)",job_s,et,ed);
-                       free(job_s); free(et); free(ed);
-                       edg_wll_FreeEvent(&e2);
-                       edg_wll_ResetError(ctx);
-                       continue;
-               }
-
-               if ((err = edg_wll_StepIntState(ctx,e2.any.jobId,&e2,seq,NULL)))
-                       edg_wll_Error(ctx,&et,&ed);
-
-               edg_wll_UnlockJob(ctx,e2.any.jobId);
-               edg_wll_ResetError(ctx);
-
-               if (err) {
-                       job_s = edg_wlc_JobIdUnparse(e2.any.jobId);
-                       fprintf(stderr,"%s: %s (%s)\n",job_s,et,ed);
-                       syslog(LOG_ERR,"%s: %s (%s)",job_s,et,ed);
-                       free(job_s); free(et); free(ed);
-                       edg_wll_ResetError(ctx);
-               }
-
-               edg_wll_FreeEvent(&e2);
-       }
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
-
-int edg_wll_delete_event(edg_wll_Context ctx,const char *jobid,int event)
-{
-       char    *stmt;
-
-/* The order of tables is important to prevent another process calling
- * StoreEvent() to get our event number and mess up the fields together.
- *
- * XXX: best effort: more or less ignore errors
- *
- */
-
-       trio_asprintf(&stmt,
-               "delete from short_fields where jobid='%|Ss' and event=%d",
-               jobid,event);
-       edg_wll_ExecStmt(ctx,stmt,NULL);
-       free(stmt);
-
-       trio_asprintf(&stmt,
-               "delete from long_fields where jobid='%|Ss' and event=%d",
-               jobid,event);
-       edg_wll_ExecStmt(ctx,stmt,NULL);
-       free(stmt);
-
-       trio_asprintf(&stmt,
-               "delete from events where jobid='%|Ss' and event=%d",
-               jobid,event);
-       edg_wll_ExecStmt(ctx,stmt,NULL);
-       free (stmt);
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.server/src/store.h b/org.glite.lb.server/src/store.h

deleted file mode 100644 (file)

index ff62047..0000000
--- a/org.glite.lb.server/src/store.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _LBS_STORE_H
-#define _LBS_STORE_H
-
-#ident "$Header$"
-
-#include "glite/lb/consumer.h"
-#include "lb_authz.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* store an event into the LB database */
-
-int edg_wll_StoreEvent(
-       edg_wll_Context,        /* INOUT */
-       edg_wll_Event *,        /* IN */
-       int *
-);
-
-void edg_wll_StoreAnonymous(
-       edg_wll_Context,    /* INOUT */
-       int             /* IN (boolean) */
-);
-
-/* update stored job state according to new event */
-
-edg_wll_ErrorCode edg_wll_StepIntState(
-       edg_wll_Context,        /* INOUT */
-       edg_wlc_JobId,          /* IN */
-       edg_wll_Event *,        /* IN */
-       int,                    /* IN */
-       edg_wll_JobStat *
-);
-
-int db_store(edg_wll_Context,char *,char *);
-int handle_request(edg_wll_Context,char *, int);
-int create_reply(const edg_wll_Context,char *,int);
-
-int edg_wll_delete_event(edg_wll_Context,const char *, int);
-
-
-#define USER_UNKNOWN   "unknown"
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/org.glite.lb.server/src/stored_master.c b/org.glite.lb.server/src/stored_master.c

deleted file mode 100644 (file)

index 7c29f77..0000000
--- a/org.glite.lb.server/src/stored_master.c
+++ /dev/null
@@ -1,59 +0,0 @@
-#ident "$Header$"
-
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <assert.h>
-
-#include "glite/lb/il_string.h"
-#include "glite/lb/lb_gss.h"
-#include "glite/lb/context-int.h"
-
-#include "store.h"
-
-int edg_wll_StoreProto(edg_wll_Context ctx)
-{
-       char    fbuf[256],*buf;
-       int     len,ret;
-       size_t  total;
-       edg_wll_GssStatus       gss_code;
-
-       edg_wll_ResetError(ctx);
-       if ((ret=edg_wll_gss_read_full(&ctx->connPool[ctx->connToUse].gss,fbuf,17,&ctx->p_tmp_timeout,&total,&gss_code)) < 0) switch (ret) {
-               case EDG_WLL_GSS_ERROR_TIMEOUT: return edg_wll_SetError(ctx,ETIMEDOUT,"read message header");
-               case EDG_WLL_GSS_ERROR_EOF: return edg_wll_SetError(ctx,ENOTCONN,NULL);
-               default: return edg_wll_SetError(ctx,EDG_WLL_ERROR_GSS,"read message header");
-       }
-
-       if ((len = atoi(fbuf)) <= 0) return edg_wll_SetError(ctx,EINVAL,"message length");
-
-       buf = malloc(len+1);
-
-       if ((ret=edg_wll_gss_read_full(&ctx->connPool[ctx->connToUse].gss,buf,len,&ctx->p_tmp_timeout,&total,&gss_code)) < 0) {
-               free(buf);
-               return edg_wll_SetError(ctx,
-                       ret == EDG_WLL_GSS_ERROR_TIMEOUT ?
-                               ETIMEDOUT : EDG_WLL_ERROR_GSS,
-                       "read message");
-       }
-
-
-       buf[len] = 0;
-
-       handle_request(ctx,buf,len);
-       free(buf);
-
-       if ((len = create_reply(ctx,fbuf,sizeof fbuf))) {
-               if ((ret = edg_wll_gss_write_full(&ctx->connPool[ctx->connToUse].gss,fbuf,len,&ctx->p_tmp_timeout,&total,&gss_code)) < 0)
-                       edg_wll_SetError(ctx,
-                               ret == EDG_WLL_GSS_ERROR_TIMEOUT ? 
-                                       ETIMEDOUT : EDG_WLL_ERROR_GSS,
-                               "write reply");
-       }
-       else edg_wll_SetError(ctx,E2BIG,"create_reply()");
-
-       return edg_wll_Error(ctx,NULL,NULL);
-}
diff --git a/org.glite.lb.server/src/userjobs.c b/org.glite.lb.server/src/userjobs.c

deleted file mode 100644 (file)

index 66448f0..0000000
--- a/org.glite.lb.server/src/userjobs.c
+++ /dev/null
@@ -1,77 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "glite/wmsutils/jobid/strmd5.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/trio.h"
-
-#include "lbs_db.h"
-
-int edg_wll_UserJobs(
-       edg_wll_Context ctx,
-       edg_wlc_JobId   **jobs,
-       edg_wll_JobStat **states)
-{
-       char    *userid = strmd5(ctx->peerName,NULL),*stmt = NULL,
-               *res = NULL;
-       int     njobs = 0,ret,i;
-       edg_wlc_JobId   *out = NULL;
-       edg_wll_Stmt    sth = NULL;
-       edg_wll_ErrorCode       err = 0;
-
-       edg_wll_ResetError(ctx);
-
-       trio_asprintf(&stmt,"select cert_subj from users where userid = '%|Ss'",userid);
-
-       switch (edg_wll_ExecStmt(ctx,stmt,&sth)) {
-               case 0: edg_wll_SetError(ctx,ENOENT,ctx->peerName);
-               case -1: goto err;
-               default:
-                       if (edg_wll_FetchRow(sth,&res) < 0) goto err;
-                       if (strcmp(ctx->peerName,res)) {
-                               edg_wll_SetError(ctx,EDG_WLL_ERROR_MD5_CLASH,ctx->peerName);
-                               goto err;
-                       }
-       }
-
-       edg_wll_FreeStmt(&sth);
-       free(stmt); stmt = NULL;
-       free(res); res = NULL;
-
-       trio_asprintf(&stmt,"select dg_jobid from jobs where userid = '%|Ss'",userid);
-       switch (njobs = edg_wll_ExecStmt(ctx,stmt,&sth)) {
-               case 0: edg_wll_SetError(ctx,ENOENT,ctx->peerName);
-               case -1: goto err;
-       }
-
-       out = malloc(sizeof(*out)*(njobs+1));
-       memset(out,0,sizeof(*out)*(njobs+1));
-       
-       for (i=0; (ret = edg_wll_FetchRow(sth,&res)); i++) {
-               if (ret < 0) goto err;
-               if ((ret = edg_wlc_JobIdParse(res,out+i))) {
-                       edg_wll_SetError(ctx,errno,res);
-                       goto err;
-               }
-               free(res); res = NULL;
-       }
-
-err:
-       free(res);
-       free(stmt);
-       edg_wll_FreeStmt(&sth);
-       if ((err = edg_wll_Error(ctx,NULL,NULL))) {
-               if (out) {
-                   for (i=0; i<njobs; i++)
-                       edg_wlc_JobIdFree(out[i]);
-                   free(out);
-               }
-       } else *jobs = out;
-
-       return err;
-}
diff --git a/org.glite.lb.server/src/write2rgma.c b/org.glite.lb.server/src/write2rgma.c

deleted file mode 100755 (executable)

index 2d291fb..0000000
--- a/org.glite.lb.server/src/write2rgma.c
+++ /dev/null
@@ -1,110 +0,0 @@
-#ident "$Header$"
-
-#include <assert.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/file.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-
-
-#include "glite/lb/trio.h"
-#include "glite/lb/producer.h"
-#include "glite/lb/context-int.h"
-#include "glite/lb/jobstat.h"
-
-#include "get_events.h"
-#include "store.h"
-#include "lock.h"
-#include "index.h"
-#include "jobstat.h"
-
-static int     rgma_fd = -1;
-static int     rgma_sock = -1;
-static struct sockaddr_un rgma_saddr;
-
-static void write2rgma_sql(char *sqlstat)
-{
-       
-       char *rgma_fname;
-       int slen;
-       int sysret;
-       struct iovec iov[2];
-
-       assert(sqlstat != NULL);
-
-       if (rgma_fd == -1) {
-               rgma_fname = getenv("EDG_WL_RGMA_FILE");
-               if (rgma_fname == NULL) return;
-
-               rgma_fd = open(rgma_fname, O_WRONLY|O_CREAT|O_APPEND, 0777);
-               if (rgma_fd == -1) return;
-       }
-
-       slen = strlen(sqlstat);
-       iov[0].iov_base = &slen;
-       iov[0].iov_len = sizeof(slen);
-       iov[1].iov_base = sqlstat;
-       iov[1].iov_len = slen + 1;
-       if ((sysret = flock(rgma_fd, LOCK_SH)) != -1) {
-               sysret = writev(rgma_fd, iov, 2);
-               flock(rgma_fd, LOCK_UN);
-       }
-       
-       if (sysret == -1) return;
-
-       if (rgma_sock == -1) {
-               rgma_fname = getenv("EDG_WL_RGMA_SOCK");
-               if (rgma_fname == NULL) return;
-
-               if ((strlen(rgma_fname) + 1) > sizeof(rgma_saddr.sun_path))
-                       return ;
-
-               rgma_sock = socket(PF_UNIX, SOCK_DGRAM,0);
-               if (rgma_sock == -1) return;
-               
-               memset(&rgma_saddr, sizeof(rgma_saddr), 0);
-               rgma_saddr.sun_family = PF_UNIX;
-               strcpy(rgma_saddr.sun_path, rgma_fname);
-       }
-
-       sendto(rgma_sock, &slen, 1, 0,
-               (struct sockaddr*) &rgma_saddr, SUN_LEN(&rgma_saddr));
-
-       return;
-}
-
-void write2rgma_status(edg_wll_JobStat *stat)
-{
-       char *stmt = NULL;
-       char *string_jobid, *string_stat, *string_server;
-
-       string_jobid = edg_wlc_JobIdUnparse(stat->jobId);
-       string_stat = edg_wll_StatToString(stat->state);
-       string_server = edg_wlc_JobIdGetServer(stat->jobId);
-
-       trio_asprintf(&stmt, "INSERT INTO JobStatusRaw VALUES ('%|Ss','%s','%|Ss','%|Ss', '%d%03d')",
-                       string_jobid, string_stat, stat->owner, string_server,
-                       stat->stateEnterTime.tv_sec, stat->stateEnterTime.tv_usec/1000);
-
-       if (stmt) write2rgma_sql(stmt);
-
-       free(string_jobid);
-       free(string_stat);
-       free(string_server);
-       free(stmt);
-}
-
-#ifdef TEST
-int main(int argc, char* argv[])
-{
-       setenv("EDG_WL_RGMA_FILE", "/tmp/rgma_statefile", 1);
-       setenv("EDG_WL_RGMA_SOCK", "/tmp/rgma_statesock", 1);
- 
-       write2rgma_sql("INSERT INTO JobStatusRaw VALUES ('Job_id9','CLEARED','Owner','BKServer', '1050024158210')");
-       return 0;
-}
-#endif
diff --git a/org.glite.lb.server/src/ws_fault.c b/org.glite.lb.server/src/ws_fault.c

deleted file mode 100644 (file)

index 6f7bbc0..0000000
--- a/org.glite.lb.server/src/ws_fault.c
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <string.h>
-
-#include "glite/lb/context-int.h"
-
-#include "bk_ws_H.h"
-#include "bk_ws_Stub.h"
-
-
-void edg_wll_ErrToFault(const edg_wll_Context ctx,struct soap *soap)
-{
-       char    *et,*ed;
-       struct SOAP_ENV__Detail *detail = soap_malloc(soap,sizeof *detail);
-       struct _GenericLBFault *f = soap_malloc(soap,sizeof *f);
-
-
-       f->edgwll__GenericLBFault = soap_malloc(soap,sizeof *f->edgwll__GenericLBFault);
-
-       f->edgwll__GenericLBFault->code = edg_wll_Error(ctx,&et,&ed);
-       f->edgwll__GenericLBFault->text = soap_malloc(soap,strlen(et)+1);
-       strcpy(f->edgwll__GenericLBFault->text,et); 
-       free(et);
-       f->edgwll__GenericLBFault->description = soap_malloc(soap,strlen(ed)+1);
-       strcpy(f->edgwll__GenericLBFault->description,ed); 
-       free(ed);
-
-       detail->__type = SOAP_TYPE__GenericLBFault;
-       detail->value = f;
-       detail->__any = NULL;
-
-       soap_receiver_fault(soap,"shit",NULL);
-       if (soap->version == 2) soap->fault->SOAP_ENV__Detail = detail;
-       else soap->fault->detail = detail;
-}
-
-
-void edg_wll_FaultToErr(const struct soap *soap,edg_wll_Context ctx)
-{
-       struct SOAP_ENV__Detail *detail = soap->version == 2 ?
-               soap->fault->SOAP_ENV__Detail : soap->fault->detail;
-
-       struct edgwll__GenericLBFaultType       *f;
-
-       if (detail->__type == SOAP_TYPE__GenericLBFault) {
-                       f = ((struct _GenericLBFault *) detail->value)
-                       ->edgwll__GenericLBFault;
-               edg_wll_SetError(ctx,f->code,f->description);
-       }
-       else {
-               char    *s;
-
-               asprintf(&s,"SOAP: %s", soap->version == 2 ?
-                       soap->fault->SOAP_ENV__Reason : soap->fault->faultstring);
-               edg_wll_SetError(ctx,EINVAL,s);
-               free(s);
-       }
-}
diff --git a/org.glite.lb.server/src/ws_fault.h b/org.glite.lb.server/src/ws_fault.h

deleted file mode 100644 (file)

index 70870cd..0000000
--- a/org.glite.lb.server/src/ws_fault.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_LBSERVER_WS_FAULT_H__
-#define __EDG_WORKLOAD_LOGGING_LBSERVER_WS_FAULT_H__
-
-extern void edg_wll_ErrToFault(const edg_wll_Context, struct soap *);
-extern void edg_wll_FaultToErr(const struct soap *, edg_wll_Context);
-
-#endif /* __EDG_WORKLOAD_LOGGING_LBSERVER_WS_FAULT_H__ */
diff --git a/org.glite.lb.server/src/ws_plugin.c b/org.glite.lb.server/src/ws_plugin.c

deleted file mode 100644 (file)

index 6a3df26..0000000
--- a/org.glite.lb.server/src/ws_plugin.c
+++ /dev/null
@@ -1,191 +0,0 @@
-#include <stdio.h>
-#include <assert.h>
-#include <signal.h>
-#include <stdsoap2.h>
-
-#include "glite/lb/lb_gss.h"
-#include "glite/lb/context-int.h"
-
-#ifdef PLUGIN_TEST
-extern int edg_wll_open(edg_wll_Context);
-#endif
-
-#include "ws_plugin.h"
-
-#include "LoggingAndBookkeeping.nsmap"
-
-#ifdef WS_PLUGIN_DEBUG
-#  define pdprintf(s)  printf s
-#else
-#  define pdprintf(s)
-#endif
-
-static const char plugin_id[] = PLUGIN_ID;
-
-#ifdef PLUGIN_TEST
-static int edg_wll_ws_connect(struct soap *, const char *, const char *, int);
-#endif
-static void edg_wll_ws_delete(struct soap *, struct soap_plugin *);
-static size_t edg_wll_ws_recv(struct soap *, char *, size_t);
-static int edg_wll_ws_send(struct soap *, const char *, size_t);
-
-
-int edg_wll_ws_plugin(struct soap *soap, struct soap_plugin *p, void *arg)
-{
-       /*      The parametr (edg_wll_Context) must be given!  */
-       assert(arg != NULL);
-
-       p->id                   = plugin_id;
-       p->data                 = arg;
-       p->fdelete              = edg_wll_ws_delete;
-
-#ifdef PLUGIN_TEST
-       soap->fconnect  = edg_wll_ws_connect;
-#endif
-       soap->fsend             = edg_wll_ws_send;
-       soap->frecv             = edg_wll_ws_recv;
-
-       return SOAP_OK;
-}
-
-#ifdef PLUGIN_TEST
-int edg_wll_ws_connect(struct soap *soap, const char *endpoint,
-       const char *host, int port)
-{
-       edg_wll_Context         ctx = (edg_wll_Context)soap_lookup_plugin(soap, plugin_id);
-
-
-       ctx->srvName = strdup(host);
-       ctx->srvPort = port;
-       ctx->p_tmp_timeout = ctx->p_query_timeout;
-       if ( edg_wll_open(ctx) )
-               return edg_wll_Error(ctx, NULL, NULL);
-
-       soap->socket = 2;
-
-       return SOAP_OK;
-}
-#endif
-
-static void edg_wll_ws_delete(struct soap *soap, struct soap_plugin *p)
-{
-       /*
-        *      Keep silly gSOAP happy
-        */
-}
-
-
-size_t edg_wll_ws_recv(struct soap *soap, char *buf, size_t bufsz)
-{
-       edg_wll_Context         ctx = (edg_wll_Context)soap_lookup_plugin(soap, plugin_id);
-       edg_wll_GssStatus       gss_code;
-       int                                     len;
-
-
-       edg_wll_ResetError(ctx);
-       if ( ctx->connPool[ctx->connToUse].gss.context == GSS_C_NO_CONTEXT )
-       {
-               edg_wll_SetError(ctx, ENOTCONN, NULL);
-               soap->errnum = ENOTCONN;
-               return 0;
-       }
-       
-       len = edg_wll_gss_read(&ctx->connPool[ctx->connToUse].gss,
-                                       buf, bufsz, &ctx->p_tmp_timeout, &gss_code);
-
-       switch ( len )
-       {
-       case EDG_WLL_GSS_OK:
-               break;
-
-       case EDG_WLL_GSS_ERROR_GSS:
-               edg_wll_SetErrorGss(ctx, "receving WS request", &gss_code);
-               soap->errnum = ENOTCONN;
-               return 0;
-
-       case EDG_WLL_GSS_ERROR_ERRNO:
-               edg_wll_SetError(ctx, errno, "edg_wll_gss_read()");
-               soap->errnum = errno;
-               return 0;
-
-       case EDG_WLL_GSS_ERROR_TIMEOUT:
-               edg_wll_SetError(ctx, ETIMEDOUT, NULL);
-               soap->errnum = ETIMEDOUT;
-               return 0;
-
-       case EDG_WLL_GSS_ERROR_EOF:
-               edg_wll_SetError(ctx, ENOTCONN, NULL);
-               soap->errnum = ENOTCONN;
-               return 0;
-
-               /* default: fallthrough */
-       }
-
-       pdprintf(("\nWS received:\n%s\n\n", buf));
-       return len;
-}
-
-static int edg_wll_ws_send(struct soap *soap, const char *buf, size_t bufsz)
-{
-       edg_wll_Context         ctx = (edg_wll_Context) soap_lookup_plugin(soap, plugin_id);
-       edg_wll_GssStatus       gss_code;
-       struct sigaction        sa, osa;
-       int                                     total = 0,
-                                               ret;
-
-
-       edg_wll_ResetError(ctx);
-
-       if ( ctx->connPool[ctx->connToUse].gss.context == GSS_C_NO_CONTEXT )
-       {
-               edg_wll_SetError(ctx, ENOTCONN, NULL);
-               soap->errnum = ENOTCONN;
-               return SOAP_EOF;
-       }
-
-       memset(&sa, 0, sizeof(sa));
-       assert(sa.sa_handler == NULL);
-       sa.sa_handler = SIG_IGN;
-       sigaction(SIGPIPE, &sa, &osa);
-
-       ret = edg_wll_gss_write_full(&ctx->connPool[ctx->connToUse].gss,
-                               (void*)buf, bufsz,
-                               &ctx->p_tmp_timeout,
-                               &total, &gss_code);
-
-       sigaction(SIGPIPE, &osa, NULL);
-
-       switch ( ret )
-       {
-       case EDG_WLL_GSS_OK:
-               pdprintf(("\nWS sent:\n%s\n\n", buf));
-               break;
-
-       case EDG_WLL_GSS_ERROR_TIMEOUT:
-               edg_wll_SetError(ctx, ETIMEDOUT, "edg_wll_ws_send()");
-               soap->errnum = ETIMEDOUT;
-               return SOAP_EOF;
-
-       case EDG_WLL_GSS_ERROR_ERRNO:
-               if ( errno == EPIPE )
-               {
-                       edg_wll_SetError(ctx, ENOTCONN, "edg_wll_ws_send()");
-                       soap->errnum = ENOTCONN;
-               }
-               else
-               {
-                       edg_wll_SetError(ctx, errno, "edg_wll_ws_send()");
-                       soap->errnum = errno;
-               }
-               return SOAP_EOF;
-
-       case EDG_WLL_GSS_ERROR_GSS:
-       case EDG_WLL_GSS_ERROR_EOF:
-       default:
-               edg_wll_SetError(ctx, ENOTCONN, "edg_wll_ws_send()");
-               soap->errnum = ENOTCONN;
-               return SOAP_EOF;
-       }
-
-       return SOAP_OK;
-}
diff --git a/org.glite.lb.server/src/ws_plugin.h b/org.glite.lb.server/src/ws_plugin.h

deleted file mode 100644 (file)

index 9b691be..0000000
--- a/org.glite.lb.server/src/ws_plugin.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_LBSERVER_WS_PLUGIN_H__
-#define __EDG_WORKLOAD_LOGGING_LBSERVER_WS_PLUGIN_H__
-
-#define PLUGIN_ID              "GLITE_WS_PLUGIN"
-
-int edg_wll_ws_plugin(struct soap *, struct soap_plugin *, void *);
-
-#endif /* __EDG_WORKLOAD_LOGGING_LBSERVER_WS_PLUGIN_H__ */
diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c

deleted file mode 100644 (file)

index 60dd118..0000000
--- a/org.glite.lb.server/src/ws_query.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#include <stdsoap2.h>
-
-#include "glite/lb/context-int.h"
-#include "glite/lb/consumer.h"
-
-#include "jobstat.h"
-#include "query.h"
-#include "ws_plugin.h"
-#include "bk_ws_H.h"
-#include "get_events.h"
-#include "ws_fault.h"
-#include "ws_typeref.h"
-
-
-int edgwll2__JobStatus(
-        struct soap                                               *soap,
-        char                                                      *jobid,
-        struct edgwll__JobStatFlags               *flags,
-        struct edgwll2__JobStatusResponse  *out)
-{
-       edg_wll_Context         ctx = (edg_wll_Context) soap_lookup_plugin(soap, PLUGIN_ID);
-       edg_wlc_JobId           j;
-       edg_wll_JobStat         s;
-
-
-       if ( edg_wlc_JobIdParse(jobid, &j) )
-       {
-               edg_wll_SetError(ctx, EINVAL, jobid);
-               edg_wll_ErrToFault(ctx, soap);
-               return SOAP_FAULT;
-       }
-
-       if ( edg_wll_JobStatus(ctx, j, 0, &s) )
-       {
-               edg_wll_ErrToFault(ctx, soap);
-               return SOAP_FAULT;
-       }
-
-       edg_wll_StatusToSoap(soap, &s, &(out->status));
-
-       return SOAP_OK;
-}
-
-int edgwll2__QueryJobs(
-       struct soap                                                *soap,
-       struct edgwll__QueryConditions     *conditions,
-       struct edgwll__JobStatFlags                *flags,
-       struct edgwll2__QueryJobsResponse  *out)
-{
-       edg_wll_Context         ctx = (edg_wll_Context) soap_lookup_plugin(soap, PLUGIN_ID);
-       edg_wlc_JobId      *jobsOut = NULL;
-       edg_wll_JobStat    *statesOut = NULL;
-       edg_wll_QueryRec  **qr = NULL;
-       int                                     fl,
-                                               i, j,
-                                               ret = SOAP_FAULT;
-
-
-       out->states = soap_malloc(soap, sizeof(*out->states));
-       out->jobs = soap_malloc(soap, sizeof(*out->jobs));
-       if ( !out->states || !out->jobs ) goto cleanup;
-       memset(out->states, 0, sizeof(*(out->states)));
-       memset(out->jobs, 0, sizeof(*(out->jobs)));
-
-       edg_wll_ResetError(ctx);
-       edg_wll_SoapToJobStatFlags(flags, &fl);
-       if ( edg_wll_SoapToQueryCondsExt(conditions, &qr) ) {
-               edg_wll_SetError(ctx, ENOMEM, "Couldn't create internal structures");
-               goto cleanup;
-       }
-       if ( edg_wll_QueryJobsServer(ctx, qr, fl, &jobsOut, &statesOut) ) goto cleanup;
-       if ( edg_wll_JobsQueryResToSoap(soap, jobsOut, statesOut, out) ) goto cleanup;
-       ret = SOAP_OK;
-
-cleanup:
-       if ( qr ) {
-               for ( i = 0; qr[i]; i++ ) {
-                       for ( j = 0; qr[i][j].attr; j++ )
-                               edg_wll_QueryRecFree(&qr[i][j]);
-                       free(qr[i]);
-               }
-               free(qr);
-       }
-       if ( jobsOut ) {
-               for ( i = 0; jobsOut[i]; i++ )
-                       edg_wlc_JobIdFree(jobsOut[i]);
-               free(jobsOut);
-       }
-       if ( statesOut ) {
-               for ( i = 0; statesOut[i].state; i++ )
-                       edg_wll_FreeStatus(&statesOut[i]);
-               free(statesOut);
-       }
-       if ( ret == SOAP_FAULT ) edg_wll_ErrToFault(ctx, soap);
-
-       return ret;
-}
-
-int edgwll2__UserJobs(
-       struct soap                                                *soap,
-       struct edgwll2__UserJobsResponse   *out)
-{
-       out->jobs = NULL;
-       out->states = NULL;
-
-       return SOAP_OK;
-}
diff --git a/org.glite.lb.server/src/ws_typemap.dat b/org.glite.lb.server/src/ws_typemap.dat

deleted file mode 100644 (file)

index c79474a..0000000
--- a/org.glite.lb.server/src/ws_typemap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-edgwll = http://glite.org/wsdl/types/lb
-edgwll = http://glite.org/wsdl/services/lb
diff --git a/org.glite.lb.server/src/ws_typeref.c.T b/org.glite.lb.server/src/ws_typeref.c.T

deleted file mode 100644 (file)

index fd862f4..0000000
--- a/org.glite.lb.server/src/ws_typeref.c.T
+++ /dev/null
@@ -1,521 +0,0 @@
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdsoap2.h>
-
-#include "bk_ws_H.h"
-
-#include "glite/lb/consumer.h"
-/* XXX: references only, src and dest share pointers */
-
-void edg_wll_JobStatCodeToSoap(edg_wll_JobStatCode in, enum edgwll__JobStatCode *out)
-{
-       switch ( in )
-       {
-       case EDG_WLL_JOB_UNDEF: *out = UNDEF; break;
-@@@{
-       for my $stat ($status->getTypesOrdered) {
-               my $u = uc $stat;
-               my $c = getTypeComment $status $stat;
-               gen qq{
-!      case EDG_WLL_JOB_$u: *out = $u; break; /**< $c */
-};
-       }
-@@@}
-       }
-}
-
-void edg_wll_SoapToJobStatCode(enum edgwll__JobStatCode in, edg_wll_JobStatCode *out)
-{
-       switch ( in )
-       {
-       case UNDEF: *out = EDG_WLL_JOB_UNDEF; break;
-@@@{
-       for my $stat ($status->getTypesOrdered) {
-               my $u = uc $stat;
-               my $c = getTypeComment $status $stat;
-               gen qq{
-!      case $u: *out = EDG_WLL_JOB_$u; break; /**< $c */
-};
-       }
-@@@}
-       }
-}
-
-int edg_wll_StatusToSoap(struct soap *soap,edg_wll_JobStat const *src,struct edgwll__JobStat **dest)
-{
-       int     i;
-       struct edgwll__JobStat *js;
-
-       if ( !(js = soap_malloc(soap, sizeof(*js))) ) return SOAP_FAULT;
-       memset(js, 0, sizeof(*js));
-       edg_wll_JobStatCodeToSoap(src->state, &(js->state));
-@@@{
-       selectType $status '_common_';
-       for (getFieldsOrdered $status) {
-               my $f = selectField $status $_;
-               my $ft = $f->{type};
-               my $usuc = $_;
-               $usuc = $1.uc($2).$3 while ($usuc =~ /([^_]*)_([a-z])(.*)/);
-               if ($ft eq 'jobid') {
-                       gen "\tjs->$usuc = edg_wlc_JobIdUnparse(src->$_);\n";
-               }
-               elsif ($ft eq 'strlist') {
-                       gen "\tfor (i=0; src->$_ && src->$_\[i]; i++);\n";
-                       gen "\tjs->__size$usuc = i;\n";
-                       gen "\tjs->$usuc = src->$_;\n";
-               } elsif ($ft eq 'intlist') {
-                       gen "\tjs->__size$usuc = src->$_ ? src->$_\[0] : 0;\n";
-                       gen "\tjs->$usuc = src->$_ ? src->$_ + 1 : NULL;\n";
-               } elsif ($ft eq 'stslist' || $ft eq 'taglist') {
-# FIXME
-                       gen "\tjs->__size$usuc = 0;\n";
-                       gen "\tjs->$usuc = NULL;\n";
-               } elsif ($ft eq 'timeval') {
-                       gen "\tjs->$usuc = soap_malloc(soap,sizeof *js->$usuc);\n";
-                       gen "\tjs->$usuc->tvSec = src->$_.tv_sec;\n";
-                       gen "\tjs->$usuc->tvUsec = src->$_.tv_usec;\n";
-               }
-               else { gen "\tjs->$usuc = src->$_;\n"; }
-       }
-@@@}
-
-       *dest = js;
-       return SOAP_OK;
-}
-
-void edg_wll_SoapToStatus(struct soap *soap,struct edgwll__JobStat const *src,edg_wll_JobStat *dest)
-{
-       memset(dest,0,sizeof *dest);
-       edg_wll_SoapToJobStatCode(src->state, &(dest->state));
-
-@@@{
-       selectType $status '_common_';
-       for (getFieldsOrdered $status) {
-               my $f = selectField $status $_;
-               my $ft = $f->{type};
-               my $usuc = $_;
-               $usuc = $1.uc($2).$3 while ($usuc =~ /([^_]*)_([a-z])(.*)/);
-
-               if ($ft eq 'jobid') {
-                       gen "\tif (src->$usuc) edg_wlc_JobIdParse(src->$usuc,&dest->$_);\n";
-               } elsif ($ft eq 'strlist') {
-                       gen "\tsoap_unlink(soap,src->$usuc);\n";
-                       gen "\tdest->$_ = realloc(src->$usuc,sizeof(*dest->$_) * (src->__size$usuc + 1));\n";
-                       gen "\tdest->$_\[src->__size$usuc] = NULL;\n";
-               } elsif ($ft eq 'intlist') {
-                       gen "\tsoap_unlink(soap,src->$usuc);\n";
-                       gen "\tdest->$_ = realloc(src->$usuc,sizeof(*dest->$_) * (src->__size$usuc + 1));\n";
-                       gen "\tmemmove(dest->$_ + 1,dest->$_,sizeof(*dest->$_) * (src->__size$usuc));\n";
-                       gen "\tdest->$_\[0] = src->__size$usuc;\n";
-               } elsif ($ft eq 'stslist' || $ft eq 'taglist') {
-# FIXME
-                       gen "\tdest->$_ = NULL;\n";
-               } elsif ($ft eq 'timeval') {
-                       gen "\tdest->$_.tv_sec = src->$usuc->tvSec;\n";
-                       gen "\tdest->$_.tv_usec = src->$usuc->tvUsec;\n";
-               } elsif ($ft eq 'string') {
-                       gen "\tdest->$_ = src->$usuc;\n";
-                       gen "\tsoap_unlink(soap,src->$usuc);\n";
-               } else {
-                       gen "\tdest->$_ = src->$usuc;\n";
-}
-}
-@@@}
-}
-
-void edg_wll_SoapToJobStatFlags(const struct edgwll__JobStatFlags *in, int *out)
-{
-       int             i;
-
-       assert(in); assert(out);
-       *out = 0;
-       for ( i = 0; i < in->__sizeflag; i++ ) switch ( in->flag[i] )
-       {
-       case CLASSADS: *out |= EDG_WLL_STAT_CLASSADS; break;
-       case CHILDREN: *out |= EDG_WLL_STAT_CHILDREN; break;
-       case CHILDSTAT: *out |= EDG_WLL_STAT_CHILDSTAT; break;
-       }
-}
-
-int edg_wll_JobStatFlagsToSoap(struct soap *soap, const int in, struct edgwll__JobStatFlags *out)
-{
-       int             i = 0;
-
-       assert(out);
-       memset(out, 0, sizeof(*out));
-       if ( in & EDG_WLL_STAT_CLASSADS ) out->__sizeflag++;
-       if ( in & EDG_WLL_STAT_CHILDREN ) out->__sizeflag++;
-       if ( in & EDG_WLL_STAT_CHILDSTAT ) out->__sizeflag++;
-       if ( !out->__sizeflag ) return SOAP_OK;
-       out->flag = soap_malloc(soap, sizeof(*(out->flag))*out->__sizeflag);
-       if ( !out->flag ) return SOAP_FAULT;
-
-       if ( in & EDG_WLL_STAT_CLASSADS ) out->flag[i++] = CLASSADS;
-       if ( in & EDG_WLL_STAT_CHILDREN ) out->flag[i++] = CHILDREN;
-       if ( in & EDG_WLL_STAT_CHILDSTAT ) out->flag[i++] = CHILDSTAT;
-
-       return SOAP_OK;
-}
-
-void edg_wll_SoapToAttr(const enum edgwll__QueryAttr in, edg_wll_QueryAttr *out)
-{
-       switch ( in )
-       {
-       case UNDEF: *out = EDG_WLL_QUERY_ATTR_UNDEF; break;
-       case JOBID: *out = EDG_WLL_QUERY_ATTR_JOBID; break;
-       case OWNER: *out = EDG_WLL_QUERY_ATTR_OWNER; break;
-       case STATUS: *out = EDG_WLL_QUERY_ATTR_STATUS; break;
-       case LOCATION: *out = EDG_WLL_QUERY_ATTR_LOCATION; break;
-       case DESTINATION: *out = EDG_WLL_QUERY_ATTR_DESTINATION; break;
-       case DONECODE: *out = EDG_WLL_QUERY_ATTR_DONECODE; break;
-       case USERTAG: *out = EDG_WLL_QUERY_ATTR_USERTAG; break;
-       case TIME: *out = EDG_WLL_QUERY_ATTR_TIME; break;
-       case LEVEL: *out = EDG_WLL_QUERY_ATTR_LEVEL; break;
-       case HOST: *out = EDG_WLL_QUERY_ATTR_HOST; break;
-       case SOURCE: *out = EDG_WLL_QUERY_ATTR_SOURCE; break;
-       case INSTANCE: *out = EDG_WLL_QUERY_ATTR_INSTANCE; break;
-       case EVENT_TYPE: *out = EDG_WLL_QUERY_ATTR_EVENT_TYPE; break;
-       case CHKPT_TAG: *out = EDG_WLL_QUERY_ATTR_CHKPT_TAG; break;
-       case RESUBMITTED: *out = EDG_WLL_QUERY_ATTR_RESUBMITTED; break;
-       case PARENT: *out = EDG_WLL_QUERY_ATTR_PARENT; break;
-       case EXITCODE: *out = EDG_WLL_QUERY_ATTR_EXITCODE; break;
-       default: *out = in; break;
-       }
-}
-
-void edg_wll_AttrToSoap(const edg_wll_QueryAttr in, enum edgwll__QueryAttr *out)
-{
-       switch ( in )
-       {
-       case EDG_WLL_QUERY_ATTR_UNDEF: *out = UNDEF; break;
-       case EDG_WLL_QUERY_ATTR_JOBID: *out = JOBID; break;
-       case EDG_WLL_QUERY_ATTR_OWNER: *out = OWNER; break;
-       case EDG_WLL_QUERY_ATTR_STATUS: *out = STATUS; break;
-       case EDG_WLL_QUERY_ATTR_LOCATION: *out = LOCATION; break;
-       case EDG_WLL_QUERY_ATTR_DESTINATION: *out = DESTINATION; break;
-       case EDG_WLL_QUERY_ATTR_DONECODE: *out = DONECODE; break;
-       case EDG_WLL_QUERY_ATTR_USERTAG: *out = USERTAG; break;
-       case EDG_WLL_QUERY_ATTR_TIME: *out = TIME; break;
-       case EDG_WLL_QUERY_ATTR_LEVEL: *out = LEVEL; break;
-       case EDG_WLL_QUERY_ATTR_HOST: *out = HOST; break;
-       case EDG_WLL_QUERY_ATTR_SOURCE: *out = SOURCE; break;
-       case EDG_WLL_QUERY_ATTR_INSTANCE: *out = INSTANCE; break;
-       case EDG_WLL_QUERY_ATTR_EVENT_TYPE: *out = EVENT_TYPE; break;
-       case EDG_WLL_QUERY_ATTR_CHKPT_TAG: *out = CHKPT_TAG; break;
-       case EDG_WLL_QUERY_ATTR_RESUBMITTED: *out = RESUBMITTED; break;
-       case EDG_WLL_QUERY_ATTR_PARENT: *out = PARENT; break;
-       case EDG_WLL_QUERY_ATTR_EXITCODE: *out = EXITCODE; break;
-       default: *out = in; break;
-       }
-}
-
-void edg_wll_SoapToQueryOp(const enum edgwll__QueryOp in, edg_wll_QueryOp *out)
-{
-       switch ( in )
-       {
-       case EQUAL: *out = EDG_WLL_QUERY_OP_EQUAL; break;
-       case LESS: *out = EDG_WLL_QUERY_OP_LESS; break;
-       case GREATER: *out = EDG_WLL_QUERY_OP_GREATER; break;
-       case WITHIN: *out = EDG_WLL_QUERY_OP_WITHIN; break;
-       default: *out = in; break;
-       }
-}
-
-void edg_wll_QueryOpToSoap(const edg_wll_QueryOp in, enum edgwll__QueryOp *out)
-{
-       switch ( in )
-       {
-       case EDG_WLL_QUERY_OP_EQUAL: *out = EQUAL; break;
-       case EDG_WLL_QUERY_OP_LESS: *out = LESS; break;
-       case EDG_WLL_QUERY_OP_GREATER: *out = GREATER; break;
-       case EDG_WLL_QUERY_OP_WITHIN: *out = WITHIN; break;
-       default: *out = in; break;
-       }
-}
-
-int edg_wll_SoapToQueryVal(
-       const edg_wll_QueryAttr                         attr,
-       const struct edgwll__QueryRecValue *in,
-       union edg_wll_QueryVal                     *out)
-{
-       assert(in); assert(out);
-       if ( in->c ) {
-               if ( attr == EDG_WLL_QUERY_ATTR_JOBID || attr == EDG_WLL_QUERY_ATTR_PARENT ) {
-                       if ( edg_wlc_JobIdParse(in->c, &(out->j)) ) return -1;
-               } else {
-                       if ( !(out->c = strdup(in->c)) ) return -1;
-               }
-       }
-       else if ( in->t ) {
-               out->t.tv_sec = in->t->tvSec;
-               out->t.tv_usec = in->t->tvUsec;
-       }
-       else if ( in->i ) out->i = *(in->i);
-
-       return 0;
-}
-
-int edg_wll_QueryValToSoap(
-       struct soap                                        *soap,
-       const edg_wll_QueryAttr                 attr,
-       const union edg_wll_QueryVal   *in,
-       struct edgwll__QueryRecValue   *out)
-{
-       assert(in); assert(out);
-       memset(out, 0, sizeof(*out));
-       switch ( attr ) {
-       case EDG_WLL_QUERY_ATTR_USERTAG:
-       case EDG_WLL_QUERY_ATTR_OWNER: 
-       case EDG_WLL_QUERY_ATTR_LOCATION:
-       case EDG_WLL_QUERY_ATTR_DESTINATION:
-       case EDG_WLL_QUERY_ATTR_HOST:
-       case EDG_WLL_QUERY_ATTR_INSTANCE:
-               if ( in->c && !(out->c = soap_strdup(soap, in->c)) ) return SOAP_FAULT;
-               break;
-       case EDG_WLL_QUERY_ATTR_JOBID:
-       case EDG_WLL_QUERY_ATTR_PARENT: {
-                       char *s = edg_wlc_JobIdUnparse(in->j);
-                       out->c = soap_strdup(soap, s);
-                       free(s);
-                       if ( !out->c ) return SOAP_FAULT;
-               }
-               break;
-       case EDG_WLL_QUERY_ATTR_TIME:
-               out->t = soap_malloc(soap, sizeof(*(out->t)));
-               if ( !out->t ) return SOAP_FAULT;
-               out->t->tvSec = in->t.tv_sec;
-               out->t->tvUsec = in->t.tv_usec;
-               break;
-       case EDG_WLL_QUERY_ATTR_STATUS:
-       case EDG_WLL_QUERY_ATTR_DONECODE:
-       case EDG_WLL_QUERY_ATTR_LEVEL:
-       case EDG_WLL_QUERY_ATTR_SOURCE:
-       case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-       default:
-               out->i = soap_malloc(soap, sizeof(*(out->i)));
-               if ( !out->i ) return SOAP_FAULT;
-               *(out->i) = in->i;
-               break;
-       }
-
-       return SOAP_OK;
-}
-
-int edg_wll_SoapToQueryRec(
-       const enum edgwll__QueryAttr    attr,
-       const struct edgwll__QueryRec  *in,
-       edg_wll_QueryRec                           *out)
-{
-       assert(attr); assert(in); assert(out);
-       memset(out, 0, sizeof(*out));
-       edg_wll_SoapToAttr(attr, &out->attr);
-       switch ( out->attr )
-       {
-       case EDG_WLL_QUERY_ATTR_TIME:
-               edg_wll_SoapToJobStatCode(*(in->attrid->state), &(out->attr_id.state));
-               break;
-       case EDG_WLL_QUERY_ATTR_USERTAG:
-               out->attr_id.tag = strdup(in->attrid->tag);
-               break;
-       default:
-               break;
-       }
-       edg_wll_SoapToQueryOp(in->op, &(out->op));
-       switch ( out->op )
-       {
-       case EDG_WLL_QUERY_OP_WITHIN:
-               if ( edg_wll_SoapToQueryVal(out->attr, in->value2, &(out->value2)) ) goto err;
-       default:
-               if ( edg_wll_SoapToQueryVal(out->attr, in->value1, &(out->value)) ) goto err;
-               break;
-       }
-
-       return 0;
-err:
-       edg_wll_QueryRecFree(out);
-       return -1;
-}
-
-int edg_wll_QueryRecToSoap(
-       struct soap                                *soap,
-       const edg_wll_QueryRec     *in,
-       struct edgwll__QueryRec   **out)
-{
-       struct edgwll__QueryRec    *qr;
-
-
-       assert(in); assert(out);
-       if ( !(qr = soap_malloc(soap, sizeof(*qr))) ) return SOAP_FAULT;
-       memset(qr, 0, sizeof(*qr));
-       if ( !in ) goto ret;
-       edg_wll_QueryOpToSoap(in->op, &(qr->op));
-       if (   in->attr == EDG_WLL_QUERY_ATTR_TIME
-               || in->attr == EDG_WLL_QUERY_ATTR_USERTAG ) {
-               if ( !(qr->attrid = soap_malloc(soap, sizeof(*(qr->attrid)))) ) return SOAP_FAULT;
-               memset(qr->attrid, 0, sizeof(*(qr->attrid)));
-               if ( in->attr == EDG_WLL_QUERY_ATTR_TIME ) {
-                       qr->attrid->state = soap_malloc(soap, sizeof(*(qr->attrid->state)));
-                       if ( !qr->attrid->state ) return SOAP_FAULT;
-                       edg_wll_JobStatCodeToSoap(in->attr_id.state, qr->attrid->state);
-               }
-               else {
-                       qr->attrid->tag = soap_strdup(soap, in->attr_id.tag);
-                       if ( !qr->attrid->tag ) return SOAP_FAULT;
-               }
-       }
-       switch ( in->op ) {
-       case EDG_WLL_QUERY_OP_WITHIN:
-               if ( !(qr->value2 = soap_malloc(soap, sizeof(*(qr->value2)))) ) return SOAP_FAULT;
-               if ( edg_wll_QueryValToSoap(soap, in->attr, &(in->value2), qr->value2) ) return SOAP_FAULT;
-       default:
-               if ( !(qr->value1 = soap_malloc(soap, sizeof(*(qr->value1)))) ) return SOAP_FAULT;
-               if ( edg_wll_QueryValToSoap(soap, in->attr, &(in->value), qr->value1) ) return SOAP_FAULT;
-               break;
-       }
-
-ret:
-       *out = qr;
-       return SOAP_OK;
-}
-
-int edg_wll_SoapToQueryConds(const struct edgwll__QueryCondition *in, edg_wll_QueryRec **out)
-{
-       int                                     i;
-       edg_wll_QueryRec   *qr;
-
-
-       assert(in); assert(out);
-       if ( !(qr = calloc(in->__sizerecords+1, sizeof(*qr))) ) goto err;
-       for ( i = 0; i < in->__sizerecords; i++ )
-               if ( edg_wll_SoapToQueryRec(in->attr, in->records[i], qr+i) ) goto err;
-       *out = qr;
-       return 0;
-
-err:
-       if ( qr ) {
-               for ( i = 0; qr[i].attr; i++ ) edg_wll_QueryRecFree(qr+i);
-               free(qr);
-       }
-       return -1;
-}
-
-int edg_wll_QueryCondsToSoap(
-       struct soap                                        *soap,
-       const edg_wll_QueryRec             *in,
-       struct edgwll__QueryCondition **out)
-{
-       int                                                             i;
-       struct edgwll__QueryCondition  *qc;
-
-
-       assert(out);
-       if ( !(qc = soap_malloc(soap, sizeof(*qc))) ) return SOAP_FAULT;
-       memset(qc, 0, sizeof(*qc));
-       if ( !in ) goto ret;
-       while ( in[qc->__sizerecords].attr ) qc->__sizerecords++;
-       if ( !qc->__sizerecords ) goto ret;
-       qc->records = soap_malloc(soap, sizeof(*(qc->records))*qc->__sizerecords);
-       if ( !qc->records ) return SOAP_FAULT;
-       edg_wll_AttrToSoap(in[0].attr, &(qc->attr));
-       for ( i = 0; in[i].attr; i++ )
-               if ( edg_wll_QueryRecToSoap(soap, in+i, qc->records+i) )
-                       return SOAP_FAULT;
-
-ret:
-       *out = qc;
-       return SOAP_OK;
-}
-
-int edg_wll_SoapToQueryCondsExt(const struct edgwll__QueryConditions *in, edg_wll_QueryRec ***out)
-{
-       int                                     i;
-       edg_wll_QueryRec  **qr;
-
-
-       assert(in); assert(out);
-       if ( !(qr = calloc(in->__sizecondition+1, sizeof(*qr))) ) return -1;
-       for ( i = 0; i < in->__sizecondition; i++ )
-               if ( edg_wll_SoapToQueryConds(in->condition[i], qr+i) ) goto err;
-
-       *out = qr;
-       return 0;
-
-err:
-       if ( qr ) {
-               int             j;
-               for ( i = 0; qr[i]; i++ )
-               {
-                       for ( j = 0; qr[i][j].attr; j++ ) edg_wll_QueryRecFree(qr[i]);
-                       free(qr[i]);
-               }
-               free(qr);
-       }
-       return -1;
-}
-
-int edg_wll_QueryCondsExtToSoap(
-       struct soap                                                        *soap,
-       const edg_wll_QueryRec                            **in,
-       struct edgwll__QueryConditions            **out)
-{
-       int                                                             i;
-       struct edgwll__QueryConditions *qc;
-
-
-       assert(out);
-       if ( !(qc = soap_malloc(soap, sizeof(*qc))) ) return SOAP_FAULT;
-       memset(qc, 0, sizeof(*qc));
-       if ( !in ) goto ret;
-       while ( in[qc->__sizecondition] ) qc->__sizecondition++;
-       if ( !qc->__sizecondition ) goto ret;
-       qc->condition = soap_malloc(soap, sizeof(*(qc->condition))*qc->__sizecondition);
-       if ( !qc->condition ) return SOAP_FAULT;
-       for ( i = 0; in[i]; i++ )
-               if ( edg_wll_QueryCondsToSoap(soap, in[i], qc->condition+i) )
-                       return SOAP_FAULT;
-
-ret:
-       *out = qc;
-       return SOAP_OK;
-}
-
-int edg_wll_JobsQueryResToSoap(
-       struct soap                                                *soap,
-       const edg_wlc_JobId                                *jobs,
-       const edg_wll_JobStat                      *states,
-       struct edgwll2__QueryJobsResponse  *out)
-{
-       int                                                     i;
-
-
-       assert(out); assert(out->states); assert(out->jobs);
-       memset(out->jobs, 0, sizeof(*(out->jobs)));
-       memset(out->states, 0, sizeof(*(out->states)));
-
-       if ( jobs ) {
-               for ( i = 0; jobs[i]; i++ ) ;
-               out->jobs->jobs = soap_malloc(soap, sizeof(*(out->jobs->jobs))*i);
-               if ( !out->jobs->jobs ) return SOAP_FAULT;
-               out->jobs->__sizejobs = i;
-               for ( i = 0; jobs[i]; i++ ) {
-                       char       *s;
-                       if ( !(s = edg_wlc_JobIdUnparse(jobs[i])) ) return SOAP_FAULT;
-                       if ( !(out->jobs->jobs[i] = soap_strdup(soap, s)) ) return SOAP_FAULT;
-                       free(s);
-               }
-       }
-       if ( states ) {
-               for ( i = 0; states[i].state; i++ ) ;
-               out->states->states = soap_malloc(soap, sizeof(*(out->states->states))*i);
-               if ( !out->states->states ) return SOAP_FAULT;
-               out->states->__sizestates = i;
-
-               for ( i = 0; states[i].state; i++ )
-                       if ( edg_wll_StatusToSoap(soap, states+i, out->states->states+i) )
-                               return SOAP_FAULT;
-       }
-
-       return SOAP_OK;
-}
diff --git a/org.glite.lb.server/src/ws_typeref.h b/org.glite.lb.server/src/ws_typeref.h

deleted file mode 100644 (file)

index 44813c7..0000000
--- a/org.glite.lb.server/src/ws_typeref.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef __EDG_WORKLOAD_LOGGING_LBSERVER_WS_TYPEREF_H__
-#define __EDG_WORKLOAD_LOGGING_LBSERVER_WS_TYPEREF_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern void edg_wll_JobStatCodeToSoap(edg_wll_JobStatCode, enum edgwll__JobStatCode *);
-extern void edg_wll_SoapToJobStatCode(enum edgwll__JobStatCode, edg_wll_JobStatCode *);
-
-extern void edg_wll_StatusToSoap(struct soap *, edg_wll_JobStat const *, struct edgwll__JobStat *);
-extern void edg_wll_SoapToStatus(struct soap *, struct edgwll__JobStat const *, edg_wll_JobStat **);
-
-extern void edg_wll_SoapToJobStatFlags(const struct edgwll__JobStatFlags *, int *);
-extern int edg_wll_JobStatFlagsToSoap(struct soap *, const int, struct edgwll__JobStatFlags *);
-
-extern void edg_wll_SoapToAttr(const enum edgwll__QueryAttr, edg_wll_QueryAttr *);
-extern void edg_wll_AttrToSoap(const edg_wll_QueryAttr, enum edgwll__QueryAttr *);
-
-extern void edg_wll_SoapToQueryOp(
-                       const enum edgwll__QueryOp,
-                       edg_wll_QueryOp *);
-extern void edg_wll_QueryOpToSoap(
-                       const edg_wll_QueryOp,
-                       enum edgwll__QueryOp *);
-
-extern int edg_wll_SoapToQueryVal(
-                       const edg_wll_QueryAttr,
-                       const struct edgwll__QueryRecValue *,
-                       union edg_wll_QueryVal *);
-extern int edg_wll_QueryValToSoap(struct soap *,
-                       const edg_wll_QueryAttr,
-                       const union edg_wll_QueryVal *,
-                       struct edgwll__QueryRecValue *);
-
-extern int edg_wll_SoapToQueryRec(
-                       const enum edgwll__QueryAttr,
-                       const struct edgwll__QueryRec *,
-                       edg_wll_QueryRec *);
-extern int edg_wll_QueryRecToSoap(struct soap *,
-                       const edg_wll_QueryRec *,
-                       struct edgwll__QueryRec *);
-
-
-extern int edg_wll_SoapToQueryConds(
-                       const struct edgwll__QueryCondition *,
-                       edg_wll_QueryRec **);
-extern int edg_wll_QueryCondsToSoap(struct soap *,
-                       const edg_wll_QueryRec *,
-                       struct edgwll__QueryCondition **);
-
-extern int edg_wll_SoapToQueryCondsExt(
-                       const struct edgwll__QueryConditions *,
-                       edg_wll_QueryRec ***);
-extern int edg_wll_QueryCondsExtToSoap(struct soap *,
-                       const edg_wll_QueryRec **,
-                       struct edgwll__QueryConditions **);
-
-extern int edg_wll_JobsQueryResToSoap(struct soap *,
-                       edg_wlc_JobId *,
-                       edg_wll_JobStat *,
-                       struct edgwll2__QueryJobsResponse *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __EDG_WORKLOAD_LOGGING_LBSERVER_WS_TYPEREF_H__ */
diff --git a/org.glite.lb.server/test/oneJob.qry b/org.glite.lb.server/test/oneJob.qry

deleted file mode 100644 (file)

index d419ce8..0000000
--- a/org.glite.lb.server/test/oneJob.qry
+++ /dev/null
@@ -1,24 +0,0 @@
-SELECT e.event,j.userid,j.dg_jobid,e.code,e.prog,e.host,u.cert_subj,e.time_stamp,e.usec,e.level,e.arrived FROM events e,users u,jobs j WHERE e.jobid=j.jobid AND e.userid=u.userid AND e.code != 0 AND (j.jobid='WrCEKje9QTXFiSOZuPMLtw')
-0      294de3557d9d00b3d2d8a1e6aab028cf        https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw    17      UserInterface   lhun.ics.muni.cz        anonymous       2003-08-07 11:08:40     432100  8       2003-08-07 11:08:40
-1      294de3557d9d00b3d2d8a1e6aab028cf        https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw    2       NetworkServer   lhun.ics.muni.cz        anonymous       2003-08-07 11:09:05     664600  8       2003-08-07 11:09:05
-
-select name,value from short_fields where jobid = 'WrCEKje9QTXFiSOZuPMLtw' and event = 0
-JDL    x
-JOBTYPE        SIMPLE
-NS     NNNSSSS
-NSUBJOBS       0
-PARENT https://lhun.ics.muni.cz:4850/Qt7utj80miXexi7bkxyhnA
-SEQCODE        (nil)
-SRC_INSTANCE   (nil)
-
-select name,value from long_fields where jobid = 'WrCEKje9QTXFiSOZuPMLtw' and event = 0
-
-select name,value from short_fields where jobid = 'WrCEKje9QTXFiSOZuPMLtw' and event = 1
-FROM   UserInterface
-FROM_HOST      sending component hostname
-FROM_INSTANCE  sending component instance
-LOCAL_JOBID    new jobId (Condor  Globus ...)
-SEQCODE        UI=000002:NS=0000000001:WM=000000:BH=0000000000:JSS=000000:LM=000000:LRMS=000000:APP=000000
-SRC_INSTANCE   
-
-select name,value from long_fields where jobid = 'WrCEKje9QTXFiSOZuPMLtw' and event = 1
diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp

deleted file mode 100644 (file)

index bf356f4..0000000
--- a/org.glite.lb.server/test/test_query_events.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-#include <fstream>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-#include <glite/lb/consumer.h>
-#include <glite/lb/context-int.h>
-
-#include "lbs_db.h"
-#include "get_events.h"
-
-using namespace std;
-
-static const char *test_dir;
-
-class QueryEventsTest: public CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(QueryEventsTest);
-       CPPUNIT_TEST(oneJob);
-       CPPUNIT_TEST_SUITE_END();
-
-private:
-       edg_wll_Context ctx;
-       
-       ifstream        qry_file;
-
-       vector<pair<string,vector<string> > >   queries;
-
-public:
-       void oneJob();
-       int ExecStmt(const char *, edg_wll_Stmt *);
-
-       void setUp() {
-               edg_wll_InitContext(&ctx);
-               ctx->mysql = (void *) this; /* XXX */
-       }
-
-};
-
-void QueryEventsTest::oneJob()
-{
-       edg_wll_QueryRec        job[2];
-       const edg_wll_QueryRec  *jobs[2] = { job,NULL} ;
-       edg_wll_Event           *events;
-
-       job[0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-       job[0].op = EDG_WLL_QUERY_OP_EQUAL ;
-       edg_wlc_JobIdParse("https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw",
-               &job[0].value.j);
-       job[1].attr = EDG_WLL_QUERY_ATTR_UNDEF;
-       
-       string file(test_dir);
-       file += "/oneJob.qry";
-       qry_file.open(file.c_str());
-       
-       while (!qry_file.eof()) {
-               string  query,line;
-               vector<string>  rows;
-
-               getline(qry_file,query);
-               cout << "read: " << query <<endl;
-               rows.clear();
-
-               while (!qry_file.eof()) {
-                       getline(qry_file,line);
-                       if (line == "") break;
-       
-                       rows.push_back(line);
-               }
-               rows.push_back("END");
-               queries.push_back(pair<string,vector<string> >(query,rows));
-       }
-
-       qry_file.close();
-
-       CPPUNIT_ASSERT(!edg_wll_QueryEventsServer(ctx,1,jobs,NULL,&events));
-}
-
-int QueryEventsTest::ExecStmt(const char *qry, edg_wll_Stmt *stmt_out)
-{
-       vector<pair<string,vector<string> > >::iterator stmt = queries.begin();
-
-       for (; stmt != queries.end(); stmt++) {
-               const char      *q = stmt->first.c_str();
-
-               /* XXX: there some spaces at the end of qry */
-               if (!strncmp(q,qry,strlen(q))) break;
-       }
-
-       if (stmt == queries.end()) {
-               cerr << "query not found" << endl;
-               CPPUNIT_ASSERT(0);
-       }
-       vector<string>::iterator        *rows = new vector<string>::iterator(stmt->second.begin());
-
-       *stmt_out = (edg_wll_Stmt) rows;
-       return stmt->second.size()-1;
-}
-
-extern "C" {
-
-int edg_wll_ExecStmt(edg_wll_Context ctx,char *qry,edg_wll_Stmt *stmt)
-{
-       cout << "edg_wll_ExecStmt: " << qry << endl;
-
-       class QueryEventsTest *tst = (class QueryEventsTest *)(ctx->mysql);
-       return tst->ExecStmt(qry, stmt);
-}
-
-int edg_wll_FetchRow(edg_wll_Stmt stmt, char **cols)
-{
-       vector<string>::iterator        *rows = (vector<string>::iterator *) stmt;
-       char    *row,*p,i=0;
-
-       if (**rows == "END") return 0;
-       row = strdup((*rows)->c_str());
-       (*rows)++;
-       for (p = strtok(row,"\t"); p; p = strtok(NULL,"\t"))
-               cols[i++] = strdup(p);
-
-       return i;
-}
-
-void edg_wll_FreeStmt(edg_wll_Stmt *) {}
-
-int debug;
-
-int edg_wll_QueryColumns(edg_wll_Stmt stmt, char**cols) {}
-char *edg_wll_TimeToDB(long t) {}
-
-time_t edg_wll_DBToTime(char *c) {}
-edg_wll_ErrorCode  edg_wll_DBConnect(edg_wll_Context ctx, char*str) {}
-
-
-
-       
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(QueryEventsTest);
-
-int main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-
-       test_dir = ac >= 2 ? av[1] : "../test";
-
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.server/test/test_soap_conv.cpp b/org.glite.lb.server/test/test_soap_conv.cpp

deleted file mode 100644 (file)

index f57d744..0000000
--- a/org.glite.lb.server/test/test_soap_conv.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-#include <iostream>
-#include <stdsoap2.h>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-#include <glite/lb/consumer.h>
-
-#include "bk_ws_H.h"
-#include "ws_typeref.h"
-
-using namespace std;
-
-class SoapConvTest: public CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(SoapConvTest);
-       CPPUNIT_TEST(Conditions);
-       CPPUNIT_TEST(States);
-       CPPUNIT_TEST_SUITE_END();
-
-private:
-       struct soap                                                *soap;
-       edg_wll_QueryRec                                  **stdConds;
-       edg_wll_JobStat                                         stdStat;
-
-       int stdRecCmp(edg_wll_QueryRec &, edg_wll_QueryRec &);
-       int stdCondsCmp(edg_wll_QueryRec **, edg_wll_QueryRec **);
-       int soapRecCmp(struct edgwll__QueryRec &, struct edgwll__QueryRec &);
-       int soapCondsCmp(struct edgwll__QueryConditions &, struct edgwll__QueryConditions &);
-
-public:
-       void setUp();
-
-       void Conditions();
-       void States();
-};
-
-void SoapConvTest::setUp()
-{
-       soap = soap_new();
-
-       stdConds = (edg_wll_QueryRec **)calloc(17, sizeof(edg_wll_QueryRec *));
-
-       stdConds[0] = (edg_wll_QueryRec *)calloc(4, sizeof(edg_wll_QueryRec));
-       stdConds[0][0].attr = EDG_WLL_QUERY_ATTR_STATUS;
-       stdConds[0][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[0][0].value.i = EDG_WLL_JOB_DONE;
-       stdConds[0][1].attr = EDG_WLL_QUERY_ATTR_STATUS;
-       stdConds[0][1].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[0][1].value.i = EDG_WLL_JOB_RUNNING;
-       stdConds[0][2].attr = EDG_WLL_QUERY_ATTR_STATUS;
-       stdConds[0][2].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[0][2].value.i = EDG_WLL_JOB_CANCELLED;
-
-       stdConds[1] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[1][0].attr = EDG_WLL_QUERY_ATTR_OWNER;
-       stdConds[1][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[1][0].value.c = NULL;
-
-       stdConds[2] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[2][0].attr = EDG_WLL_QUERY_ATTR_JOBID;
-       stdConds[2][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       edg_wlc_JobIdCreate("my.server.org", 9000, &(stdConds[2][0].value.j));
-
-       stdConds[3] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[3][0].attr = EDG_WLL_QUERY_ATTR_LOCATION;
-       stdConds[3][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[3][0].value.c = strdup("my_location");
-
-       stdConds[4] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[4][0].attr = EDG_WLL_QUERY_ATTR_DESTINATION;
-       stdConds[4][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[4][0].value.c = strdup("my_destination");
-
-       stdConds[5] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[5][0].attr = EDG_WLL_QUERY_ATTR_DONECODE;
-       stdConds[5][0].op = EDG_WLL_QUERY_OP_GREATER;
-       stdConds[5][0].value.i = 1;
-
-       stdConds[6] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[6][0].attr = EDG_WLL_QUERY_ATTR_USERTAG;
-       stdConds[6][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[6][0].attr_id.tag = strdup("color");
-       stdConds[6][0].value.c = strdup("red");
-
-       stdConds[7] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[7][0].attr = EDG_WLL_QUERY_ATTR_TIME;
-       stdConds[7][0].op = EDG_WLL_QUERY_OP_WITHIN;
-       stdConds[7][0].value.t = (struct timeval){10, 1};
-       stdConds[7][0].value2.t = (struct timeval){20, 1};
-
-       stdConds[8] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[8][0].attr = EDG_WLL_QUERY_ATTR_LEVEL;
-       stdConds[8][0].op = EDG_WLL_QUERY_OP_WITHIN;
-       stdConds[8][0].value.i = 10;
-       stdConds[8][0].value2.i = 20;
-
-       stdConds[9] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[9][0].attr = EDG_WLL_QUERY_ATTR_HOST;
-       stdConds[9][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[9][0].value.c = strdup("any.host");
-
-       stdConds[10] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[10][0].attr = EDG_WLL_QUERY_ATTR_SOURCE;
-       stdConds[10][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[10][0].value.i = 2;
-
-       stdConds[11] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[11][0].attr = EDG_WLL_QUERY_ATTR_INSTANCE;
-       stdConds[11][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[11][0].value.c = strdup("any.instance");
-
-       stdConds[12] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[12][0].attr = EDG_WLL_QUERY_ATTR_EVENT_TYPE;
-       stdConds[12][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[12][0].value.i = 1;
-
-       stdConds[13] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[13][0].attr = EDG_WLL_QUERY_ATTR_RESUBMITTED;
-       stdConds[13][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[13][0].value.c = strdup("where");
-
-       stdConds[14] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[14][0].attr = EDG_WLL_QUERY_ATTR_PARENT;
-       stdConds[14][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       edg_wlc_JobIdCreate("my.server.org", 8000, &(stdConds[14][0].value.j));
-
-       stdConds[15] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[15][0].attr = EDG_WLL_QUERY_ATTR_EXITCODE;
-       stdConds[15][0].op = EDG_WLL_QUERY_OP_LESS;
-       stdConds[15][0].value.i = 255;
-/*
- * XXX: what is that for?
-       stdConds[13] = (edg_wll_QueryRec *)calloc(2, sizeof(edg_wll_QueryRec));
-       stdConds[13][0].attr = EDG_WLL_QUERY_ATTR_CHKPT_TAG;
-       stdConds[13][0].op = EDG_WLL_QUERY_OP_EQUAL;
-       stdConds[13][0].value.i = 1;
-*/
-}
-
-int SoapConvTest::stdCondsCmp(edg_wll_QueryRec **c1, edg_wll_QueryRec **c2)
-{
-       int             i, j;
-
-
-       if ( (c1 && !c2) || (!c1 && c2) ) return 1;
-       if ( c1 ) for ( i = 0; c1[i]; i++ ) {
-               if ( !c2[i] ) return 2;
-               for ( j = 0; c1[i][j].attr; j++ ) {
-                       if ( !c2[i][j].attr ) return 3;
-                       if ( stdRecCmp(c1[i][j], c2[i][j]) ) return 4;
-               }
-               if ( c2[i][j].attr ) return 3;
-       }
-       if ( c2[i] ) return 2;
-
-       return 0;
-}
-
-int SoapConvTest::stdRecCmp(edg_wll_QueryRec &qr1, edg_wll_QueryRec &qr2)
-{
-       if ( qr1.attr != qr2.attr ) return 1;
-       if ( qr1.op != qr2.op ) return 1;
-       switch ( qr1.attr) {
-       case EDG_WLL_QUERY_ATTR_USERTAG:
-               if ( strcmp(qr1.attr_id.tag, qr2.attr_id.tag) ) return 1;
-       case EDG_WLL_QUERY_ATTR_OWNER:
-       case EDG_WLL_QUERY_ATTR_LOCATION:
-       case EDG_WLL_QUERY_ATTR_DESTINATION:
-       case EDG_WLL_QUERY_ATTR_HOST:
-       case EDG_WLL_QUERY_ATTR_INSTANCE:
-               if ( (qr1.value.c && !qr2.value.c) || (!qr1.value.c && qr2.value.c) ) return 1;
-               if ( qr1.value.c && qr2.value.c && strcmp(qr1.value.c, qr2.value.c) ) return 1;
-               break;
-       case EDG_WLL_QUERY_ATTR_JOBID:
-       case EDG_WLL_QUERY_ATTR_PARENT: {
-               char *s1, *s2;
-               int     rv;
-
-               s1 = edg_wlc_JobIdUnparse(qr1.value.j);
-               s2 = edg_wlc_JobIdUnparse(qr2.value.j);
-               if ( !s1 || !s2 ) rv = 1;
-               else rv = strcmp(s1, s2);
-               free(s1); free(s2);
-               return rv;
-               }
-               break;
-       case EDG_WLL_QUERY_ATTR_STATUS:
-       case EDG_WLL_QUERY_ATTR_DONECODE:
-       case EDG_WLL_QUERY_ATTR_LEVEL:
-       case EDG_WLL_QUERY_ATTR_SOURCE:
-       case EDG_WLL_QUERY_ATTR_EVENT_TYPE:
-       case EDG_WLL_QUERY_ATTR_RESUBMITTED:
-       case EDG_WLL_QUERY_ATTR_EXITCODE:
-               if (   (qr1.value.i != qr2.value.i)
-                       || (qr1.op == EDG_WLL_QUERY_OP_WITHIN && qr1.value2.i != qr2.value2.i) )
-                       return 1;
-               break;
-       case EDG_WLL_QUERY_ATTR_TIME:
-               if (   (qr1.value.t.tv_sec != qr2.value.t.tv_sec
-                               || qr1.value.t.tv_usec != qr2.value.t.tv_usec)
-                       || (qr1.op == EDG_WLL_QUERY_OP_WITHIN
-                               && (qr1.value2.t.tv_sec != qr2.value2.t.tv_sec
-                                       || qr1.value2.t.tv_usec != qr2.value2.t.tv_usec)) )
-                       return 1;
-               break;
-       /*
-        *      XXX: what about EDG_WLL_QUERY_ATTR_CHKPT_TAG   ???
-        */
-       default:
-               return 1;
-       }
-
-       return 0;
-}
-
-int SoapConvTest::soapCondsCmp(struct edgwll__QueryConditions &qc1, struct edgwll__QueryConditions &qc2)
-{
-       int             i, j;
-
-
-       if ( qc1.__sizecondition != qc2.__sizecondition ) return 1;
-       if ( (qc1.condition && !qc2.condition) || (!qc1.condition && qc2.condition) )
-       for ( i = 0; i < qc1.__sizecondition; i++ ) {
-               if ( qc1.condition[i]->attr != qc2.condition[i]->attr ) return 2;
-               if ( qc1.condition[i]->__sizerecords != qc2.condition[i]->__sizerecords ) return 3;
-               for ( j = 0; j < qc1.condition[i]->__sizerecords; j++ )
-                       if ( soapRecCmp(*(qc1.condition[i]->records[j]),
-                                                       *(qc2.condition[i]->records[j])) ) return 4;
-       }
-
-       return 0;
-}
-
-int SoapConvTest::soapRecCmp(struct edgwll__QueryRec &qr1, struct edgwll__QueryRec &qr2)
-{
-       if ( qr1.op != qr2.op ) return 1;
-       if (   (qr1.attrid->tag && !qr2.attrid->tag)
-               || (!qr1.attrid->tag && qr2.attrid->tag)
-               || (qr1.attrid->tag && strcmp(qr1.attrid->tag, qr2.attrid->tag)) ) return 2;
-       if (   (qr1.attrid->state && !qr2.attrid->state)
-               || (!qr1.attrid->state && qr2.attrid->state)
-               || (qr1.attrid->state && (qr1.attrid->state != qr2.attrid->state)) ) return 3;
-
-       if (   (qr1.value1 && !qr2.value1)
-               || (!qr1.value1 && qr2.value1) ) return 3;
-       if ( qr1.value1 ) {
-               if (   (qr1.value1->i && !qr2.value1->i)
-                       || (!qr1.value1->i && qr2.value1->i)
-                       || (qr1.value1->i && qr1.value1->i != qr2.value1->i) )
-                       return 4;
-               if (   (qr1.value1->c && !qr2.value1->c)
-                       || (!qr1.value1->c && qr2.value1->c)
-                       || (qr1.value1->c && strcmp(qr1.value1->c,qr2.value1->c)) )
-                       return 4;
-               if (   (qr1.value1->t && !qr2.value1->t)
-                       || (!qr1.value1->t && qr2.value1->t)
-                       || (qr1.value1->t && memcmp(qr1.value1->t,qr2.value1->t,sizeof(*qr2.value1->t))) )
-                       return 4;
-       }
-
-       if (   (qr1.value2 && !qr2.value2)
-               || (!qr1.value2 && qr2.value2) ) return 3;
-       if ( qr1.value2 ) {
-               if (   (qr1.value2->i && !qr2.value2->i)
-                       || (!qr1.value2->i && qr2.value2->i)
-                       || (qr1.value2->i && qr1.value2->i != qr2.value2->i) )
-                       return 4;
-               if (   (qr1.value2->c && !qr2.value2->c)
-                       || (!qr1.value2->c && qr2.value2->c)
-                       || (qr1.value2->c && strcmp(qr1.value2->c,qr2.value2->c)) )
-                       return 4;
-               if (   (qr1.value2->t && !qr2.value2->t)
-                       || (!qr1.value2->t && qr2.value2->t)
-                       || (qr1.value2->t && memcmp(qr1.value2->t,qr2.value2->t,sizeof(*qr2.value2->t))) )
-                       return 4;
-       }
-
-
-       return 0;
-}
-
-void SoapConvTest::Conditions()
-{
-       struct edgwll__QueryConditions     *soapConds, *soapConds2;
-       edg_wll_QueryRec                                  **stdConds2;
-       int                                                                     ret;
-
-       ret = edg_wll_QueryCondsExtToSoap(soap, (const edg_wll_QueryRec**)stdConds, &soapConds);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_QueryCondsExtToSoap()", ret == SOAP_OK);
-       ret = edg_wll_SoapToQueryCondsExt(soapConds, &stdConds2);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_SoapToQueryCondsExt()", !ret);
-
-       CPPUNIT_ASSERT_MESSAGE("Converted std results differs", !stdCondsCmp(stdConds, stdConds2));
-
-       ret = edg_wll_QueryCondsExtToSoap(soap, (const edg_wll_QueryRec**)stdConds2, &soapConds2);
-       CPPUNIT_ASSERT_MESSAGE("edg_wll_QueryCondsExtToSoap()", ret == SOAP_OK);
-
-       CPPUNIT_ASSERT_MESSAGE("Converted soap results differs", !soapCondsCmp(*soapConds, *soapConds2));
-}
-
-void SoapConvTest::States()
-{
-       struct edgwll__JobStat     *soapStat;
-       edg_wll_JobStat                         stdStat2;
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(SoapConvTest);
-
-int main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb.server/test/test_xml.cpp.T b/org.glite.lb.server/test/test_xml.cpp.T

deleted file mode 100644 (file)

index 11875fc..0000000
--- a/org.glite.lb.server/test/test_xml.cpp.T
+++ /dev/null
@@ -1,212 +0,0 @@
-#include <iostream>
-
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/CompilerOutputter.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/ui/text/TestRunner.h>
-
-
-#include <glite/lb/producer.h>
-#include "lb_xml_parse.h"
-#include <glite/lb/xml_parse.h>
-
-class XMLParseTest: public  CppUnit::TestFixture
-{
-       CPPUNIT_TEST_SUITE(XMLParseTest);
-       CPPUNIT_TEST(protoEventTest);
-       CPPUNIT_TEST(protoStatusTest);
-       CPPUNIT_TEST_SUITE_END();
-
-public:
-       void protoEventTest();
-       void protoStatusTest();
-
-
-};
-
-static char * compare_events(const edg_wll_Event *e1, const edg_wll_Event *e2)
-{
-       if (e1->any.type != e2->any.type) return "type";
-@@@{
-       selectType $event '_common_';
-       for ($event->getFieldsOrdered) {
-               my $f = selectField $event $_;
-               my $fn = getName $f;
-               my $ft = $f->{type};
-
-               my $a = "e1->any.$fn";
-               my $b = "e2->any.$fn";
-
-               gen "\tif (!(".eval($main::compare{C}->{$ft}).")) return \"$fn\";\n";
-       }
-       
-       gen "\tswitch(e1->any.type) {\n";
-       for my $t (sort { $event->{order}->{$a} <=> $event->{order}->{$b} }
-               $event->getTypes)
-       {
-               my $tu = uc $t;
-               my $tl = lcfirst $t;
-
-               selectType $event $t;
-               gen "\t\tcase EDG_WLL_EVENT\_$tu :\n";
-               for ($event->getFieldsOrdered) {
-                       my $f = selectField $event $_;
-                       my $fn = $f->{name};
-                       my $ft = $f->{type};
-
-                       my $a = "e1->$tl.$fn";
-                       my $b = "e2->$tl.$fn";
-
-                       gen "\t\t\tif (!(".eval($main::compare{C}->{$ft}).")) return \"$fn\";\n";
-               }
-               gen "\t\tbreak;\n";
-       }
-@@@}
-               default: return "default";
-       } /* switch */
-       return NULL;
-}
-
-static char * compare_states(const edg_wll_JobStat s1, const edg_wll_JobStat s2)
-{
-@@@{
-       selectType $status '_common_';
-        for (getFieldsOrdered $status) {
-                my $f = selectField $status $_;
-               my $fn = getName $f;
-               my $ft = $f->{type};
-
-               my $a = "s1.$fn";
-               my $b = "s2.$fn";
-
-                if ($ft eq 'intlist') {
-                        gen "\tif ( (s1.$_ != NULL) && (s2.$_ == NULL) || (s1.$_ == NULL) && (s2.$_ != NULL) )  return \"$fn\";\n";
-                }
-                elsif ($ft eq 'strlist') {
-                }
-                elsif ($ft eq 'taglist') {
-                }
-                elsif ($ft eq 'stslist') {
-                }
-               else {
-                       gen "\tif (!(".eval($main::compare{C}->{$ft}).")) return \"$fn\";\n";
-               }
-        }
-@@@}
-       return NULL;
-}
-
-void XMLParseTest::protoEventTest()
-{
-       edg_wll_Context ctx;
-       edg_wll_Event   *e1, *e2;
-       char            *message, *et, *ed;
-
-       edg_wll_InitContext(&ctx);
-       e1 = edg_wll_InitEvent(EDG_WLL_EVENT_REGJOB);
-       e1->any.type = EDG_WLL_EVENT_REGJOB;
-
-       e1->regJob.jdl = strdup("very long job = \"blabla\" \\\\ \n hugh\t;");
-       e1->regJob.ns = strdup("ns address");
-       e1->regJob.jobtype = EDG_WLL_REGJOB_SIMPLE;
-       e1->regJob.seed = strdup("1234");
-
-       gettimeofday(&e1->any.timestamp,NULL);
-       
-       e1->any.host = strdup("some.host");
-       e1->any.level = 7;
-       e1->any.priority = 0;
-       edg_wlc_JobIdParse("https://some.host:1234/x67qr549qc",&e1->any.jobId);
-       e1->any.seqcode = EDG_WLL_SEQ_BIGHELPER_INITIAL;
-       e1->any.user = strdup("/O=Grid/CN=This User");
-       e1->any.source = EDG_WLL_SOURCE_USER_INTERFACE;
-       e1->any.src_instance = strdup("UI");
-
-       if (edg_wll_QueryEventsToXML(ctx, e1, &message)) {
-               edg_wll_Error(ctx,&et,&ed);
-               CPPUNIT_ASSERT_MESSAGE(std::string("QueryEventsToXML():") + et + " " + ed, 0);
-       }
-       
-       CPPUNIT_ASSERT_MESSAGE("message: ", message);
-
-       if (edg_wll_ParseQueryEvents(ctx, message, &e2)) {
-               edg_wll_Error(ctx,&et,&ed);
-               CPPUNIT_ASSERT_MESSAGE(std::string("ParseQueryEvents():") + et + " " + ed, 0);
-       }
-
-       if ((et = compare_events(e1,e2))) {
-               CPPUNIT_ASSERT_MESSAGE(std::string("compare_events():") + et, 0);
-       }
-}
-
-void XMLParseTest::protoStatusTest()
-{      
-       edg_wll_Context ctx;
-       edg_wll_JobStat s1, s2;
-       char            *message, *et, *ed;
-       const struct timeval some_timeval = {14,12};
-
-
-       edg_wll_InitContext(&ctx);
-       edg_wll_InitStatus(&s1);
-
-       s1.state = EDG_WLL_JOB_SUBMITTED;
-       edg_wlc_JobIdParse("https://some.host:1234/x67qr549qc",&s1.jobId);
-       s1.owner = strdup("/O=Grid/CN=This User");
-       s1.jobtype = EDG_WLL_STAT_SIMPLE;
-       s1.seed = strdup("4321");
-       s1.condorId = strdup("condorId");
-       s1.globusId = strdup("globusId");
-       s1.localId = strdup("localId");
-       s1.jdl = strdup("jdl");
-       s1.matched_jdl = strdup("matched_jdl");
-       s1.destination = strdup("destination");
-       s1.condor_jdl = strdup("condor_jdl");
-       s1.rsl = strdup("rsl");
-       s1.reason = strdup("reason");
-       s1.location = strdup("location");
-       s1.ce_node = strdup("ce_node");
-       s1.network_server = strdup("network_server");
-       s1.subjob_failed = 1;
-       s1.done_code = EDG_WLL_STAT_FAILED;
-       s1.exit_code = 123;
-       s1.resubmitted = 1;
-       s1.cancelling = 1;
-       s1.cancelReason = strdup("cancelReason");
-       s1.cpuTime = 10;
-       s1.stateEnterTime = some_timeval;
-       s1.lastUpdateTime = some_timeval;
-       s1.expectUpdate = 20;
-       s1.expectFrom = strdup("expectFrom");
-       s1.acl = strdup("acl");
-
-       if (edg_wll_JobStatusToXML(ctx, s1, &message)) {
-               edg_wll_Error(ctx,&et,&ed);
-               CPPUNIT_ASSERT_MESSAGE(std::string("QueryEventsToXML():") + et + " " + ed, 0);
-       }
-       
-       CPPUNIT_ASSERT_MESSAGE("message: ", message);
-
-       if (edg_wll_ParseJobStat(ctx, message, (long) strlen(message), &s2)) {
-               edg_wll_Error(ctx,&et,&ed);
-               CPPUNIT_ASSERT_MESSAGE(std::string("ParseJobStat():") + et + " " + ed, 0);
-       }
-
-       if ((et = compare_states(s1,s2))) {
-               CPPUNIT_ASSERT_MESSAGE(std::string("compare_states():") + et, 0);
-       }
-
-
-
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(XMLParseTest);
-
-int main (int ac,const char *av[])
-{
-       CppUnit::Test *suite = CppUnit::TestFactoryRegistry::getRegistry().makeTest();
-       CppUnit::TextUi::TestRunner runner;
-       
-       runner.addTest(suite);
-       return runner.run() ? 0 : 1;
-}
diff --git a/org.glite.lb/.cvsignore b/org.glite.lb/.cvsignore

deleted file mode 100644 (file)

index 1df717b..0000000
--- a/org.glite.lb/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.lb/LICENSE b/org.glite.lb/LICENSE

deleted file mode 100644 (file)

index 259a91f..0000000
--- a/org.glite.lb/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware\r
-================================\r
-\r
-Copyright (c) 2004 on behalf of the EU EGEE Project: \r
-The European Organization for Nuclear Research (CERN), \r
-Istituto Nazionale di Fisica Nucleare (INFN), Italy\r
-Datamat Spa, Italy\r
-Centre National de la Recherche Scientifique (CNRS), France\r
-CS Systeme d'Information (CSSI), France\r
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden\r
-Universiteit van Amsterdam (UvA), Netherlands\r
-University of Helsinki (UH.HIP), Finlan\r
-University of Bergen (UiB), Norway\r
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom\r
-\r
-Redistribution and use in source and binary forms, with or without\r
-modification, are permitted provided that the following conditions are\r
-met: \r
-\r
-1. Redistributions of source code must retain the above copyright\r
-notice, this list of conditions and the following disclaimer.\r
-\r
-2. Redistributions in binary form must reproduce the above copyright\r
-notice, this list of conditions and the following disclaimer in the\r
-documentation and/or other materials provided with the distribution.\r
-\r
-3. The end-user documentation included with the redistribution, if\r
-any, must include the following acknowledgment: "This product includes\r
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."\r
-Alternatively, this acknowledgment may appear in the software itself, if\r
-and wherever such third-party acknowledgments normally appear.\r
-\r
-4. The names EGEE and the EU EGEE Project must not be\r
-used to endorse or promote products derived from this software without\r
-prior written permission. For written permission, please contact\r
-<email address>.\r
-\r
-5. You are under no obligation whatsoever to provide anyone with any\r
-bug fixes, patches, or upgrades to the features, functionality or\r
-performance of the Software ("Enhancements") that you may develop over\r
-time; however, if you choose to provide your Enhancements to The EU\r
-EGEE Project, or if you choose to otherwise publish or distribute your\r
-Enhancements, in source code form without contemporaneously requiring\r
-end users of The EU EGEE Proejct to enter into a separate written license\r
-agreement for such Enhancements, then you hereby grant The EU EGEE Project\r
-a non-exclusive, royalty-free perpetual license to install, use, copy,\r
-modify, prepare derivative works, incorporate into the EGEE Middleware\r
-or any other computer software, distribute, and sublicense your\r
-Enhancements or derivative works thereof, in binary and source code\r
-form (if any), whether developed by The EU EGEE Project or third parties.\r
-\r
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\r
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\r
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE\r
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE\r
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\r
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\r
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\r
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\r
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE\r
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN\r
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\r
-\r
-This software consists of voluntary contributions made by many\r
-individuals on behalf of the EU EGEE Prject. For more information on The\r
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on\r
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/\r
-\r
-\r
diff --git a/org.glite.lb/build.xml b/org.glite.lb/build.xml

deleted file mode 100755 (executable)

index 81b92de..0000000
--- a/org.glite.lb/build.xml
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite Middleware Loggin and Bookkeeping Subsystem
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.18  2004/09/29 13:35:39  flammer
-       Only update of line formatting.
-       
-       Revision 1.17  2004/09/09 21:05:29  dimeglio
-       Moved tag target to targets-common
-       
-       Revision 1.16  2004/08/27 03:03:12  dimeglio
-       Preserve original timestamp when copying file and overwrite when new
-       
-       Revision 1.15  2004/08/27 02:46:52  dimeglio
-       Added logic to create the tagged dependencies properties file
-       
-       Revision 1.14  2004/08/26 23:48:26  dimeglio
-       Added generation of cruisecontrol config file entry
-       
-       Revision 1.13  2004/08/09 04:56:14  dimeglio
-       Replaced rtag with tag
-       
-       Revision 1.12  2004/08/09 04:36:44  dimeglio
-       Fixed inheritance of do.cvs.tag property
-       
-       Revision 1.11  2004/08/09 03:06:11  dimeglio
-       Fixed inheritance of failonerror property
-       
-       Revision 1.10  2004/08/09 02:35:35  dimeglio
-       Set default value for failonerror
-       
-       Revision 1.9  2004/08/08 19:07:17  dimeglio
-       Added small.memory type of build
-       
-       Revision 1.8  2004/07/29 10:47:46  dimeglio
-       Added server and logger
-       
-       Revision 1.7  2004/07/29 07:39:57  dimeglio
-       Removed local envinfo and envcheck target (must use common ones)
-       
-       Revision 1.6  2004/07/16 16:25:43  flammer
-       Added tags for automated adding of components.
-       
-       Revision 1.5  2004/07/06 17:43:33  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.4  2004/06/23 00:24:03  dimeglio
-       Added common and client modules
-       
-       Revision 1.3  2004/06/22 18:24:35  dimeglio
-       Added client interface module
-       
-       Revision 1.2  2004/06/18 23:05:12  dimeglio
-       Added/upgraded default build scripts
-       
--->
-
-<project name="lb" default="dist">
-
-       <description>
-               Ant build file to build the GLite Logging and Bookkeping Subsystem
-       </description>
-               
-       <!-- =========================================
-                Builds the GLite LB subsystem
-            ========================================= -->
-
-       <!-- Import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- Import subsystem build properties, 
-                             subsystem properties & 
-                             subsystem common properties -->
-       <import file="./project/properties.xml" />
-
-       <!-- Import global build properties and global properties -->
-       <import file="${global.properties.file}" />
-                               
-       <!-- =========================================
-                Load dependencies properties files (order is important) 
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${subsystem.dependencies.file}"/>
-       <property file="${global.dependencies.file}"/>  
-
-       <!-- =========================================
-                 Load configure options
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-                       
-       <!-- =========================================
-                Import global task definitions
-            ========================================= -->
-       <import file="${global.taskdefs.file}" />
-       
-       <!-- =========================================
-            Import global compiler definitions
-            ========================================= -->
-       <import file="${global.compilerdefs.file}" />
-               
-       <!-- =========================================
-                Import targets 
-            ========================================= -->
-       <import file="${global.targets-common.file}"/>
-       
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-                       
-       <!-- ===============================================
-                 Public common targets
-            =============================================== -->
-
-       <target name="localinit" depends="envcheck">
-
-               <echo> Preparing directories ... </echo>
-               
-               <mkdir dir="${stage.bin.dir}" />
-               <mkdir dir="${stage.lib.dir}" />
-               <mkdir dir="${stage.java.dir}" />
-               <mkdir dir="${stage.inc.dir}" />
-               <mkdir dir="${stage.int.dir}" />
-
-               <mkdir dir="${dist.dir}" />
-
-       </target>
-
-       <target name="init" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="init"/>
-               </antcall>
-       </target>
-
-       <target name="checkstyle" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="checkstyle"/>
-               </antcall>
-       </target>
-
-       <target name="compile" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="compile"/>
-               </antcall>
-       </target>
-
-       <target name="compiletest" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="compiletest"/>
-               </antcall>
-       </target>
-
-       <target name="unittest" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="unittest"/>
-               </antcall>
-       </target>
-
-       <target name="unitcoverage" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="unitcoverage"/>
-               </antcall>
-       </target>
-
-       <target name="stage" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="stage"/>
-               </antcall>
-       </target>
-
-       <target name="dist" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="dist"/>
-               </antcall>
-       </target>
-
-       <target name="install" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="install"/>
-               </antcall>
-       </target>
-
-       <target name="doc" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="doc"/>
-               </antcall>
-       </target>
-
-       <target name="all" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="all"/>
-               </antcall>
-       </target>
-
-       <target name="clean">
-
-               <property name="offline.repository" value="true" />
-               <antcall target="buildmodules">
-                       <param name="target" value="clean"/>
-               </antcall>
-
-               <delete dir="${module.bin.dir}" />
-               <delete dir="${module.lib.dir}" />
-               <delete dir="${module.autosrc.dir}" />
-               <delete dir="${module.autodoc.dir}" />
-               <delete dir="${module.test.reports.dir}" />
-
-       </target>
-
-       <target name="cleanAll" depends="localinit">
-               <antcall target="buildmodules">
-                       <param name="target" value="cleanAll"/>
-               </antcall>
-       </target>
-
-       <!-- ===============================================
-                Private targets
-            =============================================== -->
-
-       <!-- ===============================================
-                Modules proxy targets
-            =============================================== -->
-
-       <!-- component targets definitions tag = do not remove = -->
-
-       <target name="client-interface" unless="setenvonly">
-               <if>
-                       <isset property="small.memory" />
-                       <then>
-                               <exec dir="${lb.subsystem.dir}.client-interface" executable="${env.ANT_HOME}/bin/ant" failonerror="${failonerror}">
-                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
-                               </exec>
-                       </then>
-                       <else>
-                               <ant dir="${lb.subsystem.dir}.client-interface"
-                                    target="${target}"
-                                    inheritall="false" />
-                       </else>
-               </if>
-       </target>
-
-       <target name="server-bones" unless="setenvonly">
-               <if>
-                       <isset property="small.memory" />
-                       <then>
-                               <exec dir="${lb.subsystem.dir}.server-bones" executable="${env.ANT_HOME}/bin/ant" failonerror="${failonerror}">
-                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
-                               </exec>
-                       </then>
-                       <else>
-                               <ant dir="${lb.subsystem.dir}.server-bones"
-                                    target="${target}"
-                                    inheritall="false" />
-                       </else>
-               </if>
-       </target>
-
-       <target name="common" unless="setenvonly" depends="globus,expat,ares,client-interface">
-               <if>
-                       <isset property="small.memory" />
-                       <then>
-                               <exec dir="${lb.subsystem.dir}.common" executable="${env.ANT_HOME}/bin/ant" failonerror="${failonerror}">
-                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
-                               </exec>
-                       </then>
-                       <else>
-                               <ant dir="${lb.subsystem.dir}.common"
-                                    target="${target}"
-                                    inheritall="false" />
-                       </else>
-               </if>
-       </target>
-
-       <target name="client" unless="setenvonly" depends="globus,expat,ares,client-interface,common">
-               <if>
-                       <isset property="small.memory" />
-                       <then>
-                               <exec dir="${lb.subsystem.dir}.client" executable="${env.ANT_HOME}/bin/ant" failonerror="${failonerror}">
-                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
-                               </exec>
-                       </then>
-                       <else>
-                               <ant dir="${lb.subsystem.dir}.client"
-                                    target="${target}"
-                                    inheritall="false" />
-                       </else>
-               </if>
-       </target>
-
-       <target name="server" unless="setenvonly" depends="globus,expat,ares,mysql,gsoap,client-interface,common">
-               <if>
-                       <isset property="small.memory" />
-                       <then>
-                               <exec dir="${lb.subsystem.dir}.server" executable="${env.ANT_HOME}/bin/ant" failonerror="${failonerror}">
-                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
-                               </exec>
-                       </then>
-                       <else>
-                               <ant dir="${lb.subsystem.dir}.server"
-                                    target="${target}"
-                                    inheritall="false" />
-                       </else>
-               </if>
-       </target>
-
-       <target name="logger" unless="setenvonly" depends="globus,expat,ares,client-interface,common">
-               <if>
-                       <isset property="small.memory" />
-                       <then>
-                               <exec dir="${lb.subsystem.dir}.logger" executable="${env.ANT_HOME}/bin/ant" failonerror="${failonerror}">
-                                       <arg line="${target} -Dsmall.memory=true -Dbootstrap=${bootstrap} -Dfailonerror=${failonerror} -Ddo.cvs.tag=${do.cvs.tag}"/>
-                               </exec>
-                       </then>
-                       <else>
-                               <ant dir="${lb.subsystem.dir}.logger"
-                                    target="${target}"
-                                    inheritall="false" />
-                       </else>
-               </if>
-       </target>
-
-       <!-- Main proxy -->
-       <target name="buildmodules" depends="client-interface,
-                                            client,
-                                            server-bones,
-                                            common,
-                                            server,
-                                            logger">
-               <echo append="true" file="${global.project.dir}/cruisecontrol-stub.xml">
-       &lt;project name="${subsystem.name}" type="post-subsystem" packageName="${global.prefix}-${subsystem.prefix}"/&gt;
-               </echo>
-       </target>
-
-</project>
diff --git a/org.glite.lb/project/MultiStruct.pm b/org.glite.lb/project/MultiStruct.pm

deleted file mode 100644 (file)

index 9cd847c..0000000
--- a/org.glite.lb/project/MultiStruct.pm
+++ /dev/null
@@ -1,191 +0,0 @@
-package MultiStruct;
-
-use StructField;
-
-sub new {
-       shift;
-       my $self = {};
-       $self->{comments} = {}; # typ->comment
-       $self->{fields} = {};   # typ->{ name->StructField, ... }
-       $self->{order} = {};
-
-       bless $self;
-}
-
-sub selectType {
-       my $self = shift;
-       my $type = shift;
-       $self->{type} = $type;
-       1;
-}
-
-sub addType {
-       my $self = shift;
-       my $type = shift;
-       my $comment = shift;
-       $self->selectType($type);
-       $self->{comments}->{$type} = $comment;
-       $self->{fields}->{$type} = {};
-       1;
-}
-
-sub selectField {
-       my $self = shift;
-       $self->{field} = shift;
-       $self->getField;
-}
-
-sub addField {
-       my $self = shift;
-       my $field = shift;
-       
-       die "unselected type" unless $self->{type};
-       $self->{fields}->{$self->{type}}->{$field->{name}} = $field;
-       $self->selectField($field->{name});
-       1;
-}
-
-sub getField {
-       my $self = shift;
-       my $f = $self->{fields}->{$self->{type}}->{$self->{field}};
-       return $f ? $f : $self->{fields}->{_common_}->{$self->{field}};
-}
-
-sub load {
-       my $self = shift;
-       my $fh = shift;
-       local $_;
-
-       while ($_ = <$fh>) {
-
-               chomp;
-               s/#.*$//;
-               next if /^\s*$/;
-
-               if (/^\@type\s+(\S+)\s*(.*$)$/) {
-                       $self->addType($1,$2);
-                       $self->{order}->{$1} = $.;
-                       next;
-               }
-
-               s/^\s*//;
-               my ($ftype,$fname,$comment) = split /\s+/,$_,3;
-               if ($ftype eq '_code_') {
-                       my $f = $self->getField();
-                       addCode $f $fname,$comment;
-               }
-               elsif ($ftype eq '_alias_') {
-                       my $f = $self->getField();
-                       addAlias $f $fname,$comment;
-               }
-               elsif ($ftype eq '_special_') {
-                       my $f = $self->getField();
-                       addSpecial $f $fname;
-               }
-               elsif ($ftype eq '_null_') {
-                       my $f = $self->getField();
-                       setNull $f $fname;
-               }
-               elsif ($ftype eq '_optional_') {
-                       my $f = $self->getField();
-                       $f->{optional} = 1;
-               }
-               elsif ($ftype eq '_index_') {
-                       my $f = $self->getField();
-                       $f->{index} = 1;
-               }
-               else {
-                       my $f = new StructField $fname,$ftype,$comment,$.;
-                       $self->addField($f);
-               }
-       }
-}
-
-sub getTypes {
-       my $self = shift;
-       my @out;
-       local $_;
-
-       for (keys %{$self->{fields}}) {
-               push @out,$_ unless $_ eq '_common_';
-       }
-       @out;
-}
-
-sub getTypesOrdered {
-       my $self = shift;
-       my @names = getTypes $self;
-
-       sort {
-               my $oa = $self->{order}->{$a};
-               my $ob = $self->{order}->{$b};
-               $oa <=> $ob;
-       } @names;
-}
-
-sub getTypeComment {
-       my $self = shift;
-       my $type = shift || $self->{type};
-       $self->{comments}->{$type};
-}
-
-sub getFieldComment {
-       my $self = shift;
-       my $fname = shift;
-       $self->{fields}->{$self->{type}}->{$fname}->{comment};
-}
-
-sub getFields {
-       my $self = shift;
-       keys %{$self->{fields}->{$self->{type}}};
-}
-
-sub getFieldsOrdered {
-       my $self = shift;
-       my @names = $self->getFields;
-       sort {
-               my $oa = $self->selectField($a)->{order};
-               my $ob = $self->selectField($b)->{order};
-               $oa <=> $ob;
-       } @names;
-}
-
-sub getFieldOccurence {
-       my $self = shift;
-       my $fname = shift;
-       my @out;
-       local $_;
-
-       for (keys %{$self->{fields}}) {
-               push @out,$_ if $self->{fields}->{$_}->{$fname};
-       }
-       @out;
-}
-
-sub getAllFields {
-       my $self = shift;
-       my %out;
-       local $_;
-
-       for my $t (values %{$self->{fields}}) {
-               $out{$_->{name}} = 1 for (values %$t);
-       }
-       keys %out;
-}
-
-sub getAllFieldsOrdered {
-       my $self = shift;
-       my @names = getAllFields $self;
-
-       sort {
-               my @occ = $self->getFieldOccurence($a);
-               $self->selectType($occ[0]);
-               my $oa = $self->selectField($a)->{order};
-               @occ = $self->getFieldOccurence($b);
-               $self->selectType($occ[0]);
-               my $ob = $self->selectField($b)->{order};
-               $oa <=> $ob;
-       } @names;
-}
-
-1;
diff --git a/org.glite.lb/project/StructField.pm b/org.glite.lb/project/StructField.pm

deleted file mode 100644 (file)

index 95d33b8..0000000
--- a/org.glite.lb/project/StructField.pm
+++ /dev/null
@@ -1,116 +0,0 @@
-package StructField;
-
-$lang = 'C';
-1;
-
-sub new {
-       shift;
-       my $self = {};
-       $self->{name} = shift;
-       $self->{type} = shift;
-       $self->{comment} = shift;
-       $self->{order} = shift;
-       $self->{null} = $main::DefaultNullValue{$self->{type}};
-       bless $self;
-}
-
-sub addCode {
-       my $self = shift;
-       my $code = shift;
-       my $comment = shift;
-       push @{$self->{codes}},{name=>$code,comment=>$comment};
-       1;
-}
-
-sub addSpecial {
-       my $self = shift;
-       my $special = shift;
-       $self->{special} = $special;
-       1;
-}
-
-sub addAlias {
-       my $self = shift;
-       my $name = shift;
-       my $lang = shift;
-       $self->{aliases}->{$lang} = $name;
-       1;
-}
-
-sub hasAlias {
-       my $self = shift;
-       my $lang = shift;
-       return $self->{aliases}->{$lang} ? 1 : 0;
-}
-
-sub getName {
-       my $self = shift;
-       my $lang = shift || $lang;
-       $self->{aliases}->{$lang} || $self->{name};
-#      return $self->{aliases}->{$lang} ? $self->{aliases}->{$lang} : $self->{name};
-}
-
-sub getComment {
-       my $self = shift;
-       $self->{comment};
-}
-
-sub getDefaultNullValue {
-       my $self = shift;
-       $self->{null};
-}
-
-sub toString {
-       my $self = shift;
-       my $src = shift;
-       my $dst = shift;
-
-       eval $main::toString{$lang}->{$self->{type}};
-}
-
-sub fromString {
-       my $self = shift;
-       my $src = shift;
-       my $dst = shift;
-
-       eval $main::fromString{$lang}->{$self->{type}};
-}
-
-sub isNULL {
-       my $self = shift;
-       my $a = shift;
-       my $b = $self->{null};
-
-       eval $main::compare{$lang}->{$self->{type}};
-}
-
-sub isnotNULL {
-       my $self = shift;
-       my $src = shift;
-
-       '!('.$self->isNULL($src).')';
-}
-
-sub compare {
-       my $self = shift;
-       my $a = shift;
-       my $b = shift;
-       eval $main::compare{$lang}->{$self->{type}};
-}
-
-sub toFormatString {
-       my $self = shift;
-
-       eval $main::toFormatString{$lang}->{$self->{type}};
-}
-
-sub setNull {
-       my $self = shift;
-       $self->{null} = shift;
-}
-
-sub getType {
-       my $self = shift;
-
-       eval $main::types{$lang}->{$self->{type}};
-}
diff --git a/org.glite.lb/project/at3 b/org.glite.lb/project/at3

deleted file mode 100755 (executable)

index 8ff52ec..0000000
--- a/org.glite.lb/project/at3
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl -w
-
-use File::Basename;
-my $dir;
-BEGIN{
-       $dir = dirname $0;
-}
-
-my $lines = $ENV{AT3_LINES};
-
-use lib $dir;
-use MultiStruct;
-require 'types.T';
-
-my $eventsn;
-for (@INC) { 
-       if (-f "$_/events.T") {
-               $eventsn="$_/events.T";
-               last;
-       }
-}
-
-my $statusn;
-for (@INC) {
-       if (-f "$_/status.T") {
-               $statusn = "$_/status.T";
-               last;
-       }
-}
-
-my $indent = '';
-
-my $event = new MultiStruct;
-my $status = new MultiStruct;
-
-sub gen {
-       local $_ = shift;
-
-       s/^\n!//;
-       s/\n!/\n/g;
-       print $_;
-}
-
-
-open EVENTS,$eventsn or die "$eventsn: $!\n";
-$event->load(\*EVENTS);
-close EVENTS;
-
-open STATUS,$statusn or die "$statusn: $!\n";
-$status->load(\*STATUS);
-close STATUS;
-
-my $code;
-my $startcode;
-while (<>) {
-       chomp;
-       if (/^\@\@\@LANG: (\S+)$/) {
-               $StructField::lang = $1;
-               next;
-       }
-
-       if ($code) {
-               if (/^\@\@\@}$/) {
-                       $code .= "1;\n";
-                       print "#line $startcode \"$ARGV\"\n/* begin */\n" if $lines;
-                       eval $code or warn "eval: $@ at $ARGV:$.\n";
-                       my $nxtline = $.+1;
-                       print "/* end */\n#line $nxtline \"$ARGV\"\n" if $lines;
-                       undef $code;
-               }
-               else { $code .= $_."\n"; }
-       }
-       else {
-               if (/^\@\@\@{$/) {
-                       $startcode = $.;
-                       $code = "\n";
-               }
-               elsif (/^\@\@\@AUTO$/) {
-                       print qq{
-  !! Automatically generated file
-  !! Do not edit, your changes will be discarded upon build
-  !! Change the corresponding template file $ARGV
-
-};
-                       print "#line $. \"$ARGV\"\n" if $lines;
-               }
-               else {
-                       print "$_\n";
-               }
-       }
-}
-
-# print $event_common{prog}->copy('bla','hu');
diff --git a/org.glite.lb/project/build.properties b/org.glite.lb/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.lb/project/dependencies.properties b/org.glite.lb/project/dependencies.properties

deleted file mode 100644 (file)

index 5b6b47b..0000000
--- a/org.glite.lb/project/dependencies.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###################################################################
-# System dependencies
-###################################################################
-
-org.glite.version                                              = HEAD
-org.glite.lb.version                                   = HEAD
-
-# Component dependencies tag = do not remove this line =
-org.glite.lb.client-interface.version  = HEAD
-org.glite.lb.common.version                    = HEAD
-org.glite.lb.client.version                    = HEAD
-org.glite.lb.server.version                    = HEAD
-org.glite.lb.server-bones.version              = HEAD
-org.glite.lb.logger.version                    = HEAD
diff --git a/org.glite.lb/project/events.T b/org.glite.lb/project/events.T

deleted file mode 100644 (file)

index b8e5399..0000000
--- a/org.glite.lb/project/events.T
+++ /dev/null
@@ -1,183 +0,0 @@
-@type _common_
-       timeval timestamp       timestamp of event generation
-       _alias_ date            ULM
-       timeval arrived         timestamp of event store
-       _alias_ arr_date        ULM
-       _optional_
-       string  host            hostname of the machine where the event was generated
-       _alias_ host            ULM
-       int     level           logging level (system, debug, ...)
-       _alias_ lvl             ULM
-       _code_  EMERGENCY       emergency
-       _code_  ALERT           alert
-       _code_  ERROR           error
-       _code_  WARNING         warning
-       _code_  AUTH            authentication
-       _code_  SECURITY        security
-       _code_  USAGE           usage
-       _code_  SYSTEM          system
-       _code_  IMPORTANT       important
-       _code_  DEBUG           debug
-       int     priority        message priority (yet 0 for asynchronous and 1 for synchronous transfers)
-       _null_  -1
-       jobid   jobId           DataGrid job id of the source job
-       string  seqcode         sequence code assigned to the event
-       string  user            identity (cert. subj.) of the generator
-       logsrc  source          source (WMS component) which generated this event
-#      string  prog            name of program ("EDG WMS" of name of the application)
-       string  src_instance    instance of WMS component (e.g. service communication endpoint)
-       _optional_
-
-@type Transfer         Start, success, or failure of job transfer to another component
-       logsrc  destination     destination where the job is being transfered to
-       string  dest_host       destination hostname
-       string  dest_instance   destination instance
-       _optional_
-       string  job             job description in receiver language
-       int     result          result of the attempt
-       _code_  START           the sending component has started or is about to start the transfer
-       _code_  OK              job was sent successfully
-       _code_  REFUSED         job was refused by the other component
-       _code_  FAIL            transfer failed for other reason than explicit refusal (eg. network timeout)
-       string  reason          detailed description of transfer, especially reason of failure
-       _optional_
-       string  dest_jobid      destination internal jobid
-       _optional_
-
-@type Accepted         Accepting job (successful couterpart to Transfer)
-       logsrc  from            where was the job received from
-       string  from_host       sending component hostname
-       string  from_instance   sending component instance
-       _optional_
-       string  local_jobid     new jobId (Condor, Globus ...) assigned by the receiving component
-
-@type Refused          Refusing job (unsuccessful couterpart to Transfer)
-       logsrc  from            where was the job received from
-       string  from_host       sending component hostname
-       string  from_instance   sending component instance
-       _optional_
-       string  reason          reason of refusal
-
-@type EnQueued         The job has been enqueued in an inter-component queue
-       string  queue           destination queue
-       string  job             job description in receiver language
-       int     result          result of the attempt
-       _code_  START           the sending component has started or is about to start the transfer
-       _code_  OK              job was sent successfully
-       _code_  REFUSED         job was refused by the other component
-       _code_  FAIL            transfer failed for other reason than explicit refusal (eg. network timeout)
-       string  reason          detailed description of transfer, especially reason of failure
-
-@type DeQueued         The job has been dequeued from an inter-component queue
-       string  queue           queue name
-       string  local_jobid     new jobId assigned by the receiving component
-
-@type HelperCall       Helper component is called
-       string  helper_name     name of the called component
-       string  helper_params   parameters of the call
-       int     src_role        whether the logging component is called or calling one
-       _code_  CALLING         the logging component is caller
-       _code_  CALLED          the logging component is callee
-
-@type HelperReturn     Helper component is returning the control
-       string  helper_name     name of the called component
-       string  retval          returned data
-       int     src_role        whether the logging component is called or calling one
-       _code_  CALLING         the logging component is caller
-       _code_  CALLED          the logging component is callee
-
-@type Running          Executable started
-       string  node            worker node where the executable is run
-
-@type Resubmission     Result of resubmission decision
-       int     result          result code
-       _code_  WILLRESUB       will be resubmitted
-       _code_  WONTRESUB       will not be resubmitted
-       string  reason          reason for the decision
-       string  tag             value of the attribute on which the decision is based
-
-@type Done             Execution terminated (normally or abnormally)
-       int     status_code     way of termination
-       _code_  OK              terminated by itself
-       _code_  FAILED          disappeared from LRMS
-       _code_  CANCELLED       cancelled by user request
-       string  reason          reason for the change
-       int     exit_code       process exit code
-       _null_  -1
-
-@type Cancel           Cancel operation has been attempted on the job
-       int     status_code     classification of the cancel
-       _code_  REQ             request acknowledged
-       _code_  REFUSE          request declined by this component
-       _code_  DONE            request completed by whole WMS
-       _code_  ABORT           request refused by whole WMS
-       string  reason  detailed description
-
-@type Abort            Job aborted by system
-       string  reason          reason of abort
-
-@type Clear            Job cleared, output sandbox removed
-       int     reason          why the job was cleared
-       _code_  USER            user retrieved output sandbox
-       _code_  TIMEOUT         timed out, resource purge forced
-       _code_  NOOUTPUT        no output was generated
-
-@type Purge            Job is purged from bookkepping server
-
-@type Match            Matching CE found
-       string  dest_id         Id of the destination CE/queue
-       
-@type Pending          No match found yet
-       string  reason          why matching CE cannot be found
-
-@type RegJob           New job registration
-       string  jdl             job description
-       string  ns              NetworkServer handling the job
-       jobid   parent          jobid of parent job
-       _optional_
-
-       int     jobtype         job type
-       _code_  SIMPLE          simple job
-       _code_  DAG             dag (containing static set of subjobs)
-       _code_  PARTITIONABLE   partitionable (may become partitioned)
-       _code_  PARTITIONED     partitioned (dynamically created dag)
-       
-       int     nsubjobs        number of subjobs
-       _optional_
-       string  seed            seed for subjob id generation
-       _optional_
-
-@type Chkpt            Application-specific checkpoint record
-       string  tag             checkpoint tag
-       string  classad         checkpoint value
-
-@type Listener                 Listening network port for interactive control
-       string  svc_name        port instance name
-       string  svc_host        hostname
-       port    svc_port        port number
-
-@type CurDescr         current state of job processing (optional event)
-       string  descr           description of current job transformation (output of helper)
-
-@type UserTag          user tag -- arbitrary name=value pair
-       string  name    tag name
-       string  value   tag value
-
-@type ChangeACL                Management of ACL stored on bookkepping server
-       string  user_id         DN or VOMS parameter (in format VO:group)
-       int     user_id_type    type of information given in user_id (DN or VOMS)
-       _null_  -1
-       int     permission      ACL permission to change (currently only READ)
-       _null_  -1
-       int     permission_type type of permission requested ('allow', 'deny')
-       _null_  -1
-       int     operation       operation requested to perform with ACL (add, remove)
-       _null_  -1
-
-@type Notification     Management of notification service
-       notifid notifId         notification id
-       string  owner           owner
-       string  dest_host       destination host
-       port    dest_port       destination port
-       string  jobstat         job status
-
diff --git a/org.glite.lb/project/glite.lb.csf.xml b/org.glite.lb/project/glite.lb.csf.xml

deleted file mode 100644 (file)

index bdd7d8f..0000000
--- a/org.glite.lb/project/glite.lb.csf.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       gLite Middleware Logging and Bookkeping Configuration Specification File
-       
-       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>  
-                Joachim Flammer <Joachim.Flammer@cern.ch>      
-                Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.7  2004/10/15 12:30:01  akrenek
-       build with lb.sever-bones
-       
-       Revision 1.6  2004/08/27 10:03:41  zurek
-       typo problem
-       
-       Revision 1.5  2004/08/27 09:13:11  zurek
-       changing thee order for build
-       
-       Revision 1.4  2004/07/29 10:47:46  dimeglio
-       Added server and logger
-       
-       Revision 1.3  2004/07/16 16:25:43  flammer
-       Added tags for automated adding of components.
-       
-       Revision 1.2  2004/06/23 00:22:11  dimeglio
-       Added client and client-interface components
-       
-       Revision 1.1  2004/06/18 23:05:53  dimeglio
-       Added/upgraded default build scripts
-       
--->
-
-
-<project name="GLite Middleware Logging and Bookkeping CSF" default="all">
-
-       <!-- ===============================================
-                 Determine workspace directory 
-                =============================================== -->
-
-       <!-- Relative workspace root directory -->
-       <property name="workspace.dir" value="../.." />
-       
-       <!-- ===============================================
-                Load properties
-                =============================================== -->
-
-       <!-- load baseline and user properties -->
-       <import file="${workspace.dir}/org.glite/project/baseline.properties.xml" />
-
-       <!-- define build properties file location since we are already in project dir -->
-       <property name="subsystem.build.properties.file" value="./build.properties" />
-
-       <!-- Load subsystem-specific property file -->
-       <property file="./properties.xml"/>
-
-       <!-- load global properties -->
-       <import file="${global.properties.file}" />
-
-       <!-- ===============================================
-                Load dependencies 
-                =============================================== -->
-
-       <!-- Load user dependencies file -->
-       <property file="${user.dependencies.file}" />
-               
-       <!-- Load subsystem dependencies file -->
-       <property file="./dependencies.properties" />
-
-       <!-- Load global dependencies file -->
-       <property file="${global.dependencies.file}" />
-
-       <!-- ===============================================
-                Load targets
-                =============================================== -->
-       <import file="${global.targets-envchecks.file}" />
-       <import file="${global.targets-external-dependencies.file}" />  
-
-       <!-- ===============================================
-                Evaluate CVS tags
-                =============================================== -->
-
-       <target name="evaluate.cvs.tags" description="Figure out if we need tagged CVS checkout">
-               <condition property="glite.head">
-                       <and>
-                               <equals arg1="${org.glite.version}" arg2="HEAD" />
-                               <or>
-                                       <istrue value="${update}" />
-                                       <not>
-                                               <available file="${global.dependencies.file}" type="file" />
-                                       </not>
-                               </or>
-                       </and>
-               </condition>
-               <condition property="glite.tag">
-                       <and>
-                               <not>
-                                       <equals arg1="${org.glite.version}" arg2="HEAD" />
-                               </not>
-                               <or>
-                                       <istrue value="${update}" />
-                                       <not>
-                                               <available file="${global.dependencies.file}" type="file" />
-                                       </not>
-                               </or>
-                       </and>
-               </condition>
-               <condition property="glite-lb.head">
-                       <and>
-                               <equals arg1="${org.glite.lb.version}" arg2="HEAD" />
-                               <istrue value="${update}" />
-                       </and>
-               </condition>
-               <condition property="glite-lb.tag">
-                       <and>
-                               <not>
-                                       <equals arg1="${org.glite.lb.version}" arg2="HEAD" />
-                               </not>
-                               <istrue value="${update}" />
-                       </and>
-               </condition>
-       
-               <!-- condition property tag = do not remove = -->
-
-               <condition property="common.head">
-                       <equals arg1="${org.glite.lb.common.version}" arg2="HEAD" />
-               </condition>
-
-               <condition property="server-bones.head">
-                       <equals arg1="${org.glite.lb.server-bones.version}" arg2="HEAD" />
-               </condition>
-
-               <condition property="client-interface.head">
-                       <equals arg1="${org.glite.lb.client-interface.version}" arg2="HEAD" />
-               </condition>
-
-               <condition property="client.head">
-                       <equals arg1="${org.glite.lb.client.version}" arg2="HEAD" />
-               </condition>
-
-               <condition property="server.head">
-                       <equals arg1="${org.glite.lb.server.version}" arg2="HEAD" />
-               </condition>
-
-               <condition property="logger.head">
-                       <equals arg1="${org.glite.lb.logger.version}" arg2="HEAD" />
-               </condition>
-
-       </target>
-
-       <presetdef name="cvs-co">
-               <cvs command="checkout" dest="${workspace.dir}" />
-       </presetdef>
-
-       <!-- =====================================================
-                Self-update if required
-                ===================================================== -->
-               
-       <!-- Update main GLite module -->
-       <target name="org.glite" depends="get.glite.head, get.glite.tag"/>
-       <target name="get.glite.head" if="glite.head">
-               <cvs-co package="org.glite" />
-       </target>
-       <target name="get.glite.tag" if="glite.tag">
-               <cvs-co package="org.glite"
-                       tag="${org.glite.version}" />
-       </target>
-
-       <!-- Update the current module -->
-       <target name="org.glite.lb" depends="get.glite-lb.head, get.glite-lb.tag"/>
-       <target name="get.glite-lb.head" if="glite-lb.head">
-               <cvs-co package="org.glite.lb" />
-               <fail>The org.glite and org.glite.lb modules have been updated, please rerun the configuration file</fail>
-       </target>
-       <target name="get.glite-lb.tag" if="glite-lb.tag">
-               <cvs-co package="org.glite.lb"
-                       tag="${org.glite.lb.version}" />
-               <fail>The org.glite and org.glite.lb modules have been updated, please rerun the configuration file</fail>
-       </target>
-
-       <!-- *****************************************************-->
-       <!-- Development tools                                    -->
-       <!-- *****************************************************-->
-       
-       <!-- All development tools -->
-       <target name="devtools" depends="oscheck,
-                                                                        junitcheck,
-                                                                        junit,
-                                                                        chkstyle,
-                                                                        jalopy,
-                                                                        ant-contrib,
-                                                                        cpptasks,
-                                                                        egee-ant-ext"
-                       description="Get development tools into repository."/>          
-
-       <!-- =====================================================
-                External libraries
-                ===================================================== -->
-       
-       <!--  All external libraries -->
-       <target name="external" depends="oscheck,globus"
-                       description="Install external packages"/>
-       
-       <!-- =====================================================
-                GLite Middleware R-GMA modules
-                ===================================================== -->
-
-       <!-- component targets tag = do not remove = -->
-       
-       <!-- common -->
-       <target name="common" depends="get.common.head, get.common.tag"/>
-       <target name="get.common.head" if="common.head">
-               <cvs-co package="org.glite.lb.common" />
-       </target>
-       <target name="get.common.tag" unless="common.head">
-               <cvs-co package="org.glite.lb.common"
-                       tag="${org.glite.lb.common.version}" />
-       </target>
-
-       <!-- server-bones -->
-       <target name="server-bones" depends="get.server-bones.head, get.server-bones.tag"/>
-       <target name="get.server-bones.head" if="server-bones.head">
-               <cvs-co package="org.glite.lb.server-bones" />
-       </target>
-       <target name="get.server-bones.tag" unless="server-bones.head">
-               <cvs-co package="org.glite.lb.server-bones"
-                       tag="${org.glite.lb.server-bones.version}" />
-       </target>
-
-       <!-- client-interface -->
-       <target name="client-interface" depends="get.client-interface.head, get.client-interface.tag"/>
-       <target name="get.client-interface.head" if="client-interface.head">
-               <cvs-co package="org.glite.lb.client-interface" />
-       </target>
-       <target name="get.client-interface.tag" unless="client-interface.head">
-               <cvs-co package="org.glite.lb.client-interface"
-                       tag="${org.glite.lb.client-interface.version}" />
-       </target>
-
-       <!-- client -->
-       <target name="client" depends="get.client.head, get.client.tag"/>
-       <target name="get.client.head" if="client.head">
-               <cvs-co package="org.glite.lb.client" />
-       </target>
-       <target name="get.client.tag" unless="client.head">
-               <cvs-co package="org.glite.lb.client"
-                       tag="${org.glite.lb.client.version}" />
-       </target>
-
-       <!-- server -->
-       <target name="server" depends="get.server.head, get.server.tag"/>
-       <target name="get.server.head" if="server.head">
-               <cvs-co package="org.glite.lb.server" />
-       </target>
-       <target name="get.server.tag" unless="server.head">
-               <cvs-co package="org.glite.lb.server"
-                       tag="${org.glite.lb.server.version}" />
-       </target>
-
-       <!-- logger -->
-       <target name="logger" depends="get.logger.head, get.logger.tag"/>
-       <target name="get.logger.head" if="logger.head">
-               <cvs-co package="org.glite.lb.logger" />
-       </target>
-       <target name="get.logger.tag" unless="logger.head">
-               <cvs-co package="org.glite.lb.logger"
-                       tag="${org.glite.lb.logger.version}" />
-       </target>
-
-       <!-- All project modules -->
-       <target name="project" depends="client-interface,
-                                               common,
-                                               server-bones,
-                                               client,
-                                               server,
-                                               logger"/>
-
-
-       <!-- ====================================================
-                Checkout all
-                ==================================================== -->
-       
-       <!-- All libraries -->
-       <target name="all" depends="oscheck,evaluate.cvs.tags, defaultenvchecks, org.glite, org.glite.lb, devtools, external, project" />               
-
-       <!-- ====================================================
-                Print dependecies to console
-                ==================================================== -->
-       
-       <target name="dependencies">
-               <concat>
-                       <fileset dir="." includes="dependencies.properties" />
-               </concat>
-       </target>               
-
-</project>
diff --git a/org.glite.lb/project/properties.xml b/org.glite.lb/project/properties.xml

deleted file mode 100755 (executable)

index 0d0291a..0000000
--- a/org.glite.lb/project/properties.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the gLite LB modules
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-                        Alberto Di Meglio <alberto.di.meglio@cern.ch>          
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
--->
-
-<project name="Logging and Bookkeping subsystem common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property name="subsystem.build.properties.file" value="./project/build.properties" />
-       <property file="${subsystem.build.properties.file}" />  
-
-       <!-- ======================================================
-          Define subsystem properties
-                ====================================================== -->
-       
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${lb.subsystem.name}"/>
-       
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${lb.subsystem.prefix}"/>
-       
-       <!-- ======================================================
-          Define general subsystem properties
-                ====================================================== -->
-               
-       <!-- Include common subsystem properties -->
-       <import file="${subsystem.general.properties.file}" />
-       
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                       
-               
-</project>
-\ No newline at end of file
diff --git a/org.glite.lb/project/run-workspace b/org.glite.lb/project/run-workspace

deleted file mode 100644 (file)

index 03a3381..0000000
--- a/org.glite.lb/project/run-workspace
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-cd ../..
-
-cvs co org.glite
-cvs co org.glite.lb
-                                                                                                                                                             
-cd org.glite.lb/project
-ant -f glite.lb.csf.xml
-
diff --git a/org.glite.lb/project/status.T b/org.glite.lb/project/status.T

deleted file mode 100644 (file)

index 10071ac..0000000
--- a/org.glite.lb/project/status.T
+++ /dev/null
@@ -1,77 +0,0 @@
-@type _common_
-jobid  jobId           Id of the job
-string owner           Job owner
-_index_
-
-int    jobtype         Type of job
-       _null_  -1
-       _code_ SIMPLE   simple job
-       _code_ DAG      composite job
-jobid  parent_job      parent job of subjob
-
-string seed            string used for generation of subjob IDs
-int    children_num    number of subjobs
-strlist        children        list of subjob IDs
-       _special_       XMLstructured
-intlist        children_hist   summary (histogram) of children job states
-       _special_       XMLstructured
-stslist children_states full status information of the children
-       _special_       XMLstructured
-
-string         condorId        Id within Condor-G
-string globusId        Globus allocated Id
-string localId         Id within LRMS
-
-string jdl             User submitted job description
-string matched_jdl     Full job description after matchmaking
-string destination     ID of CE where the job is being sent
-_index_
-string condor_jdl      ClassAd passed to Condor-G for last job execution
-string rsl             Job RSL sent to Globus
-
-string reason          Reason of being in this status, if any
-
-string location        Where the job is being processed
-_index_
-string ce_node         Worker node where the job is executed
-string network_server  Network server handling the job
-
-bool   subjob_failed   Subjob failed (the parent job will fail too)
-int    done_code               Return code
-       _null_  -1
-       _code_  OK              Finished correctly
-       _code_  FAILED          Execution failed
-       _code_  CANCELLED       Cancelled by user
-int    exit_code               Unix exit code
-bool   resubmitted     The job was resubmitted
-
-bool   cancelling      Cancellation request in progress
-string cancelReason    Reason of cancel
-
-int    cpuTime         Consumed CPU time
-       _null_  -1
-
-taglist        user_tags       List of pairs (user_tag, user_value)
-       _special_       XMLstructured
-
-timeval        stateEnterTime  When entered this status
-timeval        lastUpdateTime  Last known event of the job
-
-intlist        stateEnterTimes When all previous states were entered
-       _special_       XMLstructured
-
-bool   expectUpdate    Some logged information has not arrived yet
-string expectFrom      Sources of the missing information
-string acl             ACL of the job
-
-@type Submitted                entered by the user to the User Interface or registered by Job Partitioner
-@type Waiting          Accepted by WMS, waiting for resource allocation
-@type Ready            Matching resources found
-@type Scheduled                Accepted by LRMS queue
-@type Running          Executable is running
-@type Done             Execution finished, output is available
-@type Cleared          Output transfered back to user and freed
-@type Aborted          Aborted by system (at any stage)
-@type Cancelled                Cancelled by user
-@type Unknown          Status cannot be determined
-@type Purged           Job has been purged from bookkeeping server (for LB->RGMA interface)
diff --git a/org.glite.lb/project/taskdefs.xml b/org.glite.lb/project/taskdefs.xml

deleted file mode 100755 (executable)

index 251f790..0000000
--- a/org.glite.lb/project/taskdefs.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common Ant task definition file for the gLite Logging and Bookeeping modules
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-                        Alberto Di Meglio <alberto.di.meglio@cern.ch>          
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
--->
-
-<project name="Logging and Bookeeping subsystem common tasks and types definitions">
-       
-       <!-- ======================================================
-                Subsystem task definitions
-                ====================================================== -->
-       
-</project>
-\ No newline at end of file
diff --git a/org.glite.lb/project/types.T b/org.glite.lb/project/types.T

deleted file mode 100644 (file)

index ccabc74..0000000
--- a/org.glite.lb/project/types.T
+++ /dev/null
@@ -1,108 +0,0 @@
-%types = (
-       C=>{
-               bool=>'"int"',
-               string=>'"char *"',
-               strlist=>'"char **"',
-               intlist=>'"int *"',
-               taglist=>'"edg_wll_TagValue *"',
-               stslist=>'"struct _edg_wll_JobStat *"',
-               timeval=>'"struct timeval"',
-               jobid=>'"edg_wlc_JobId"',
-               notifid=>'"edg_wll_NotifId"',
-               logsrc=>'"edg_wll_Source"',
-               port=>'"uint16_t"',
-#              level=>'"enum edg_wll_Level"',
-               int=>'"int"'
-       },
-       'C++'=>{
-               string=>'"std::string"',
-               timeval=>'"struct timeval"',
-               jobid=>'"edg::workload::common::jobid::JobId"',
-               bool=>'"int"',
-                intlist=>'"std::vector<int>"',
-                strlist=>'"std::vector<std::string>"',
-                taglist=>'"std::vector<std::pair<std::string>>"',
-               stslist=>'"std::vector<JobStatus>"',
-               logsrc=>'"int"',
-               port=>'"int"',
-               int=>'"int"'
-       }
-);
-
-%toString = (
-       C=>{
-               int=>'qq{asprintf(&$dst,"%d",$src);}',
-               port=>'qq{asprintf(&$dst,"%d",(int) $src);}',
-               bool=>'qq{asprintf(&$dst,"%d",$src);}',
-               string=>'qq{$dst = $src?strdup($src):NULL;}',
-               timeval=>'qq{edg_wll_ULMTimevalToDate(($src).tv_sec,($src).tv_usec,$dst);}',
-               jobid=>'qq{$dst = edg_wlc_JobIdUnparse($src);}',
-               notifid=>'qq{$dst = edg_wll_NotifIdUnparse($src);}',
-#              level=>'qq{$dst = edg_wll_LevelToString($src);}',
-               logsrc=>'qq{$dst = edg_wll_SourceToString($src);}',
-#      strlist, intlist, stslist are used only in consumer API, they don't need toString method
-       }
-);
-
-%ULMasString = (
-       logsrc=>1
-);
-
-%fromString = (
-       C=>{
-               int=>'qq{$dst = atoi($src);}',
-               port=>'qq{$dst = (uint16_t) atoi($src);}',
-               bool=>'qq{$dst = atoi($src);}',
-               string=>'qq{$dst = strdup($src);}',
-               timeval=>'qq{edg_wll_ULMDateToTimeval($src,&$dst);}',
-               jobid=>'qq{edg_wlc_JobIdParse($src,&$dst);}',
-               notifid=>'qq{edg_wll_NotifIdParse($src,&$dst);}',
-#              level=>'qq{$dst = edg_wll_StringToLevel($src);}',
-               logsrc=>'qq{$dst = edg_wll_StringToSource($src);}',
-#      strlist, intlist, stslist are used only in consumer API, they don't need fromString method
-       }
-);
-
-%DefaultNullValue = (
-       int=>0,
-       port=>0,
-#      level=>'EDG_WLL_LEVEL_UNDEFINED',
-       bool=>0,
-       string=>'NULL',
-       jobid=>'NULL',
-       notifid=>'NULL',
-       logsrc=>'EDG_WLL_SOURCE_NONE',
-       timeval=>'null_timeval',
-       strlist=>'NULL',
-       intlist=>'NULL',
-       taglist=>'NULL',
-       stslist=>'NULL',
-);
-
-%compare = (
-       C=>{
-               int=>'"($a == $b)"',
-               port=>'"($a == $b)"',
-#              level=>'"($a == $b)"',
-               bool=>'"(($a || !$b) && ($b || !$a))"',
-               string=>'"(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp($a,$b))"',
-               jobid=>'"(($a) == NULL && ($b) == NULL) || (($a)&&($b)&& !strcmp(edg_wlc_JobIdUnparse($a),edg_wlc_JobIdUnparse($b)))"',
-               notifid=>'"($a) == ($b)"',
-               logsrc=>'"($a) == ($b)"',
-               timeval=>'"($a).tv_sec == ($b).tv_sec && ($a).tv_usec == ($b).tv_usec"',
-       }
-);
-
-%toFormatString = (
-       C=>{
-               int=>'"%d"',
-               port=>'"%d"',
-               bool=>'"%d"',
-#              level=>'"%s"',
-               string=>'"%|Us"',
-               jobid=>'"%s"',
-               notifid=>'"%s"',
-               logsrc=>'"%s"',
-               timeval=>'"%s"',
-       }
-);
diff --git a/org.glite.lb/project/version.properties b/org.glite.lb/project/version.properties

deleted file mode 100644 (file)

index 329993d..0000000
--- a/org.glite.lb/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:15:00 CEST 2004
-module.version=0.1.0
-module.build=50
-module.age=0
diff --git a/org.glite.security.proxyrenewal/.cvsignore b/org.glite.security.proxyrenewal/.cvsignore

deleted file mode 100644 (file)

index 3a4edf6..0000000
--- a/org.glite.security.proxyrenewal/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
diff --git a/org.glite.security.proxyrenewal/LICENSE b/org.glite.security.proxyrenewal/LICENSE

deleted file mode 100644 (file)

index 01b973b..0000000
--- a/org.glite.security.proxyrenewal/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware
-================================
-
-Copyright (c) 2004 on behalf of the EU EGEE Project: 
-The European Organization for Nuclear Research (CERN), 
-Istituto Nazionale di Fisica Nucleare (INFN), Italy
-Datamat Spa, Italy
-Centre National de la Recherche Scientifique (CNRS), France
-CS Systeme d'Information (CSSI), France
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-Universiteit van Amsterdam (UvA), Netherlands
-University of Helsinki (UH.HIP), Finlan
-University of Bergen (UiB), Norway
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if
-any, must include the following acknowledgment: "This product includes
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."
-Alternatively, this acknowledgment may appear in the software itself, if
-and wherever such third-party acknowledgments normally appear.
-
-4. The names EGEE and the EU EGEE Project must not be
-used to endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-<email address>.
-
-5. You are under no obligation whatsoever to provide anyone with any
-bug fixes, patches, or upgrades to the features, functionality or
-performance of the Software ("Enhancements") that you may develop over
-time; however, if you choose to provide your Enhancements to The EU
-EGEE Project, or if you choose to otherwise publish or distribute your
-Enhancements, in source code form without contemporaneously requiring
-end users of The EU EGEE Proejct to enter into a separate written license
-agreement for such Enhancements, then you hereby grant The EU EGEE Project
-a non-exclusive, royalty-free perpetual license to install, use, copy,
-modify, prepare derivative works, incorporate into the EGEE Middleware
-or any other computer software, distribute, and sublicense your
-Enhancements or derivative works thereof, in binary and source code
-form (if any), whether developed by The EU EGEE Project or third parties.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the EU EGEE Prject. For more information on The
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/
-
-
diff --git a/org.glite.security.proxyrenewal/Makefile b/org.glite.security.proxyrenewal/Makefile

deleted file mode 100644 (file)

index f567f8a..0000000
--- a/org.glite.security.proxyrenewal/Makefile
+++ /dev/null
@@ -1,145 +0,0 @@
-#
-# Copyright (c) 2004 on behalf of the EU EGEE Project:
-# The European Organization for Nuclear Research (CERN),
-# Istituto Nazionale di Fisica Nucleare (INFN), Italy
-# Datamat Spa, Italy
-# Centre National de la Recherche Scientifique (CNRS), France
-# CS Systeme d'Information (CSSI), France
-# Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-# Universiteit van Amsterdam (UvA), Netherlands
-# University of Helsinki (UH.HIP), Finland
-# University of Bergen (UiB), Norway
-# Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-#
-# Top Makefile file for the GLite Security Proxyrenewal module
-#
-# Authors: Ales Krenek <ljocha@ics.muni.cz>
-# Version info: $Id$
-# Release: $Name$
-#
-# Revision history:
-# $Log
-#
-
-# defaults
-top_srcdir=.
-builddir=build
-top_builddir=${top_srcdir}/${builddir}
-stagedir=.
-distdir=.
-globalprefix=glite
-lbprefix=lb
-package=glite-security-proxyrenewal
-version=0.0.0
-PREFIX=/opt/glite
-
-glite_location=$PREFIX
-globus_prefix=/opt/globus
-voms_prefix=/opt/glite
-nothrflavour=gcc32
-thrflavour=gcc32pthr
-myproxy_prefix=$globus_prefix
-
--include Makefile.inc
-
-VPATH:=${top_srcdir}/src
-
-GLOBUSINC:= -I${globus_prefix}/include/${nothrflavour} \
-       -I${globus_prefix}/include/${nothrflavour}/openssl
-
-GLOBUSTHRINC:= -I${globus_prefix}/include/${thrflavour} \
-       -I${globus_prefix}/include/${thrflavour}/openssl
-
-MYPROXYINC:= -I${myproxy_prefix}/include/${nothrflavour}
-MYPROXYTHRINC:= -I${myproxy_prefix}/include/${thrflavour}
-
-DEBUG:=-g -O0
-
-# XXX: until VOMS is ready in SCM
-CFLAGS:= -DNOVOMS \
-       ${DEBUG} \
-       -DVOMS_INSTALL_PATH=\"${voms_prefix}\"\
-       ${MYPROXYINC} \
-       -I${top_srcdir}/src -I${top_srcdir}/interface \
-       -I${glite_location}/include
-
-GLOBUS_LIBS:=-L${globus_prefix}/lib \
-       -lglobus_common_${nothrflavour} \
-       -lssl_${nothrflavour}
-
-MYPROXY_LIB:=-L${myproxy_prefix}/lib -lmyproxy_${nothrflavour}
-
-JOBIDLIB:=-L${glite_location}/lib -lglite_wmsutils_cjobid
-
-COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} ${LDFLAGS}
-INSTALL:=libtool --mode=install install
-
-DAEMONOBJ:=renewd.o renew.o common.o commands.o api.o
-LIBOBJ:=api.o common.o
-CLIENTOBJ:=client.o
-
-THRLIBOBJ:=${LIBOBJ:.o=.thr.o}
-LIBLOBJ:=${LIBOBJ:.o=.lo}
-THRLIBLOBJ:=${LIBOBJ:.o=.thr.lo}
-
-LIB:=libglite_security_proxyrenewal_${nothrflavour}.la
-THRLIB:=libglite_security_proxyrenewal_${thrflavour}.la
-
-DAEMON:=glite-proxy-renewd
-CLIENT:=glite-proxy-renew
-
-default: all
-compile all: ${LIB} ${THRLIB} ${DAEMON} ${CLIENT}
-
-${LIB}: ${LIBOBJ}
-       ${LINK} -o $@ ${LIBLOBJ} -rpath ${glite_location}/lib ${JOBIDLIB}
-
-
-${THRLIB}: ${THRLIBOBJ}
-       ${LINK} -o $@ ${THRLIBLOBJ} -rpath ${glite_location}/lib
-
-${DAEMON}: ${DAEMONOBJ}
-       ${LINK} -o $@ ${DAEMONOBJ} ${JOBIDLIB} ${MYPROXY_LIB} -lglobus_gss_assist_${nothrflavour} ${GLOBUS_LIBS} 
-
-${CLIENT}: ${CLIENTOBJ} ${LIB}
-       ${LINK} -o $@ ${CLIENTOBJ} ${LIB} ${GLOBUS_LIBS}
-
-${THRLIBOBJ}: %.thr.o: %.c
-       ${COMPILE} ${GLOBUSTHRINC} -o $@ -c $<
-
-%.o: %.c
-       ${COMPILE} ${GLOBUSINC} -c $<
-
-stage: compile
-       $(MAKE) install PREFIX=${stagedir}
-
-
-check:
-       echo No unit tests
-
-dist: distsrc distbin
-
-distsrc:
-       mkdir -p ${top_srcdir}/${package}-${version}
-       cd ${top_srcdir} && GLOBIGNORE="${package}-${version}" && cp -Rf * ${package}-${version}
-       cd ${top_srcdir} && tar -czf ${distdir}/${package}-${version}_src.tar.gz --exclude-from=project/tar_exclude ${package}-${version}
-       rm -rf ${top_srcdir}/${package}-${version}
-
-distbin:
-       $(MAKE) install PREFIX=`pwd`/tmpbuilddir
-       cd tmpbuilddir && tar -czf ../${top_srcdir}/${distdir}/${package}-${version}_bin.tar.gz *
-       rm -rf tmpbuilddir
-
-install:
-       -mkdir -p ${PREFIX}/bin ${PREFIX}/lib ${PREFIX}/include/glite/security/proxyrenewal ${PREFIX}/share/doc/${package}-${version} ${PREFIX}/etc/init.d
-       ${INSTALL} -m 644 ${LIB} ${THRLIB} ${PREFIX}/lib
-       ${INSTALL} -m 755 ${DAEMON} ${CLIENT} ${PREFIX}/bin
-       ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
-       cd ${top_srcdir}/interface && ${INSTALL} -m 644 renewal.h ${PREFIX}/include/glite/security/proxyrenewal
-
-       ${INSTALL} -m 755 ${top_srcdir}/config/startup ${PREFIX}/etc/init.d/${DAEMON}
-
-
-clean:
-       $(RM) $(LIB) $(DAEMON) $(CLIENT) *.o core 
diff --git a/org.glite.security.proxyrenewal/build.xml b/org.glite.security.proxyrenewal/build.xml

deleted file mode 100755 (executable)

index 4d1ebf9..0000000
--- a/org.glite.security.proxyrenewal/build.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite LB Client module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-       Revision 1.2  2004/07/12 16:18:37  dimeglio
-       Modified to use myproxy from the repository if available
-       
-       Revision 1.1.1.1  2004/07/09 10:16:25  akrenek
-       initial import
-       
-       Revision 1.2  2004/07/07 09:24:57  akrenek
-       thr/nonthr flavours used correctly
-       
-       Revision 1.3  2004/07/06 17:45:30  flammer
-       Update of classpath definitions, targets & configure file.
-       
-       Revision 1.2  2004/06/23 00:29:33  dimeglio
-       Added standard comments and handling of support files
-       
--->
-
-<project name="proxyrenewal" default="dist">
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                Load configure options (order is important)
-            ========================================= -->
-       <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>
-
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-                       
-       <!-- =========================================
-                Load common targets
-            ========================================= -->
-       <import file="${global.targets-simple_make.file}" />
-
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-               <antcall target="secmakefiles" />
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-</project>             
diff --git a/org.glite.security.proxyrenewal/config/startup b/org.glite.security.proxyrenewal/config/startup

deleted file mode 100755 (executable)

index ff13d2d..0000000
--- a/org.glite.security.proxyrenewal/config/startup
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-GLITE_LOCATION=${GLITE_LOCATION:-/opt/glite}
-GLITE_USER=${GLITE_USER:-glite}
-GLITE_LOCATION_VAR=$(GLITE_LOCATION_VAR:-/opt/glite/var}
-
-[ -f /etc/glite.conf ] && . /etc/glite.conf
-[ -f $HOME/.glite.conf ] && . $HOME/.glite.conf
-
-PROXY_REPOSITORY="$GLITE_LOCATION_VAR/spool/glite-renewd"
-
-start()
-{
-       [ -n "$GLITE_HOST_CERT" ] && X509_USER_CERT="$GLITE_HOST_CERT"
-       [ -n "$GLITE_HOST_KEY" ] && X509_USER_KEY="$GLITE_HOST_KEY"
-       export X509_USER_CERT X509_USER_KEY
-
-       echo -n Starting ProxyRenewal Daemon: glite-proxy-renewd ...
-
-       if [ ! -d "$PROXY_REPOSITORY" ]; then
-               mkdir -p $PROXY_REPOSITORY || exit 1
-               chown $GLITE_USER $PROXY_REPOSITORY
-               chmod 0700 $PROXY_REPOSITORY
-       fi
-       
-       su $GLITE_USER -c "$GLITE_LOCATION/bin/glite-proxy-renewd \
-               -r $PROXY_REPOSITORY" && echo " done"
-}
-
-stop()
-{
-       echo -n "Stopping ProxyRenewal Daemon: glite-proxy-renewd ..."
-       PIDS=`ps -C glite-proxy-renewd -o pid --no-heading`
-       if [ -z "$PIDS" ]; then
-               echo " no process glite-proxy-renewd running"
-               exit 1
-       else
-               kill $PIDS && echo " done"
-       fi
-}
-
-status()
-{
-       PIDS=`ps -C glite-proxy-renewd -o pid --no-heading`
-       if ps p $PIDS >/dev/null 2>&1; then
-               echo glite-proxy-renewd running \($PIDS\)
-               return 0
-       fi
-       
-       echo glite-proxy-renewd not running
-       return 1
-}
-
-case x$1 in
-       xstart) start;;
-       xstop)  stop;;
-       xrestart) stop; start;;
-       xstatus) status;;
-       x*)     echo usage: $0 start,stop,restart,status >&2
-               exit 1;;
-esac
diff --git a/org.glite.security.proxyrenewal/interface/renewal.h b/org.glite.security.proxyrenewal/interface/renewal.h

deleted file mode 100644 (file)

index 167b27d..0000000
--- a/org.glite.security.proxyrenewal/interface/renewal.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/**
- * \file proxyrenewal/renewal.h
- * \author Daniel Kouril
- * \author Miroslav Ruda
- * \brief  API for proxy renewal.
- * \version 2.0
- *
- * General rules:
- * - functions return 0 on success, nonzero on error, errror details can
- *   be found via edg_wlpr_GetErrorText()
- */
-
-#ifndef RENEWAL_H
-#define RENEWAL_H
-
-#ident "$Header$"
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define EDG_WLPR_FLAG_UNIQUE   1
-#define EDG_WLPR_FLAG_UPDATE   2
-
-typedef enum _edg_wlpr_ErrorCode {
-/**
- * Base for proxy renewal specific code.
- * Start sufficently high not to collide with standard errno. */
- /* XXX see common/exception_codes.h */
-    EDG_WLPR_ERROR_BASE = 1900,
-    EDG_WLPR_ERROR_UNEXPECTED_EOF,
-    EDG_WLPR_ERROR_GENERIC,
-    EDG_WLPR_ERROR_PROTO_PARSE_ERROR,
-    EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND,
-    EDG_WLPR_ERROR_UNKNOWN_COMMAND,
-    EDG_WLPR_ERROR_SSL,
-    EDG_WLPR_ERROR_MYPROXY,
-    EDG_WLPR_PROXY_NOT_REGISTERED,
-    EDG_WLPR_PROXY_EXPIRED,
-    EDG_WLPR_ERROR_VOMS,
-} edg_wlpr_ErrorCode;
-
-/**
- * Return a human readable string containg description of the errorcode
- * \retval char* pointer to a error description
- */
-const char *
-edg_wlpr_GetErrorText(int err_code);
-
-/**
- * This function contacts the renewal daemon and registers the specified proxy
- * for periodic renewal.
- * \param filename IN: specification of the proxy to register.
- * \param jdl IN: JDL of the job owing the proxy. The JDL is looked for a 
- * myproxy server contact.
- * \param flags IN: one of EDG_WLPR_FLAG_UNIQUE or EDG_WLPR_FLAG_UPDATE, or
- * their bitwise OR.
- * \param repository_filename OUT: filename of registered proxy in repository.
- * \retval 0 success
- * \retval nonzero on error. Human readable form of the error can be get via
- * edg_wlpr_GetErrorText().
- */
-int
-edg_wlpr_RegisterProxy(
-      const char * filename,
-      const char *jdl,
-      int flags,
-      char ** repository_filename
-);
-
-/**
- * The same function as edg_wlpr_RegisterProxy() but information about the
- * myproxy server and jobid are passed as parameters instead of in JDL.
- */
-int
-edg_wlpr_RegisterProxyExt(
-      const char * filename,
-      const char * server,
-      unsigned int port,
-      edg_wlc_JobId jobid,
-      int flags,
-      char ** repository_filename
-);
-
-/**
- * Unregister proxy from the renewal daemon.
- * \param jobid IN: specification of job whose proxy shall be unregistered
- * \param filename IN: (optional) specification of the proxy to unregister.
- * \retval 0 success
- * \retval nonzero on error. Human readable form of the error can be get via
- * edg_wlpr_GetErrorText().
- */
-int
-edg_wlpr_UnregisterProxy(
-      edg_wlc_JobId jobid,
-      const char * repository_filename
-);
-
-/**
- * Get a list of registered proxies maintained by the renewal daemon.
- * \param count OUT: number of proxies
- * \param list OUT: a list of filenames separated by '\n'
- * specifying the registered proxies. 
- * \warning The caller is responsible for freeing the data.
- * \retval 0 success
- * \retval nonzero on error. Human readable form of the error can be get via
- * edg_wlpr_GetErrorText().
- */
-int
-edg_wlpr_GetList(int *count, char **list);
-
-/**
- * Get a status message about a proxy.
- * The function contacts the renewal daemon and retrieve information it 
- * maintains about the proxy.
- * \param filename IN: specification of the proxy to query
- * \param info OUT: status message.
- * \warning The caller is responsible for freeing the data.
- * \retval 0 success
- * \retval nonzero on error. Human readable form of the error can be get via
- * edg_wlpr_GetErrorText().
- */
-int
-edg_wlpr_GetStatus(const char *repository_filename, char **info);
-
-/**
- * For given jobid return registered proxy filename from repository
- * \param jobid IN: specification of jobid
- * \param repository_filename OUT: proxy regitered for given jobid
- * \warning The caller is responsible for freeing the data.
- * \retval 0 success
- * \retval nonzero on error. Human readable form of the error can be get via
- * edg_wlpr_GetErrorText().
- */
-int
-edg_wlpr_GetProxy(edg_wlc_JobId jobid, char **repository_filename);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* RENEWAL_H */
diff --git a/org.glite.security.proxyrenewal/project/build.properties b/org.glite.security.proxyrenewal/project/build.properties

deleted file mode 100644 (file)

index e69de29..0000000
diff --git a/org.glite.security.proxyrenewal/project/configure.properties.xml b/org.glite.security.proxyrenewal/project/configure.properties.xml

deleted file mode 100644 (file)

index 4122b9d..0000000
--- a/org.glite.security.proxyrenewal/project/configure.properties.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Configuration options for the GLite Security Proxyrenewal module
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-    Version info: $Id$
-    Release: $Name$
-
-    Revision history:
-    $Log$
--->
-
-       <!-- ======================================================
-         Define extra properties here ...
-         ====================================================== -->
-        
-       <project name="Security Proxyrenewal configuration options">                                                                        
-               <target name="secmakefiles">
-                       <exec executable="ln" failonerror="true">
-                               <arg line="-fs ${component.dir}/Makefile ${module.build.dir}/Makefile"/>
-                       </exec>
-                       <echo file="${module.build.dir}/Makefile.inc">
-top_srcdir=..
-builddir=build
-stagedir=${stage.abs.dir}
-distdir=${dist.dir}
-globalprefix=${global.prefix}
-package=${module.package.name}
-PREFIX=${install.dir}
-version=${module.version}
-glite_location=${with.glite.location}
-globus_prefix=${with.globus.prefix}
-thrflavour=${with.globus.thr.flavor}
-nothrflavour=${with.globus.nothr.flavor}
-myproxy_prefix=${with.myproxy.prefix}
-voms_prefix=${with.glite.location}
-                       </echo>
-           </target>
-       </project>
diff --git a/org.glite.security.proxyrenewal/project/properties.xml b/org.glite.security.proxyrenewal/project/properties.xml

deleted file mode 100755 (executable)

index f1e51dd..0000000
--- a/org.glite.security.proxyrenewal/project/properties.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite Security Proxyrenewal component
-       
-       Authors: Ales Krenek <ljocha@ics.muni.cz>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.2  2004/07/12 16:18:37  dimeglio
-       Modified to use myproxy from the repository if available
-       
--->
-
-<project name="Security Proxyrenewal component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${security.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${security.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="proxyrenewal" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-                                                               
-</project>
diff --git a/org.glite.security.proxyrenewal/project/tar_exclude b/org.glite.security.proxyrenewal/project/tar_exclude

deleted file mode 100644 (file)

index e1fcd1a..0000000
--- a/org.glite.security.proxyrenewal/project/tar_exclude
+++ /dev/null
@@ -1,10 +0,0 @@
-tar_exclude
-CVS
-build.xml
-build
-build.properties
-properties.xml
-configure.properties.xml
-.cvsignore
-.project
-.cdtproject
diff --git a/org.glite.security.proxyrenewal/project/taskdefs.xml b/org.glite.security.proxyrenewal/project/taskdefs.xml

deleted file mode 100755 (executable)

index 13e894e..0000000
--- a/org.glite.security.proxyrenewal/project/taskdefs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="tasks and types definitions">
-</project>
diff --git a/org.glite.security.proxyrenewal/project/version.properties b/org.glite.security.proxyrenewal/project/version.properties

deleted file mode 100644 (file)

index 35fcb84..0000000
--- a/org.glite.security.proxyrenewal/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 07:01:43 CEST 2004
-module.version=0.1.0
-module.build=45
-module.age=1
diff --git a/org.glite.security.proxyrenewal/src/api.c b/org.glite.security.proxyrenewal/src/api.c

deleted file mode 100644 (file)

index e241f20..0000000
--- a/org.glite.security.proxyrenewal/src/api.c
+++ /dev/null
@@ -1,436 +0,0 @@
-#include "renewal.h"
-#include "renewal_locl.h"
-
-#ident "$Header$"
-
-#define SEPARATORS "\n"
-
-/* prototypes of static routines */
-static int
-encode_request(edg_wlpr_Request *request, char **msg);
-
-static int
-decode_response(const char *msg, const size_t msg_len, edg_wlpr_Response *response);
-
-static int
-do_connect(char *socket_name, int *sock);
-
-static int
-send_request(int sock, edg_wlpr_Request *request, edg_wlpr_Response *response);
-
-
-static int 
-encode_request(edg_wlpr_Request *request, char **msg)
-{
-   char *buf;
-   size_t buf_len;
-   int ret;
-
-   buf_len = EDG_WLPR_BUF_SIZE;
-   buf = malloc(buf_len);
-   if (buf == NULL)
-      return ENOMEM;
-   buf[0] = '\0';
-
-   ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_VERSION,
-                            EDG_WLPR_VERSION, SEPARATORS);
-   if (ret)
-      goto err;
-
-   ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_COMMAND,
-                            edg_wlpr_EncodeInt(request->command),
-                            SEPARATORS);
-   if (ret)
-      goto err;
-
-   if (request->myproxy_server) {
-      char host[1024];
-
-#if 0
-      snprintf(host, sizeof(host), "%s:%d", request->myproxy_server, 
-              (request->myproxy_port) ? request->myproxy_port : EDG_WLPR_MYPROXY_PORT); /* XXX let server decide ? */
-#else
-      snprintf(host, sizeof(host), "%s", request->myproxy_server);
-#endif
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_MYPROXY_SERVER,
-                               host, SEPARATORS);
-      if (ret)
-        goto err;
-   }
-
-   if (request->proxy_filename) {
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_PROXY,
-                               request->proxy_filename, SEPARATORS);
-      if (ret)
-        goto err;
-   }
-
-   if (request->jobid) {
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_JOBID,
-                               request->jobid, SEPARATORS);
-      if (ret)
-        goto err;
-   }
-
-   if (request->entries) {
-      char **p = request->entries;
-      while (*p) {
-        ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_ENTRY,
-                                  *p, SEPARATORS);
-        if (ret)
-           goto err;
-        p++;
-      }
-   }
-
-   buf[strlen(buf)] = '\0';
-   *msg = buf;
-   return 0;
-
-err:
-   free(buf);
-   *msg = NULL;
-   return ret;
-}
-
-static int
-decode_response(const char *msg, const size_t msg_len, edg_wlpr_Response *response)
-{
-   int ret;
-   char *value = NULL;
-   /* char *p; */
-   int i;
-   int current_size = 0;
-
-   /* XXX add an ending zero '\0' */
-
-   assert(msg != NULL);
-   assert(response != NULL);
-
-   memset(response, 0, sizeof(*response));
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_VERSION, SEPARATORS,
-                          0, &response->version);
-   if (ret)
-      goto err;
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_RESPONSE, SEPARATORS,
-                          0, &value);
-   if (ret)
-      goto err;
-
-   ret = edg_wlpr_DecodeInt(value, (int *)(&response->response_code));
-   free(value);
-   if (ret)
-      goto err;
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_MYPROXY_SERVER,
-                          SEPARATORS, 0, &response->myproxy_server);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto err;
-
-#if 0
-   response->myproxy_port = EDG_WLPR_MYPROXY_PORT; /* ??? */
-   if (response->myproxy_server && (p = strchr(response->myproxy_server, ':'))) {
-      int port;
-      *p = '\0';
-      port = atol(p+1); /* XXX */
-      response->myproxy_port = port;
-   }
-#endif
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_START_TIME, SEPARATORS, 
-                          0, &value);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto err;
-   if (ret == 0) {
-      ret = edg_wlpr_DecodeInt(value, (int *)(&response->start_time));
-      free(value);
-      if (ret)
-         goto err;
-   }
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_END_TIME, SEPARATORS,
-                          0, &value);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto err;
-   if (ret == 0) { 
-      ret = edg_wlpr_DecodeInt(value, (int *)(&response->end_time));
-      free(value);
-      if (ret)
-        goto err;
-   }
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_RENEWAL_TIME,
-                          SEPARATORS, 0, &value);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto err;
-   if (ret == 0) {
-      ret = edg_wlpr_DecodeInt(value, (int *)(&response->next_renewal_time));
-      free(value);
-      if (ret)
-        goto err;
-   }
-
-   /* XXX Counter */
-
-   i = 0;
-   while ((ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_PROXY,
-                                  SEPARATORS, i, &value)) == 0) {
-      if (i >= current_size) {
-        char **tmp;
-
-        tmp = realloc(response->filenames, 
-                      (current_size + 16 + 1) * sizeof(*tmp));
-        if (tmp == NULL) {
-           ret = ENOMEM;
-           goto err;
-        }
-        response->filenames = tmp;
-        current_size += 16;
-      }
-      response->filenames[i] = value;
-      i++;
-   }
-   if (ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto err;
-   if (response->filenames)
-      response->filenames[i] = NULL;
-
-   return 0;
-
-err:
-   edg_wlpr_CleanResponse(response);
-
-   return ret;
-}
-
-static int
-do_connect(char *socket_name, int *sock)
-{
-   struct sockaddr_un my_addr;
-   int s;
-   int ret;
-
-   assert(sock != NULL);
-   memset(&my_addr, 0, sizeof(my_addr));
-
-   s = socket(AF_UNIX, SOCK_STREAM, 0);
-   if (s == -1) {
-      return errno;
-   }
-
-   my_addr.sun_family = AF_UNIX;
-   strncpy(my_addr.sun_path, socket_name, sizeof(my_addr.sun_path));
-
-   ret = connect(s, (struct sockaddr *) &my_addr, sizeof(my_addr));
-   if (ret == -1) {
-      close(s);
-      return errno;
-   }
-
-   *sock = s;
-   return 0;
-}
-
-static int
-send_request(int sock, edg_wlpr_Request *request, edg_wlpr_Response *response)
-{
-   int ret;
-   char *buf = NULL;
-   size_t buf_len;
-
-   /* timeouts ?? */
-
-   ret = encode_request(request, &buf);
-   if (ret)
-      return ret;
-
-   ret = edg_wlpr_Write(sock, buf, strlen(buf) + 1);
-   free(buf);
-   if (ret)
-      return ret;
-
-   ret = edg_wlpr_Read(sock, &buf, &buf_len);
-   if (ret)
-      return ret;
-
-   ret = decode_response(buf, buf_len, response);
-   free(buf);
-   if (ret)
-      return ret;
-
-   return 0;
-}
-
-int
-edg_wlpr_RequestSend(edg_wlpr_Request *request, edg_wlpr_Response *response)
-{
-   char sockname[1024];
-   int ret;
-   int sock;
-
-   snprintf(sockname, sizeof(sockname), "%s%d",
-           DGPR_REG_SOCKET_NAME_ROOT, getuid());
-   ret = do_connect(sockname, &sock);
-   if (ret)
-      return ret;
-
-   ret = send_request(sock, request, response);
-
-   close(sock);
-   return ret;
-}
-
-int
-edg_wlpr_RegisterProxyExt(const char *filename, const char * server,
-                         unsigned int port,
-                          edg_wlc_JobId jobid, int flags,
-                         char **repository_filename)
-{
-   edg_wlpr_Request request;
-   edg_wlpr_Response response;
-   int ret;
-
-   memset(&request, 0, sizeof(request));
-   memset(&response, 0, sizeof(response));
-
-   request.command = EDG_WLPR_COMMAND_REG;
-   request.myproxy_server = server;
-   request.proxy_filename = filename;
-   request.jobid = edg_wlc_JobIdUnparse(jobid);
-   if (request.jobid == NULL)
-      return EINVAL; /* XXX */
-
-   ret = edg_wlpr_RequestSend(&request, &response);
-   free(request.jobid);
-   if (ret == 0 && response.response_code == 0 && repository_filename &&
-       response.filenames && response.filenames[0] )
-      *repository_filename = strdup(response.filenames[0]);
-
-   if (ret == 0)
-      ret = response.response_code;
-
-   edg_wlpr_CleanResponse(&response);
-   
-   return ret;
-}
-
-int
-edg_wlpr_RegisterProxy(const char *filename, const char *jdl,
-                       int flags, char **repository_filename)
-{
-   char server[1024];
-   size_t server_len;
-   unsigned int port = 0;
-   char *p, *q;
-   
-   memset(server, 0, sizeof(server));
-   
-   /* parse JDL and find information about myproxy server */
-   p = strstr(jdl, JDL_MYPROXY);
-   if (p == NULL)
-      return 0; /* XXX */
-   q = strchr(p, '\n'); /* XXX */
-   if (q)
-      server_len = q - p;
-   else 
-      server_len = jdl + strlen(jdl) - p;
-   if (server_len >= sizeof(server))
-      return EINVAL; /* XXX */
-   strncmp(server, p, sizeof(server));
-
-   return (edg_wlpr_RegisterProxyExt(filename, server, port, NULL, flags, 
-                                    repository_filename));
-}
-
-int
-edg_wlpr_UnregisterProxy(edg_wlc_JobId jobid, const char *repository_filename)
-{
-   edg_wlpr_Request request;
-   edg_wlpr_Response response;
-   int ret;
-
-   memset(&request, 0, sizeof(request));
-   memset(&response, 0, sizeof(response));
-
-   request.command = EDG_WLPR_COMMAND_UNREG;
-   request.proxy_filename = repository_filename;
-   request.jobid = edg_wlc_JobIdUnparse(jobid);
-   if (request.jobid == NULL)
-      return EINVAL;
-
-   ret = edg_wlpr_RequestSend(&request, &response);
-   free(request.jobid);
-   
-   if (ret == 0)
-      ret = response.response_code;
-   edg_wlpr_CleanResponse(&response);
-
-   return ret;
-}
-
-int
-edg_wlpr_GetList(int *count, char **list)
-{
-   return ENOSYS; /* XXX */
-}
-
-int
-edg_wlpr_GetStatus(const char *filename, char **info)
-{
-   return ENOSYS; /* XXX */
-}
-
-static const char* const errTexts[] = {
-   "Unexpected EOF from peer",
-   "Generic error",
-   "Protocol parse error",
-   "Compulsory element not found in message",
-   "Unknown protocol command",
-   "SSL error",
-   "Error from Myproxy server",
-   "Proxy not registered",
-   "Proxy expired",
-   "VOMS error",
-};
-
-const char *
-edg_wlpr_GetErrorText(int code)
-{
-   return code ?
-           (code <= EDG_WLPR_ERROR_BASE ?
-                   strerror(code) :
-                   errTexts[code - EDG_WLPR_ERROR_BASE - 1]
-          ) :
-          NULL;
-}
-
-int
-edg_wlpr_GetProxy(edg_wlc_JobId jobid, char **repository_filename)
-{
-   edg_wlpr_Request request;
-   edg_wlpr_Response response;
-   int ret;
-
-   memset(&request, 0, sizeof(request));
-   memset(&response, 0, sizeof(response));
-
-   request.command = EDG_WLPR_COMMAND_GET;
-   request.jobid = edg_wlc_JobIdUnparse(jobid);
-   if (request.jobid == NULL)
-      return EINVAL;
-
-   ret = edg_wlpr_RequestSend(&request, &response);
-   free(request.jobid);
-
-   if (ret == 0 && response.response_code == 0 && repository_filename &&
-       response.filenames && response.filenames[0] )
-      *repository_filename = strdup(response.filenames[0]);
-   
-   if (ret == 0)
-      ret = response.response_code;
-   edg_wlpr_CleanResponse(&response);
-
-   return ret;
-}
diff --git a/org.glite.security.proxyrenewal/src/client.c b/org.glite.security.proxyrenewal/src/client.c

deleted file mode 100644 (file)

index eb2d36b..0000000
--- a/org.glite.security.proxyrenewal/src/client.c
+++ /dev/null
@@ -1,117 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <string.h>
-#include "renewal.h"
-
-static const char rcsid[] = "$Header$";
-
-static struct option const long_options[] = {
-   { "help",     no_argument,       0, 'h' },
-   { "version",  no_argument,       0, 'v' },
-   { "server",   required_argument, 0, 's' },
-   { "port",     required_argument, 0, 'p' },
-   { "file",     required_argument, 0, 'f' },
-   { "jobid",    required_argument, 0, 'j' },
-   { NULL, 0, NULL, 0}
-};
-
-static char short_options[] = "hvs:p:f:j:";
-
-static void
-usage(exit_code)
-{
-   fprintf(stdout, "Usage: edg-wl-renew [option] operation\n"
-          "\t-s myproxy_server [-p port] -f filename -j jobid start |\n"
-          "\t-j jobid [-f filename] stop |\n"
-          "\t-j jobid get\n"
-          "-h, --help                 display this help and exit\n"
-          "-v, --version              output version information and exit\n"
-          "-s, --server <fqdn>        address of myproxy server\n"
-          "-p, --port <num>           port of myproxy server\n"
-          "-f, --file <file>          filename with proxy\n"
-          "-j, --jobid <str>          datagrid jobid\n");
-   exit(exit_code);
-}
-
-int
-main(int argc, char *argv[])
-{
-   char *server = NULL;
-   int port = 0;
-   char *proxyfile = NULL;
-   char *jobid_str = NULL;
-   edg_wlc_JobId jobid = NULL;
-   char *repository_filename = NULL;
-   int ret;
-   int arg;
-   extern int optind;
-
-   while ((arg = getopt_long(argc, argv,
-                            short_options, long_options, (int *) 0)) != EOF)
-      switch(arg) {
-        case 'h':
-           usage(0); break;
-        case 'v':
-           fprintf(stdout, "%s:\t%s\n", argv[0], rcsid); exit(0);
-        case 's':
-           server = strdup(optarg); break;
-        case 'p':
-           port = atoi(optarg); break;
-        case 'f':
-           proxyfile = strdup(optarg); break;
-        case 'j':
-           jobid_str = strdup(optarg); break;
-        default:
-           usage(1); break;
-      }
-
-   if (optind >= argc)
-      usage(1);
-
-   if (jobid_str && edg_wlc_JobIdParse(jobid_str, &jobid)) {
-      fprintf(stderr, "Cannot parse jobid\n");
-      exit(1);
-   }
-
-   if (strcmp(argv[optind], "start") == 0) {
-      if (proxyfile == NULL || server == NULL || jobid == NULL)
-        usage(1);
-      ret = edg_wlpr_RegisterProxyExt(proxyfile, server, port, jobid, 0,
-                                     &repository_filename);
-      if (ret) {
-        fprintf(stderr, "Registering proxy failed: %s\n",
-                edg_wlpr_GetErrorText(ret));
-        exit(1);
-      }
-      printf("%s\n", repository_filename);
-      free(repository_filename);
-      exit(0);
-   }
-   else if (strcmp(argv[optind], "stop") == 0) {
-      if (jobid == NULL)
-        usage(1);
-      ret = edg_wlpr_UnregisterProxy(jobid, proxyfile);
-      if (ret) {
-        fprintf(stderr, "Unregistering proxy failed: %s\n",
-                edg_wlpr_GetErrorText(ret));
-        exit(1);
-      }
-   }
-   else if (strcmp(argv[optind], "get") == 0) {
-      if (jobid == NULL)
-        usage(1);
-      ret = edg_wlpr_GetProxy(jobid, &proxyfile);
-      if (ret) {
-        fprintf(stderr, "GET request failed: %s\n",
-                edg_wlpr_GetErrorText(ret));
-        exit(1);
-      }
-      printf("%s\n", proxyfile);
-      free(proxyfile);
-   }
-   else 
-      usage(1);
-
-   return 0;
-}
diff --git a/org.glite.security.proxyrenewal/src/commands.c b/org.glite.security.proxyrenewal/src/commands.c

deleted file mode 100644 (file)

index fc6235e..0000000
--- a/org.glite.security.proxyrenewal/src/commands.c
+++ /dev/null
@@ -1,1233 +0,0 @@
-#include "renewal_locl.h"
-#include "renewd_locl.h"
-
-#ifndef NOVOMS
-#include <voms_apic.h>
-#endif
-
-#ident "$Header$"
-
-#define SEPARATORS ",\n"
-#define RENEWAL_START_FRACTION 0.75 /* XXX */
-#define RENEWAL_CLOCK_SKEW (5 * 60)
-#define RENEWAL_MIN_LIFETIME (15 * 60)
-
-extern char *repository;
-extern time_t condor_limit;
-extern char *cadir;
-extern char *vomsdir;
-extern int voms_enabled;
-
-static char *
-strmd5(const char *s, unsigned char *digest);
-
-static int
-get_record_ext(FILE *fd, proxy_record *record, int *last_used_suffix);
-
-static int
-get_record(FILE *fd, proxy_record *record);
-
-static int
-store_record(char *basename, proxy_record *record);
-
-static int
-copy_file_content(FILE *in, FILE *out);
-
-static int
-copy_file(char *src, char *dst);
-
-static int
-get_base_filename(char *proxy_file, char **basefilename);
-
-int
-decode_record(char *line, proxy_record *record);
-
-int
-encode_record(proxy_record *record, char **line);
-
-static int
-open_metafile(char *proxy_file, FILE **fd);
-
-void
-free_record(proxy_record *record);
-
-static int
-realloc_prd_list(prd_list *list);
-
-/* make public: */
-static int
-edg_wlpr_GetTokenInt(const char *msg, const size_t msg_len,
-                     const char *key, const char *separators,
-                     int req_index, int *value);
-
-static void
-record_to_response(int status_code, proxy_record *record,
-                   edg_wlpr_Response *response);
-
-static int
-filename_to_response(char *filename, edg_wlpr_Response *response);
-
-
-
-
-static char *
-strmd5(const char *s, unsigned char *digest)
-{
-    MD5_CTX md5;
-    unsigned char   d[16];
-    int     i;
-    static char mbuf[33];
-
-    MD5_Init(&md5);
-    MD5_Update(&md5,s,strlen(s));
-    MD5_Final(d,&md5);
-
-    if (digest)
-       memcpy(digest,d,sizeof(d));
-    for (i=0; i<16; i++) {
-       int     dd = d[i] & 0x0f;
-       mbuf[2*i+1] = dd<10 ? dd+'0' : dd-10+'a';
-       dd = d[i] >> 4;
-       mbuf[2*i] = dd<10 ? dd+'0' : dd-10+'a';
-    }
-    mbuf[32] = 0;
-    return mbuf;
-}
-
-static int
-get_base_filename(char *proxy_file, char **basefilename)
-{
-   char *subject = NULL;
-   char file[FILENAME_MAX];
-   int ret;
-
-   assert(basefilename != NULL);
-
-   ret = get_proxy_base_name(proxy_file, &subject);
-   if (ret)
-      goto end;
-
-   snprintf(file, sizeof(file), "%s/%s", repository, strmd5(subject, NULL));
-   *basefilename = strdup(file); /* XXX test ENOMEM */
-   ret = 0;
-   
-end:
-   if (subject)
-      free(subject);
-   return ret;
-}
-
-static int
-copy_file_content(FILE *in, FILE *out)
-{
-   char buf[1024];
-   size_t num;
-   int ret;
-
-   while (1) {
-      num = fread(buf, sizeof(*buf), sizeof(buf), in);
-      if ((ret = ferror(in))) {
-        edg_wlpr_Log(LOG_ERR, "Reading failed: %s", strerror(errno));
-        return ret;
-      }
-      num = fwrite(buf, sizeof(*buf), num, out);
-      if ((ret = ferror(in))) {
-        edg_wlpr_Log(LOG_ERR, "Writing failed: %s", strerror(errno));
-        return ret;
-      }
-      if (feof(in))
-        return 0;
-   }
-}
-
-/* return the time interval, after which the renewal should be started */
-static time_t
-get_delta(time_t current_time, time_t start_time, time_t end_time)
-{
-   time_t length, lifetime;
-   time_t delta;
-   int condor_tested = 0;
-
-   lifetime = end_time - start_time;
-   delta = 0;
-   while (1) {
-      if (end_time - current_time <= RENEWAL_MIN_LIFETIME)
-        /* if the proxy is too short, renew it as soon as possible */
-        return RENEWAL_CLOCK_SKEW;
-
-      /* renewal starts at 3/4 of lifetime */
-      length = end_time - (start_time + delta);
-      delta += length * RENEWAL_START_FRACTION;
-
-      if (!condor_tested && delta > lifetime - condor_limit) {
-        /* Condor requires the proxies to be renewed a specified time interval
-            before the proxies have expired (see the 
-           GRIDMANAGER_MINIMUM_PROXY_TIME variable). We must ensure that
-           renewal takes place before Condor does this check */
-        if (current_time > end_time - condor_limit) {
-           edg_wlpr_Log(LOG_ERR, "Proxy lifetime exceeded value of the Condor limit!"); 
-        }
-        else
-           delta = lifetime - condor_limit - RENEWAL_CLOCK_SKEW;
-        condor_tested = 1;
-      }
-
-      if (abs(current_time - (start_time + delta)) < RENEWAL_CLOCK_SKEW)
-        continue;
-      
-      return (start_time + delta) - current_time;
-   };
-
-   /* not reachable */
-   return 0;
-}
-
-int
-get_times(char *proxy_file, proxy_record *record)
-{
-   FILE *fd;
-   X509 *cert = NULL;
-   ASN1_UTCTIME *asn1_time = NULL;
-   int ret;
-   time_t current_time, start_time, end_time;
-
-   assert(record != NULL);
-   assert(proxy_file != NULL);
-
-   fd = fopen(proxy_file, "r");
-   if (fd == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Opening proxy file %s failed: %s",
-                  proxy_file, strerror(errno));
-      return errno;
-   }
-
-   cert = PEM_read_X509(fd, NULL, NULL, NULL);
-   if (cert == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot read X.509 certificate from %s",
-                  proxy_file);
-      ret = -1; /* XXX SSL_ERROR */
-      goto end;
-   }
-
-   asn1_time = ASN1_UTCTIME_new();
-   X509_gmtime_adj(asn1_time,0);
-   globus_gsi_cert_utils_make_time(X509_get_notAfter(cert), &end_time);
-   globus_gsi_cert_utils_make_time(X509_get_notBefore(cert), &start_time);
-   current_time = time(NULL);
-   ASN1_UTCTIME_free(asn1_time);
-   /* if (end_time - RENEWAL_CLOCK_SKEW < current_time) { Too short proxy } */
-   if (end_time + RENEWAL_CLOCK_SKEW < current_time) {
-      edg_wlpr_Log(LOG_ERR, "Expired proxy in %s", proxy_file);
-      ret = EDG_WLPR_PROXY_EXPIRED;
-      goto end;
-   }
-
-   /* Myproxy seems not to do check on expiration and return expired proxies
-      if credentials in repository are expired */
-   X509_free(cert);
-   cert = NULL;
-   while (1) {
-      time_t tmp_end;
-      /* see http://www.openssl.org/docs/crypto/pem.html section BUGS */
-      cert = PEM_read_X509(fd, NULL, NULL, NULL);
-      if (cert == NULL) {
-        if (ERR_GET_REASON(ERR_peek_error()) == PEM_R_NO_START_LINE) {
-           /* End of file reached. no error */
-           ERR_clear_error();
-           break;
-        }
-        edg_wlpr_Log(LOG_ERR, "Cannot read additional certificates from %s",
-                     proxy_file);
-        ret = -1; /* XXX SSL_ERROR */
-        goto end;
-      }
-      globus_gsi_cert_utils_make_time(X509_get_notAfter(cert), &tmp_end);
-      if (tmp_end + RENEWAL_CLOCK_SKEW < current_time) {
-        edg_wlpr_Log(LOG_ERR, "Expired proxy in %s", proxy_file);
-        ret = EDG_WLPR_PROXY_EXPIRED;
-        goto end;
-      }
-      X509_free(cert);
-      cert = NULL;
-   }
-
-   record->next_renewal = current_time + get_delta(current_time, start_time,
-                                                  end_time);
-   record->end_time = end_time;
-   ret = 0;
-
-end:
-   fclose(fd);
-   if (cert)
-      X509_free(cert);
-
-   return ret;
-}
-
-static int
-copy_file(char *src, char *dst)
-{
-   FILE *from = NULL;
-   FILE *tmp_to = NULL;
-   int tmp_fd;
-   char tmpfile[FILENAME_MAX];
-   int ret;
-
-   if (strcmp(src, dst) == 0)
-      return 0; 
-
-   from = fopen(src, "r");
-   if (from == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open file %s for reading (%s)",
-                  src, strerror(errno));
-      return errno;
-   }
-
-   snprintf(tmpfile, sizeof(tmpfile), "%s.XXXXXX", dst);
-   tmp_fd = mkstemp(tmpfile);
-   if (tmp_fd == -1) {
-      edg_wlpr_Log(LOG_ERR, "Cannot create temporary file (%s)",
-                  strerror(errno));
-      ret = errno;
-      goto end;
-   }
-
-
-   tmp_to = fdopen(tmp_fd, "w");
-   if (tmp_to == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot associate stream with temporary file (%s)",
-                  strerror(errno));
-      unlink(tmpfile);
-      ret = errno;
-      goto end;
-   }
-
-   ret = copy_file_content(from, tmp_to);
-   fclose(tmp_to);
-   if (ret) {
-      goto end;
-   }
-
-   ret = rename(tmpfile, dst);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Cannot replace repository file %s with temporary file (%s)",
-                  strerror(errno));
-      unlink(tmpfile);
-      ret = errno;
-      goto end;
-   }
-   tmp_to = NULL;
-      
-end:
-   fclose(from);
-   close(tmp_fd);
-   unlink(tmpfile);
-
-   return ret;
-}
-
-void
-free_record(proxy_record *record)
-{
-   int i;
-
-   if (record == NULL)
-      return;
-   if (record->myproxy_server)
-      free(record->myproxy_server);
-   if (record->jobids.val) {
-      for (i = 0; i < record->jobids.len; i++)
-        free(record->jobids.val[i]);
-      free(record->jobids.val);
-   }
-   memset(record, 0, sizeof(*record));
-}
-
-static int
-realloc_prd_list(prd_list *list)
-{
-   char **tmp;
-
-   tmp = realloc(list->val, (list->len + 1) * sizeof(*list->val));
-   if (tmp == NULL)
-      return ENOMEM;
-   list->val = tmp;
-   list->len++;
-   return 0;
-}
-
-static int
-get_jobids(const char *msg, const size_t msg_len, proxy_record *record)
-{
-   int index = 0;
-   int ret;
-   char *value;
-   char **tmp;
-
-   memset(&record->jobids, 0, sizeof(record->jobids));
-   while ((ret = edg_wlpr_GetToken(msg, msg_len, "jobid=", SEPARATORS,
-                                  index, &value)) == 0) {
-      tmp = realloc(record->jobids.val, (record->jobids.len + 1) * sizeof(*tmp));
-      if (tmp == NULL) {
-        ret = ENOMEM;
-        break;
-      }
-      record->jobids.val = tmp;
-      record->jobids.val[index] = value;
-      record->jobids.len++;
-      index++;
-   }
-   if (ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      if (record->jobids.len)
-        free(record->jobids.val);
-      record->jobids.len = 0;
-      record->jobids.val = NULL;
-      return ret;
-   }
-
-   return 0;
-}
-
-static int
-edg_wlpr_GetTokenInt(const char *msg, const size_t msg_len,
-                     const char *key, const char *separators,
-                    int req_index, int *value)
-{
-   int ret;
-   char *str_value = NULL;
-
-   ret = edg_wlpr_GetToken(msg, msg_len, key, separators, req_index, &str_value);
-   if (ret)
-      return ret;
-
-   ret = edg_wlpr_DecodeInt(str_value, value);
-   free(str_value);
-   return ret;
-}
-
-int
-decode_record(char *line, proxy_record *record)
-{
-   /* line must be ended with '\0' */
-   int ret;
-   size_t len;
-
-   assert(line != NULL);
-   assert(record != NULL);
-
-   memset(record, 0, sizeof(*record));
-
-   len = strlen(line) + 1;
-
-   ret = edg_wlpr_GetTokenInt(line, len, "suffix=", SEPARATORS, 0,
-                             &record->suffix);
-   if (ret)
-      return ret;
-
-#if 0
-   ret = edg_wlpr_GetTokenInt(line, len, "counter=", SEPARATORS, 0, 
-                             &record->counter);
-   if (ret)
-      goto end;
-#endif
-
-   ret = edg_wlpr_GetTokenInt(line, len, "unique=", SEPARATORS, 0,
-                             &record->unique);
-   if (ret)
-      goto end;
-
-   ret = edg_wlpr_GetTokenInt(line, len, "voms_exts=", SEPARATORS, 0,
-                             &record->voms_exts);
-
-   ret = edg_wlpr_GetToken(line, len, "server=", SEPARATORS, 0,
-                          &record->myproxy_server);
-   if (ret)
-      goto end;
-
-   ret = edg_wlpr_GetTokenInt(line, len, "next_renewal=", SEPARATORS, 0,
-                             (int *)&record->next_renewal);
-   if (ret)
-      goto end;
-
-   ret = edg_wlpr_GetTokenInt(line, len, "end_time=", SEPARATORS, 0,
-                             (int *)&record->end_time);
-   if (ret)
-      goto end;
-
-   ret = get_jobids(line, len, record);
-   if (ret)
-      goto end;
-
-end:
-   if (ret)
-      free_record(record);
-
-   return ret;
-}
-
-int
-encode_record(proxy_record *record, char **line)
-{
-   char tmp_line[1024];
-   size_t jobids_len = 0;
-   int i;
-   
-   snprintf(tmp_line, sizeof(tmp_line), "suffix=%d, unique=%d, voms_exts=%d, server=%s, next_renewal=%ld, end_time=%ld",
-          record->suffix, record->unique, record->voms_exts,
-          (record->myproxy_server) ? record->myproxy_server : "",
-          record->next_renewal, record->end_time);
-   for (i = 0; i < record->jobids.len; i++)
-      /* alloc space for string ", jobid=<jobid>" */
-      jobids_len += 2 + strlen("jobid=") + strlen(record->jobids.val[i]);
-
-   *line = calloc(1, strlen(tmp_line) + jobids_len + 1);
-   if (*line == NULL)
-      return ENOMEM;
-
-   strcat(*line, tmp_line);
-   memset(tmp_line, 0, sizeof(tmp_line));
-
-   for (i = 0; i < record->jobids.len; i++) {
-      snprintf(tmp_line, sizeof(tmp_line), ", jobid=%s", record->jobids.val[i]);
-      strcat(*line, tmp_line);
-   }
-
-   return 0;
-}
-
-/* Get proxy record from the index file. If no suffix is defined return a free 
-   record with the smallest index */
-static int
-get_record_ext(FILE *fd, proxy_record *record, int *last_used_suffix)
-{
-   char line[1024];
-   int last_suffix = -1;
-   int ret;
-   char *p;
-   proxy_record tmp_record;
-   time_t current_time;
-
-   assert(record != NULL);
-   memset(&tmp_record, 0, sizeof(tmp_record));
-
-   current_time = time(NULL);
-   while (fgets(line, sizeof(line), fd) != NULL) {
-      free_record(&tmp_record);
-      p = strchr(line, '\n');
-      if (p)
-        *p = '\0';
-      ret = decode_record(line, &tmp_record);
-      if (ret)
-        return ret; /* XXX continue */
-      if (record->suffix >= 0) {
-        if (record->suffix == tmp_record.suffix) {
-           record->suffix = tmp_record.suffix;
-           record->jobids.len = tmp_record.jobids.len;
-           record->jobids.val = tmp_record.jobids.val;
-           record->unique = tmp_record.unique;
-           record->voms_exts = tmp_record.voms_exts;
-           if (record->myproxy_server)
-              free(record->myproxy_server);
-           record->myproxy_server = tmp_record.myproxy_server;
-           record->end_time = tmp_record.end_time;
-           record->next_renewal = tmp_record.next_renewal;
-           return 0;
-        } else
-           continue;
-      }
-      if (tmp_record.suffix > last_suffix)
-        last_suffix = tmp_record.suffix;
-
-      /* if no particular suffix was specified get the first free record 
-        available */
-      if (tmp_record.jobids.len >= MAX_PROXIES || tmp_record.unique || 
-         tmp_record.voms_exts)
-        continue;
-
-      if (tmp_record.jobids.len == 0) {
-        /* no jobs registered for this record, so use it initialized with the
-         * parameters (currently myproxy location) provided by user */
-        char *server = record->myproxy_server;
-
-        memset(record, sizeof(*record), 0);
-        record->suffix = tmp_record.suffix;
-        if (record->myproxy_server)
-           free(record->myproxy_server);
-        record->myproxy_server = server;
-        free_record(&tmp_record);
-        return 0;
-      }
-
-      if (tmp_record.jobids.len > 0 && record->myproxy_server &&
-         strcmp(record->myproxy_server, tmp_record.myproxy_server) != 0)
-        continue;
-
-      if (tmp_record.jobids.len > 0 &&
-         tmp_record.end_time - current_time < condor_limit) {
-        /* skip expired proxy (and that ones that are going to expire soon),
-           leaving it untouched (it will be removed after next run of the 
-           renewal process */
-        continue;
-      }
-
-      record->suffix = tmp_record.suffix;
-      record->jobids.len = tmp_record.jobids.len;
-      record->jobids.val = tmp_record.jobids.val;
-      record->unique = tmp_record.unique;
-      record->voms_exts = tmp_record.voms_exts;
-      if (record->myproxy_server)
-        free(record->myproxy_server);
-      record->myproxy_server = tmp_record.myproxy_server;
-      record->end_time = tmp_record.end_time;
-      record->next_renewal = tmp_record.next_renewal;
-      return 0;
-   }
-
-   if (last_used_suffix)
-      *last_used_suffix = last_suffix;
-
-   if (record->suffix >= 0) {
-      edg_wlpr_Log(LOG_DEBUG, "Requested suffix %d not found in meta file",
-                  record->suffix);
-   }
-
-   free_record(&tmp_record);
-
-   return EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND;
-}
-
-static int
-get_record(FILE *fd, proxy_record *record)
-{
-   return get_record_ext(fd, record, NULL);
-}
-
-static int
-store_record(char *basename, proxy_record *record)
-{
-   int stored = 0;
-   FILE *fd = NULL;
-   int temp;
-   char line[1024];
-   char *new_line = NULL;
-   int ret, i;
-   char *p;
-   proxy_record tmp_record;
-   char tmp_file[FILENAME_MAX];
-   char meta_file[FILENAME_MAX];
-
-   assert (record != NULL);
-
-   memset(&tmp_record, 0, sizeof(tmp_record));
-
-   snprintf(meta_file, sizeof(meta_file), "%s.data", basename);
-   snprintf(tmp_file, sizeof(tmp_file), "%s.XXXXXX", meta_file);
-
-   temp = mkstemp(tmp_file);
-   if (temp < 0)
-      return errno;
-
-   fd = fopen(meta_file, "r");
-   if (fd == NULL) {
-      ret = errno;
-      goto end;
-   }
-   while (fgets(line, sizeof(line), fd) != NULL) {
-      free_record(&tmp_record);
-      p = strchr(line, '\n');
-      if (p)
-        *p = '\0';
-      ret = decode_record(line, &tmp_record);
-      if (ret)
-        goto end;
-      if (record->suffix == tmp_record.suffix &&
-         record->unique == tmp_record.unique) {
-        tmp_record.next_renewal = record->next_renewal;
-        tmp_record.end_time = record->end_time;
-        tmp_record.voms_exts = record->voms_exts;
-        if (tmp_record.myproxy_server != NULL)
-           free(tmp_record.myproxy_server);
-        tmp_record.myproxy_server = strdup(record->myproxy_server);
-        if (tmp_record.jobids.val) {
-           for (i = 0; i < tmp_record.jobids.len; i++)
-               free(tmp_record.jobids.val[i]);
-           free(tmp_record.jobids.val);
-        }
-        tmp_record.jobids.len = 0;
-        tmp_record.jobids.val = NULL;
-        for (i = 0; i < record->jobids.len; i++) {
-           realloc_prd_list(&tmp_record.jobids);
-           tmp_record.jobids.val[tmp_record.jobids.len - 1] = 
-              strdup(record->jobids.val[i]);
-        }
-        stored = 1;
-      }
-      ret = encode_record(&tmp_record, &new_line);
-      if (ret)
-        goto end;
-      dprintf(temp, "%s\n", new_line);
-      free(new_line);
-      new_line = NULL;
-   }
-   if (! stored) {
-      ret = encode_record(record, &new_line);
-      if (ret)
-        goto end;
-      ret = dprintf(temp, "%s\n", new_line);
-      free(new_line);
-      new_line = NULL;
-   }
-   fclose(fd); fd = NULL;
-   close(temp);
-
-   ret = rename(tmp_file, meta_file);
-   if (ret)
-      ret = errno;
-
-end:
-   free_record(&tmp_record);
-   if (fd)
-      fclose(fd);
-   close(temp);
-   return ret;
-}
-
-static int
-open_metafile(char *basename, FILE **fd)
-{
-   FILE *meta_fd;
-   char meta_filename[FILENAME_MAX];
-
-   snprintf(meta_filename, sizeof(meta_filename), "%s.data", basename);
-   meta_fd = fopen(meta_filename, "a+");
-   if (meta_fd == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Opening meta file %s failed (%s)",
-                  meta_filename, strerror(errno));
-      return errno;
-   }
-   rewind(meta_fd);
-   *fd = meta_fd;
-   edg_wlpr_Log(LOG_DEBUG, "Using meta file %s", meta_filename);
-   return 0;
-}
-
-static int
-filename_to_response(char *filename, edg_wlpr_Response *response)
-{
-   response->filenames = malloc(2 * sizeof(*response->filenames));
-   if (response->filenames == NULL) {
-      edg_wlpr_Log(LOG_DEBUG, "Not enough memory");
-      return errno;
-   }
-   response->filenames[0] = strdup(filename);
-   if (response->filenames[0] == NULL) {
-      edg_wlpr_Log(LOG_DEBUG, "Not enough memory");
-      free(response->filenames);
-      return errno;
-   }
-   response->filenames[1] = NULL;
-   return 0;
-}
-
-static void
-record_to_response(int status_code, proxy_record *record,
-                  edg_wlpr_Response *response)
-{
-   /* XXX Neni struktrura proxy_record zbytecna? Mohla by se pouzivat primo
-      edg_wlpr_Response? */
-   response->response_code = status_code; /* XXX chyba parsovatelna pres API */
-   if (status_code)
-      return;
-
-   if (response->myproxy_server) {
-      response->myproxy_server = strdup(record->myproxy_server);
-      if (response->myproxy_server == NULL) {
-        response->response_code = ENOMEM; /* XXX */
-        return;
-      }
-   }
-   response->end_time = record->end_time;
-   response->next_renewal_time = record->next_renewal;
-   /* XXX use jobid response->counter = record->counter; */
-}
-
-int
-check_proxyname(char *datafile, char *jobid, char **filename)
-{
-   proxy_record record;
-   FILE *meta_fd = NULL;
-   char line[1024];
-   char proxy[FILENAME_MAX];
-   char *p;
-   int ret, i;
-
-   memset(&record, 0, sizeof(record));
-
-   meta_fd = fopen(datafile, "r");
-   if (meta_fd == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open meta file %s (%s)",
-                  datafile, strerror(errno));
-      return errno;
-   }
-
-   while (fgets(line, sizeof(line), meta_fd) != NULL) {
-      free_record(&record);
-      p = strchr(line, '\n');
-      if (p)
-        *p = '\0';
-      ret = decode_record(line, &record);
-      if (ret)
-        continue; /* XXX exit? */
-      for (i = 0; i < record.jobids.len; i++) {
-        if (strcmp(jobid, record.jobids.val[i]) == 0) {
-           snprintf(proxy, sizeof(proxy), "%s/%s", repository, datafile);
-           p = strrchr(proxy, '.');
-           sprintf(p, ".%d", record.suffix);
-           *filename = strdup(proxy);
-            free_record(&record);
-           fclose(meta_fd);
-           return 0;
-        }
-      }
-   }
-   free_record(&record);
-   fclose(meta_fd);
-   return EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND;
-}
-      
-int
-find_proxyname(char *jobid, char **filename)
-{
-   DIR *dir = NULL;
-   struct dirent *file;
-   int ret;
-   
-   chdir(repository);
-
-   dir = opendir(repository);
-   if (dir == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open repository directory %s (%s)",
-                  repository, strerror(errno));
-      return errno;
-   }
-
-   while ((file = readdir(dir))) {
-      /* read files of format `md5sum`.data, where md5sum() is of fixed length
-        32 chars */
-      if (file->d_name == NULL || strlen(file->d_name) != 37 ||
-         strcmp(file->d_name + 32, ".data") != 0)
-        continue;
-      ret = check_proxyname(file->d_name, jobid, filename);
-      if (ret == 0) {
-        closedir(dir);
-        return 0;
-      }
-   }
-   closedir(dir);
-   edg_wlpr_Log(LOG_ERR, "Requested proxy is not registered");
-   return EDG_WLPR_PROXY_NOT_REGISTERED;
-}
-
-#ifdef NOVOMS
-int
-find_voms_cert(char *file, int *present)
-{
-       *present = 0;
-       return 0;
-}
-
-#else
-int
-find_voms_cert(char *file, int *present)
-{
-   struct vomsdata *voms_info = NULL;
-   STACK_OF(X509) *chain = NULL;
-   EVP_PKEY *privkey = NULL;
-   X509 *cert = NULL;
-   int ret, err;
-   
-   *present = 0;
-
-   voms_info = VOMS_Init(vomsdir, cadir);
-   if (voms_info == NULL) {
-      edg_wlpr_Log(LOG_ERR, "check_voms_cert(): Cannot initialize VOMS context (VOMS_Init() failed, probably voms dir was not specified)");
-      return EDG_WLPR_ERROR_VOMS;
-   }
-
-   ret = load_proxy(file, &cert, &privkey, &chain);
-   if (ret) {
-      VOMS_Destroy(voms_info);
-      return ret;
-   }
-
-   ret = VOMS_Retrieve(cert, chain, RECURSE_CHAIN, voms_info, &err);
-   if (ret == 1) {
-      *present = 1;
-   }
-
-   VOMS_Destroy(voms_info);
-   X509_free(cert);
-   EVP_PKEY_free(privkey);
-   sk_X509_pop_free(chain, X509_free);
-   return 0;
-}
-#endif
-
-void
-register_proxy(edg_wlpr_Request *request, edg_wlpr_Response *response)
-{
-   proxy_record record;
-   int ret;
-   FILE *meta_fd = NULL;
-   int last_suffix;
-   char *basename = NULL;
-   char filename[FILENAME_MAX];
-
-   assert(request != NULL);
-   assert(response != NULL);
-
-   memset(&record, 0, sizeof(record));
-   memset(response, 0, sizeof(*response));
-   edg_wlpr_Log(LOG_DEBUG, "Registration request for %s", request->proxy_filename);
-
-   if (request->proxy_filename == NULL || request->jobid == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Registration request doesn't contain registration information");
-      return; /*  EINVAL; */
-   }
-   umask(0177);
-
-   ret = get_base_filename(request->proxy_filename, &basename);
-   if (ret)
-      goto end;
-
-   ret = open_metafile(basename, &meta_fd);
-   if (ret)
-      goto end;
-
-   if (voms_enabled)
-     ret = find_voms_cert(request->proxy_filename, &record.voms_exts);
-     /* ignore VOMS related error */
-
-   /* Find first free record */
-   record.suffix = -1;
-   record.myproxy_server = strdup(request->myproxy_server);
-   ret = get_record_ext(meta_fd, &record, &last_suffix);
-   fclose(meta_fd); meta_fd = NULL;
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto end;
-
-   if (ret == EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND || record.jobids.len == 0 || request->unique || record.voms_exts) {
-      /* create a new proxy file in the repository */
-      int suffix;
-
-      suffix = (record.jobids.len == 0 && record.suffix >= 0) ? 
-                record.suffix : last_suffix + 1;
-      snprintf(filename, sizeof(filename), "%s.%d", basename, suffix);
-      ret = copy_file(request->proxy_filename, filename);
-      if (ret)
-        goto end;
-      ret = get_times(filename, &record);
-      if (ret)
-        goto end;
-      record.suffix = suffix;
-      ret = realloc_prd_list(&record.jobids);
-      if (ret)
-        goto end;
-      record.jobids.val[record.jobids.len - 1] = strdup(request->jobid);
-      record.unique = request->unique;
-      edg_wlpr_Log(LOG_DEBUG, "Created a new proxy file in repository (%s)",
-                  filename);
-   } else {
-      ret = realloc_prd_list(&record.jobids);
-      if (ret)
-        goto end;
-      record.jobids.val[record.jobids.len - 1] = strdup(request->jobid);
-      snprintf(filename, sizeof(filename), "%s.%d", basename, record.suffix);
-      edg_wlpr_Log(LOG_DEBUG, "Inremented counter on %s", filename);
-   }
-
-   ret = store_record(basename, &record);
-
-end:
-   if (meta_fd) {
-      fclose(meta_fd);
-   }
-
-   if (basename)
-      free(basename);
-
-   if (ret == 0)
-      ret = filename_to_response(filename, response);
-   record_to_response(ret, &record, response);
-   free_record(&record);
-}
-
-void
-unregister_proxy(edg_wlpr_Request *request, edg_wlpr_Response *response)
-{
-   proxy_record record;
-   int ret, i, index;
-   FILE *meta_fd = NULL;
-   char *basename = NULL;
-   char *p;
-   struct stat stat_buf;
-
-   memset(&record, 0, sizeof(record));
-   edg_wlpr_Log(LOG_DEBUG, "Unregistration request for %s", request->jobid);
-
-   if (request->jobid == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Unregistration request doesn't contain needed information");
-      ret = EINVAL;
-      goto end;
-   }
-
-   if (request->proxy_filename == NULL) {
-      ret = find_proxyname(request->jobid, &request->proxy_filename);
-      if (ret)
-        goto end;
-   }
-
-   ret = get_base_filename(request->proxy_filename, &basename);
-   if (ret) {
-      goto end;
-   }
-
-   if (strncmp(request->proxy_filename, basename, strlen(basename) != 0)) {
-      edg_wlpr_Log(LOG_DEBUG, "Requested proxy %s is not from repository",
-                  request->proxy_filename);
-      ret = EDG_WLPR_PROXY_NOT_REGISTERED;
-      goto end;
-   }
-
-   p = strrchr(request->proxy_filename, '.');
-   if (p == NULL) {
-      edg_wlpr_Log(LOG_DEBUG, "Requested proxy %s is not from repository",
-                  request->proxy_filename);
-      ret = EDG_WLPR_PROXY_NOT_REGISTERED;
-      goto end;
-   }
-
-   ret = edg_wlpr_DecodeInt(p+1, &record.suffix);
-   if (ret) {
-      edg_wlpr_Log(LOG_DEBUG, "Requested proxy %s is not from repository",
-                 request->proxy_filename);
-      ret = EDG_WLPR_PROXY_NOT_REGISTERED;
-      goto end;
-   }
-
-   ret = open_metafile(basename, &meta_fd);
-   if (ret) {
-      /* fill in error response */
-      return;
-   }
-
-   ret = get_record(meta_fd, &record);
-   if (ret)
-      goto end;
-
-   ret = EDG_WLPR_PROXY_NOT_REGISTERED;
-   for (i = 0; i < record.jobids.len; i++)
-      if (strcmp(request->jobid, record.jobids.val[i]) == 0) {
-        ret = 0;
-        break;
-      }
-   if (ret) {
-      edg_wlpr_Log(LOG_DEBUG, "Requested proxy %s is not registered",
-                  request->proxy_filename);
-      goto end;
-   }
-
-   /* remove jobid from the list */
-   index = i;
-   free(record.jobids.val[i]);
-   record.jobids.len--;
-   for (i = index; i < record.jobids.len; i++)
-      record.jobids.val[i] = record.jobids.val[i+1];
-
-   if (record.jobids.len == 0) {
-      record.unique = 0;
-      record.voms_exts = 0;
-      record.end_time = 0;
-      record.next_renewal = 0;
-   }
-
-   ret = stat(request->proxy_filename, &stat_buf);
-   if (ret) {
-      edg_wlpr_Log(LOG_DEBUG, "Cannot stat file %s: (%s)",
-                  request->proxy_filename, strerror(errno));
-      ret = errno;
-      goto end;
-   }
-
-   ret = store_record(basename, &record);
-   if (ret)
-      goto end;
-
-   if (record.jobids.len == 0)
-      unlink(request->proxy_filename);
-
-end:
-   if (meta_fd) {
-      fclose(meta_fd);
-   }
-   if (basename)
-      free(basename);
-
-   if (ret == 0)
-      ret = filename_to_response(request->proxy_filename, response);
-   record_to_response(ret, &record, response);
-   free_record(&record);
-}
-
-void
-get_proxy(edg_wlpr_Request *request, edg_wlpr_Response *response)
-{
-   char *filename = NULL;
-   int ret;
-
-   memset(response, 0, sizeof(*response));
-
-   edg_wlpr_Log(LOG_DEBUG, "GET request for %s", request->jobid);
-   
-   if (request->jobid == NULL) {
-      edg_wlpr_Log(LOG_ERR, "GET request doesn't contain jobid specification");
-      ret = EINVAL;
-      goto end;
-   }
-
-   ret = find_proxyname(request->jobid, &filename);
-
-end:
-   if (ret == 0)
-      ret = filename_to_response(filename, response);
-   if (filename)
-      free(filename);
-   response->response_code = ret;
-}
-
-void
-update_db(edg_wlpr_Request *request, edg_wlpr_Response *response)
-{
-   FILE *fd = NULL;
-   int tmp_fd = -1;
-   int suffix = -1;
-   char tmp_file[FILENAME_MAX];
-   char cur_proxy[FILENAME_MAX];
-   char datafile[FILENAME_MAX];
-   char line[1024];
-   char *new_line = NULL;
-   char *basename, *proxy = NULL;
-   char **entry;
-   proxy_record record;
-   int ret;
-   char *p;
-   time_t current_time;
-
-   memset(&record, 0, sizeof(record));
-
-   edg_wlpr_Log(LOG_DEBUG, "UPDATE_DB request for %s", request->proxy_filename);
-
-   chdir(repository);
-   basename = request->proxy_filename;
-
-   snprintf(datafile, sizeof(datafile), "%s.data", basename);
-   fd = fopen(datafile, "r");
-   if (fd == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open meta file %s (%s)",
-                  datafile, strerror(errno));
-      ret = errno;
-      return;
-   }
-
-   snprintf(tmp_file, sizeof(tmp_file), "%s.XXXXXX", datafile);
-   tmp_fd = mkstemp(tmp_file);
-   if (tmp_fd < 0) {
-      edg_wlpr_Log(LOG_ERR, "Cannot create temporary file (%s)",
-                  strerror(errno));
-      ret = errno;
-      goto end;
-   }
-
-   entry = request->entries;
-   if (entry) {
-      p = strchr(*entry, ':');
-      *p = '\0';
-      suffix = atoi(*entry);
-      proxy = p+1;
-   }
-
-   current_time = time(NULL);
-
-   while (fgets(line, sizeof(line), fd) != NULL) { 
-      free_record(&record);
-      p = strchr(line, '\n');
-      if (p)
-        *p = '\0';
-      ret = decode_record(line, &record);
-      if (ret)
-        goto end;
-      
-      if (record.suffix > suffix && entry && *entry) {
-        do {
-           entry++;
-           if (entry == NULL || *entry == NULL) {
-              suffix = -1;
-              break;
-           }
-           
-           p = strchr(*entry, ':');
-           suffix = atoi(*entry);
-           proxy = p+1;
-        } while (record.suffix > suffix);
-      }
-
-      if (record.suffix == suffix) {
-        snprintf(cur_proxy, sizeof(cur_proxy), "%s.%d", basename, suffix);
-        if (proxy == NULL || *proxy == '\0') {
-           /* if proxy isn't specified use file registered currently and
-            * reschedule renewal */
-           if (record.end_time < current_time) {
-              char *server;
-              /* remove file with expired proxy and clean the record in db */
-              unlink(cur_proxy);
-              server = strdup(record.myproxy_server);
-              free_record(&record);
-              record.suffix = suffix;
-              record.myproxy_server = server;
-              edg_wlpr_Log(LOG_WARNING, "Removed expired proxy (suffix %d)",
-                           suffix);
-           } else
-              get_times(cur_proxy, &record);
-        } else {
-           ret = get_times(proxy, &record);
-           (ret == 0) ? rename(proxy, cur_proxy) : unlink(proxy);
-        }
-      }
-      
-      ret = encode_record(&record, &new_line);
-      if (ret)
-        goto end;
-
-      dprintf(tmp_fd, "%s\n", new_line);
-      free(new_line);
-      new_line = NULL;
-   }
-   free_record(&record);
-
-   close(tmp_fd);
-   fclose(fd);
-
-   rename(tmp_file, datafile);
-
-   return;
-
-end:
-   if (fd)
-      fclose(fd);
-   unlink(tmp_file);
-   if (tmp_fd > 0)
-      close(tmp_fd);
-   free_record(&record);
-
-   return;
-}
diff --git a/org.glite.security.proxyrenewal/src/common.c b/org.glite.security.proxyrenewal/src/common.c

deleted file mode 100644 (file)

index 87fff76..0000000
--- a/org.glite.security.proxyrenewal/src/common.c
+++ /dev/null
@@ -1,239 +0,0 @@
-#include "renewal_locl.h"
-
-#ident "$Header$"
-
-/* nread() and nwrite() never return partial data */
-static size_t
-nread(int sock, char *buf, size_t buf_len)
-{
-   size_t count;
-   size_t remain = buf_len;
-   char *cbuf = buf;
-
-   while (remain > 0) {
-      count = read(sock, cbuf, remain);
-      if (count < 0) {
-        if (errno == EINTR)
-           continue;
-        else
-           return count;
-      } else
-        if (count == 0) {
-           return count;
-        }
-      cbuf += count;
-      remain -= count;
-   }
-   return buf_len;
-}
-
-static size_t
-nwrite(int sock, const char *buf, size_t buf_len)
-{
-   const char *cbuf = buf;
-   size_t count;
-   size_t remain = buf_len;
-
-   while (remain > 0) {
-      count = write(sock, cbuf, remain);
-      if (count < 0) {
-        if (errno == EINTR)
-           continue;
-        else
-           return count;
-      }
-      cbuf += count;
-      remain -= count;
-   }
-   return buf_len;
-}
-
-int
-edg_wlpr_Read(int sock, char **buf, size_t *buf_len)
-{
-   int ret;
-   unsigned char length[4];
-
-   ret = nread(sock, length, 4);
-   if (ret == -1) {
-      *buf_len = 0;
-      return errno;
-   }
-   if (ret < 4) {
-      *buf_len = 0;
-      return EDG_WLPR_ERROR_UNEXPECTED_EOF; /* XXX vraci i kdyz peer spadne a zavre trubku */
-   }
-   *buf_len = (length[0] << 24) | 
-              (length[1] << 16) | 
-             (length[2] << 8 ) | 
-             (length[3] << 0);
-
-   *buf = malloc(*buf_len);
-   if (*buf == NULL)
-      return ENOMEM;
-
-   ret = nread(sock, *buf, *buf_len);
-   if (ret != *buf_len) {
-      free(*buf);
-      *buf_len = 0;
-      return errno;
-   }
-
-   return 0;
-}
-
-int
-edg_wlpr_Write(int sock, char *buf, size_t buf_len)
-{
-   unsigned char length[4];
-
-   length[0] = (buf_len >> 24) & 0xFF;
-   length[1] = (buf_len >> 16) & 0xFF;
-   length[2] = (buf_len >> 8)  & 0xFF;
-   length[3] = (buf_len >> 0)  & 0xFF;
-
-   if (nwrite(sock, length, 4) != 4 ||
-       nwrite(sock, buf, buf_len) != buf_len)
-       return errno;
-   
-   return 0;
-}
-
-int
-edg_wlpr_GetToken(const char *msg, const size_t msg_len, 
-                  const char *key, const char *separators,
-                 int req_index, char **value)
-{
-   char *p;
-   size_t len;
-   int index;
-
-   assert(separators != NULL);
-
-   /* Add ending zero ? */
-
-   index = 0;
-   p = (char *)msg;
-   while (p && (p = strstr(p, key))) {
-     if (index == req_index)
-       break;
-     index++;
-     p += strlen(key);
-   }
-   if (p == NULL)
-      return EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND;
-
-   p = strchr(p, '=');
-   if (p == NULL)
-      return EDG_WLPR_ERROR_PROTO_PARSE_ERROR;
-
-   len = strcspn(p+1, separators);
-   if (len == 0)
-      return EDG_WLPR_ERROR_PROTO_PARSE_ERROR;
-
-   *value = malloc(len + 1);
-   if (*value == NULL)
-      return ENOMEM;
-
-   memcpy(*value, p+1, len);
-   (*value)[len] = '\0';
-
-   return 0;
-}
-
-int
-edg_wlpr_StoreToken(char **buf, size_t *buf_len, char *command,
-                    char *value, const char *separator)
-{
-   char line[2048];
-   char *tmp;
-
-   assert(buf != NULL);
-   assert(separator != NULL);
-
-   if (strlen(command) + 1 + strlen(value) + 2 > sizeof(line))
-      return ERANGE; /* XXX */
-
-   snprintf(line, sizeof(line), "%s%s%s", command, value, separator);
-
-   while (strlen(*buf) + strlen(line) + 1 > *buf_len) {
-      tmp = realloc(*buf, *buf_len + EDG_WLPR_BUF_SIZE);
-      if (tmp == NULL)
-         return ENOMEM;
-      *buf = tmp;
-      *buf_len += EDG_WLPR_BUF_SIZE;
-   }
-   strcat(*buf, line);
-
-   return 0;
-}
-
-void
-edg_wlpr_CleanRequest(edg_wlpr_Request *request)
-{
-   assert(request != NULL);
-   if (request->version)
-      free(request->version);
-   if (request->proxy_filename)
-      free(request->proxy_filename);
-   if (request->myproxy_server)
-      free(request->myproxy_server);
-   if (request->jobid)
-      free(request->jobid);
-   if (request->entries) {
-      char **p = request->entries;
-      char **next;
-      while (*p) {
-        next = p+1;
-        free(*p);
-        p = next;
-      }
-      free(request->entries);
-   }
-
-   memset(request, 0, sizeof(request));
-}
-
-void
-edg_wlpr_CleanResponse(edg_wlpr_Response *response)
-{
-   assert(response != NULL);
-   if (response->version)
-      free(response->version);
-   if (response->myproxy_server)
-      free(response->myproxy_server);
-   if (response->filenames) {
-      char **p = response->filenames;
-      char **next;
-
-      while (*p) {
-        next = p+1;
-        free(*p);
-        p = next;
-      }
-      free(response->filenames);
-   }
-   memset(response, 0, sizeof(*response));
-}
-
-const char *
-edg_wlpr_GetErrorString(int code)
-{
-   return (code == 0) ? "OK" : "Error";
-}
-
-char *
-edg_wlpr_EncodeInt(int num) /* long? time */
-{
-   static char ret[64];
-
-   snprintf(ret, sizeof(ret), "%d", num);
-   return ret;
-}
-
-int
-edg_wlpr_DecodeInt(char *str, int *num)
-{
-   *num = atol(str); /* XXX */
-   return 0;
-}
diff --git a/org.glite.security.proxyrenewal/src/renew.c b/org.glite.security.proxyrenewal/src/renew.c

deleted file mode 100644 (file)

index 6c6e577..0000000
--- a/org.glite.security.proxyrenewal/src/renew.c
+++ /dev/null
@@ -1,1120 +0,0 @@
-#include "renewal_locl.h"
-#include "renewd_locl.h"
-
-#ifndef NOVOMS
-#include <voms_apic.h>
-#endif
-
-#ident "$Header$"
-
-extern char *repository;
-extern char *cadir;
-extern char *vomsdir;
-extern int voms_enabled;
-extern char *vomsconf;
-extern struct vomses_records vomses;
-
-static int received_signal = -1;
-
-static void
-check_renewal(char *datafile, int force_renew);
-
-static int
-renew_proxy(proxy_record *record, char *basename, char **new_proxy);
-
-static void
-register_signal(int signal);
-
-
-#define DGPR_RETRIEVE_DEFAULT_HOURS 10
-#define RENEWAL_CLOCK_SKEW 5 * 60
-
-static const char *
-get_ssl_err()
-{
-   return "SSL failed";
-}
-
-int
-load_proxy(const char *filename, X509 **cert, EVP_PKEY **privkey,
-           STACK_OF(X509) **chain)
-{
-   X509 *my_cert = NULL;
-   EVP_PKEY *my_key = NULL;
-   STACK_OF(X509) *my_chain = NULL;
-   FILE *fd = NULL;
-   int ret;
-
-   fd = fopen(filename, "r");
-   if (fd == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-           "Cannot read VOMS certificate (fopen() failed on %s: %s)",
-           filename, strerror(errno));
-      return errno;
-   }
-
-   my_cert = PEM_read_X509(fd, NULL, NULL, NULL);
-   if (my_cert == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-           "Cannot read VOMS certificate (PEM_read_X509() failed: %s)",
-           get_ssl_err());
-      ret = EDG_WLPR_ERROR_SSL;
-      goto end;
-   }
-
-   my_key = PEM_read_PrivateKey(fd, NULL, NULL, NULL);
-   if (my_key == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-           "Cannot read VOMS certificate (PEM_read_PrivateKey() failed: %s)",
-           get_ssl_err());
-      ret = EDG_WLPR_ERROR_SSL;
-      goto end;
-   }
-
-   my_chain = sk_X509_new_null();
-   if (my_chain == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot read VOMS certificate (sk_X509_new_null() failed: %s)",
-                  get_ssl_err());
-      ret = EDG_WLPR_ERROR_SSL;
-      goto end;
-   }
-
-   while (1) {
-      X509 *c;
-
-      c = PEM_read_X509(fd, NULL, NULL, NULL);
-      if (c == NULL) {
-        if (ERR_GET_REASON(ERR_peek_error()) == PEM_R_NO_START_LINE) {
-           /* End of file reached. no error */
-           ERR_clear_error();
-           break;
-        }
-        edg_wlpr_Log(LOG_ERR,
-                     "Cannot read VOMS certificate (PEM_read_X509() failed: %s)",
-                     get_ssl_err());
-        ret = EDG_WLPR_ERROR_SSL;
-        goto end;
-      }
-      sk_X509_push(my_chain, c);
-   }
-
-   *cert = my_cert;
-   *privkey = my_key;
-   *chain = my_chain;
-   my_cert = NULL; my_key = NULL; my_chain = NULL;
-   ret = 0;
-
-end:
-   fclose(fd);
-
-   if (my_cert)
-      X509_free(my_cert);
-   if (my_key)
-      EVP_PKEY_free(my_key);
-   if (my_chain)
-      sk_X509_pop_free(my_chain, X509_free);
-
-   return ret;
-}
-
-static int
-save_proxy(const char *filename, X509 *new_cert, EVP_PKEY *new_privkey, 
-           STACK_OF(X509) *chain)
-{
-   FILE *fd = NULL;
-   int ret, i;
-   int retval = EDG_WLPR_ERROR_SSL;
-
-   fd = fopen(filename, "w");
-   if (fd == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot store proxy (fopen() failed on %s: %s)",
-                  filename, strerror(errno));
-      return errno;
-   }
-
-   ret = PEM_write_X509(fd, new_cert);
-   if (ret == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot store proxy (PEM_write_X509() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   ret = PEM_write_PrivateKey(fd, new_privkey, NULL, NULL, 0, NULL, NULL);
-   if (ret == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot store proxy (PEM_write_PrivateKey() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   for (i = 0; i < sk_X509_num(chain); i++) {
-      X509 *cert = sk_X509_value(chain, i);
-      ret = PEM_write_X509(fd, cert);
-      if (ret == 0) {
-        edg_wlpr_Log(LOG_ERR,
-                     "Cannot store proxy (PEM_write_X509() failed: %s)",
-                     get_ssl_err());
-        goto end;
-      }
-   }
-      
-   retval = 0;
-
-end:
-   fclose(fd);
-
-   return retval;
-}
-
-static int
-gen_keypair(EVP_PKEY **keypair, int requested_bits)
-{
-   RSA *rsa = NULL;
-   EVP_PKEY *key;
-
-   *keypair = NULL;
-   rsa = RSA_generate_key(requested_bits,
-                         RSA_F4 /* public exponent */,
-                         NULL, NULL);
-   if (rsa == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (RSA_generate_key() failed: %s)",
-                  get_ssl_err());
-      return EDG_WLPR_ERROR_SSL;
-   }
-
-   key = EVP_PKEY_new();
-   if (key == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (EVP_PKEY_new() failed: %s)",
-                  get_ssl_err());
-      RSA_free(rsa);
-      return EDG_WLPR_ERROR_SSL;
-   }
-
-   if (EVP_PKEY_assign_RSA(key, rsa) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (EVP_PKEY_assign_RSA() failed: %s)",
-                  get_ssl_err());
-      RSA_free(rsa);
-      EVP_PKEY_free(key);
-      return EDG_WLPR_ERROR_SSL;
-   }
-
-   *keypair = key;
-
-   return 0;
-}
-
-static int
-gen_subject_name(X509 *old_cert, X509 *new_cert)
-{
-   X509_NAME *name = NULL;
-   X509_NAME_ENTRY *name_entry = NULL;
-   int ret = EDG_WLPR_ERROR_SSL;
-
-   name = X509_NAME_dup(X509_get_subject_name(old_cert));
-   if (name == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_NAME_dup() failed: %s",
-                  get_ssl_err());
-      goto end;
-   }
-
-   name_entry = X509_NAME_ENTRY_create_by_NID(NULL /* make new entry */,
-                                             NID_commonName,
-                                             V_ASN1_APP_CHOOSE,
-                                             "proxy", -1);
-   if (name_entry == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_NAME_ENTRY_create_by_NID() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   if (X509_NAME_add_entry(name, name_entry, X509_NAME_entry_count(name), 0) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_NAME_add_entry() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-
-   if (X509_set_subject_name(new_cert, name) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_set_subject_name() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   ret = 0;
-
-end:
-   if (name)
-      X509_NAME_free(name);
-   if (name_entry != NULL)
-      X509_NAME_ENTRY_free(name_entry);
-
-   return ret;
-}
-
-static int
-create_proxy(X509 *old_cert, EVP_PKEY *old_privkey, X509_EXTENSION *extension, 
-            X509 **new_cert, EVP_PKEY **new_privkey)
-{
-   /* Inspired by code from Myproxy */
-   EVP_PKEY *key_pair = NULL;
-   X509 *cert = NULL;
-   int ret;
-   int retval = EDG_WLPR_ERROR_SSL;
-
-   ret = gen_keypair(&key_pair, 512);
-   if (ret)
-      return ret;
-
-   cert = X509_new();
-   if (cert == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot generate new proxy (X509_new() failed: Not enough memory)");
-      goto end;
-   }
-
-   ret = gen_subject_name(old_cert, cert);
-   if (ret) {
-      retval = ret;
-      goto end;
-   }
-
-   if (X509_set_issuer_name(cert, X509_get_subject_name(old_cert)) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_set_issuer_name() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   if (X509_set_serialNumber(cert, X509_get_serialNumber(old_cert)) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_set_serialNumber() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   X509_gmtime_adj(X509_get_notBefore(cert), -(60 * 5));
-   X509_set_notAfter(cert, X509_get_notAfter(old_cert));
-
-   if (X509_set_pubkey(cert, key_pair) == 0) {
-      edg_wlpr_Log(LOG_ERR, 
-                  "Cannot generate new proxy (X509_set_pubkey() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   /* set v3 */
-   if (X509_set_version(cert, 2L) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_set_version() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   if (cert->cert_info->extensions != NULL)
-      sk_X509_EXTENSION_pop_free(cert->cert_info->extensions,
-                                X509_EXTENSION_free);
-   cert->cert_info->extensions = sk_X509_EXTENSION_new_null();
-   sk_X509_EXTENSION_push(cert->cert_info->extensions, extension);
-
-   if (X509_sign(cert, old_privkey, EVP_md5()) == 0) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (X509_sign() failed: %s)",
-                  get_ssl_err());
-      goto end;
-   }
-
-   *new_privkey = key_pair;
-   *new_cert = cert;
-   key_pair = NULL;
-   cert = NULL;
-
-   retval = 0;
-
-end:
-   if (key_pair)
-      EVP_PKEY_free(key_pair);
-   if (cert)
-      X509_free(cert);
-
-   return retval;
-}
-
-static int
-create_voms_extension(char *buf, size_t buf_len, X509_EXTENSION **extensions)
-{
-   ASN1_OBJECT *voms_obj = NULL;
-   ASN1_OCTET_STRING *voms_oct = NULL;
-
-   *extensions = NULL;
-
-   voms_oct = ASN1_OCTET_STRING_new();
-   if (voms_oct == NULL) {
-      edg_wlpr_Log(LOG_ERR,
-                  "Cannot generate new proxy (ASN1_OCTET_STRING_new() failed: %s)",
-                  get_ssl_err());
-      return EDG_WLPR_ERROR_SSL;
-   }
-
-   voms_oct->data = buf;
-   voms_oct->length = buf_len;
-
-   voms_obj = OBJ_nid2obj(OBJ_txt2nid("VOMS"));
-   if (voms_obj == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot generate new proxy (OBJ_nid2obj() failed");
-      goto end;
-   }
-
-   *extensions = X509_EXTENSION_create_by_OBJ(NULL, voms_obj, 0, voms_oct);
-   if (*extensions == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot generate new proxy (X509_EXTENSION_create_by_OBJ() failed");
-      goto end;
-   }
-
-   return 0;
-
-end:
-   if (voms_oct)
-      ASN1_OCTET_STRING_free(voms_oct);
-   if (voms_obj)
-      ASN1_OBJECT_free(voms_obj);
-   return EDG_WLPR_ERROR_SSL;
-}
-
-#ifndef NOVOMS
-static int
-export_std_data(struct data *voms_data, char **buf)
-{
-   asprintf(buf, "GROUP: %s\n"
-                "ROLE:%s\n" /* the space is missing intentionaly */
-                "CAP: %s\n",
-                (voms_data->group) ? voms_data->group : "NULL",
-                (voms_data->role) ? voms_data->role : "NULL",
-                (voms_data->cap) ? voms_data->cap : "NULL");
-   return 0;
-}
-
-static int
-export_user_data(struct voms *voms_cert, char **buf, size_t *len)
-{
-   struct data **voms_data;
-   char *str = NULL;
-   char *ptr;
-
-   *buf = NULL;
-
-   switch (voms_cert->type) {
-      case TYPE_NODATA:
-        *buf = strdup("NO DATA");
-        break;
-      case TYPE_CUSTOM:
-        *buf = strdup(voms_cert->custom);
-        break;
-      case TYPE_STD:
-        for (voms_data = voms_cert->std; voms_data && *voms_data; voms_data++) {
-           export_std_data(*voms_data, &str);
-           if (*buf == NULL)
-              ptr = calloc(strlen(str) + 1, 1);
-           else
-              ptr = realloc(*buf, strlen(*buf) + strlen(str) + 1);
-           if (ptr == NULL) {
-              return ENOMEM;
-           }
-           *buf = ptr;
-           strcat(*buf, str);
-           free(str);
-        }
-           
-        break;
-      default:
-        return -1;
-   }
-   
-   *len = strlen(*buf);
-   return 0;
-}
-
-#endif
-
-static int
-encode_voms_buf(const char *label, char *data, size_t data_len,
-                char **buf, size_t *buf_len)
-{
-   char *tmp;
-
-   tmp = realloc(*buf, *buf_len + strlen(label) + data_len + 1);
-   if (tmp == NULL)
-      return ENOMEM;
-
-   memcpy(tmp + *buf_len, label, strlen(label));
-
-   memcpy(tmp + *buf_len + strlen(label), data, data_len);
-   tmp[*buf_len + strlen(label) + data_len] = '\n';
-   *buf = tmp;
-   *buf_len = *buf_len + strlen(label) + data_len + 1;
-
-   return 0;
-}
-
-static int
-encode_voms_int(const char *label, int value, char **buf, size_t *buf_len)
-{
-   char tmp[16];
-
-   snprintf(tmp, sizeof(tmp), "%d", value);
-   return encode_voms_buf(label, tmp, strlen(tmp), buf, buf_len);
-}
-
-static int
-encode_voms_str(const char *label, char *value, char **buf, size_t *buf_len)
-{
-   return encode_voms_buf(label, value, strlen(value), buf, buf_len);
-}
-
-#if 0
-static int
-VOMS_Export(struct vomsdata *voms_info, char **buf, size_t *len)
-{
-   struct voms *vc;
-   char *enc_voms = NULL;
-   size_t enc_voms_len = 0;
-   char *data_buf;
-   size_t data_len;
-   int ret;
-
-   if (voms_info == NULL || voms_info->data == NULL || *voms_info->data == NULL)
-      return EINVAL;
-   vc = *voms_info->data;
-
-   ret = export_user_data(vc, &data_buf, &data_len);
-   if (ret)
-      return ret;
-
-   encode_voms_int("SIGLEN:",   vc->siglen, &enc_voms, &enc_voms_len);
-   encode_voms_buf("SIGNATURE:",vc->signature, vc->siglen,
-                  &enc_voms, &enc_voms_len);
-   enc_voms_len--; /* Signature is not followed by '\n' */
-   encode_voms_str("USER:",     vc->user, &enc_voms, &enc_voms_len);
-   encode_voms_str("UCA:",      vc->userca, &enc_voms, &enc_voms_len);
-   encode_voms_str("SERVER:",   vc->server, &enc_voms, &enc_voms_len);
-   encode_voms_str("SCA:",      vc->serverca, &enc_voms, &enc_voms_len);
-   encode_voms_str("VO:",       vc->voname, &enc_voms, &enc_voms_len);
-   encode_voms_str("URI:",      vc->uri, &enc_voms, &enc_voms_len);
-   encode_voms_str("TIME1:",    vc->date1, &enc_voms, &enc_voms_len);
-   encode_voms_str("TIME2:",    vc->date2, &enc_voms, &enc_voms_len);
-   encode_voms_int("DATALEN:",  data_len, &enc_voms, &enc_voms_len);
-   encode_voms_buf("",          data_buf, data_len, &enc_voms, &enc_voms_len);
-   enc_voms_len--; /* the data already contains endind '\n' */
-
-   free(data_buf);
-   if (enc_voms == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot renew VOMS certificate (Not enough memory)");
-      return ENOMEM;
-   }
-   *buf = enc_voms;
-   *len = enc_voms_len;
-   return 0;
-}
-
-static int
-voms_cert_renew(char *hostname, int port, char *voms_subject,
-               char *proxy,
-                struct voms **cur_voms_cert, struct vomsdata *voms_info)
-{
-   int ret = 0;
-   char *command = "A";
-   int err = 0;
-   char *old_env_proxy = getenv("X509_USER_PROXY");
-
-   setenv("X509_USER_PROXY", proxy, 1);
-
-   /* hack (suggested by Vincenzo Ciaschini) to work around problem with
-    * unitialized VOMS struct */
-   ret = VOMS_Ordering("zzz:zzz", voms_info, &err);
-   if (ret == 0) {
-      edg_wlpr_Log(LOG_ERR, "Cannot renew VOMS certificate (VOMS_Ordering() failed");
-      ret = EDG_WLPR_ERROR_VOMS;
-      goto end;
-   }
-
-   /* XXX only attributes which are in current certificate should be requested*/
-   ret = VOMS_Contact(hostname, port, (*cur_voms_cert)->server, command,
-                     voms_info, &err);
-   if (ret == 0) {
-#if 0
-      if (err == 1) { /* XXX cannot connect voms server */ 
-        ret = 0;
-        goto end;
-      }
-#endif
-      edg_wlpr_Log(LOG_ERR, "Cannot renew VOMS certificate (VOMS_Contact() failed: %d)", err);
-      ret = EDG_WLPR_ERROR_VOMS;
-   } else
-      ret = 0;
-
-end:
-   (old_env_proxy) ? setenv("X509_USER_PROXY", old_env_proxy, 1) :
-                    unsetenv("X509_USER_PROXY");
-
-   return ret;
-}
-
-static int
-renew_voms_cert(struct voms **cur_voms_cert, char *proxy, char **buf, size_t *buf_len)
-{
-   struct vomsdata *voms_info = NULL;
-   char *hostname = NULL;
-   char *p;
-   int port, ret;
-
-   hostname = strdup((*cur_voms_cert)->uri);
-   p = strchr(hostname, ':');
-   if (p)
-      *p = '\0';
-   port = (p) ? atoi(p+1) : 15000;
-
-   voms_info = VOMS_Init(vomsdir, cadir);
-   if (voms_info == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot renew VOMS certificate (VOMS_Init() failed)");
-      ret = EDG_WLPR_ERROR_VOMS;
-      goto end;
-   }
-
-   ret = voms_cert_renew(hostname, port, (*cur_voms_cert)->server, proxy, cur_voms_cert,
-                        voms_info);
-   if (ret)
-      goto end;
-  
-   ret = VOMS_Export(voms_info, buf, buf_len);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Cannot renew VOMS certificate (VOMS_Export() failed)");
-      ret = EDG_WLPR_ERROR_VOMS;
-      goto end;
-   }
-
-   ret = 0;
-
-end:
-   if (hostname)
-      free(hostname);
-#if 0
-   if (voms_info)
-      VOMS_Destroy(voms_info);
-#endif
-
-   return ret;
-}
-#endif
-
-#ifndef NOVOMS
-static vomses_record *
-find_vomses_record(char *hostname, int port)
-{
-   int i;
-
-   for (i = 0; i < vomses.len; i++) {
-      if (strcmp(vomses.val[i]->hostname, hostname) == 0 &&
-         vomses.val[i]->port == port)
-        return vomses.val[i];
-   }
-
-   return NULL;
-}
-
-static int
-set_vo_params(struct voms **voms_cert, char **arg)
-{
-   vomses_record *r;
-   char *tmp;
-   int port;
-   char *hostname;
-   char *p;
-
-   hostname = strdup((*voms_cert)->uri);
-   p = strchr(hostname, ':');
-   if (p)
-      *p = '\0';
-   port = (p) ? atoi(p+1) : 15000;
-
-   r = find_vomses_record(hostname, port);
-   if (r == NULL)
-      return EINVAL;
-
-   if (*arg == NULL) {
-      asprintf(arg, " -voms %s", r->nick);
-   } else {
-      tmp = realloc(*arg, 
-                   strlen(*arg) + strlen(" -voms ") + strlen(r->nick) + 1);
-      if (tmp == NULL)
-        return ENOMEM;
-      *arg = tmp;
-      *arg = strcat(*arg, " -voms ");
-      *arg = strcat(*arg, r->nick);
-   }
-   return 0;
-}
-#endif
-
-static int
-exec_voms_proxy_init(char *arg, char *old_proxy, char *new_proxy)
-{
-   char command[256];
-   int ret;
-   char *old_env_proxy = getenv("X509_USER_PROXY");
-
-   setenv("X509_USER_PROXY", old_proxy, 1);
-
-   snprintf(command, sizeof(command), 
-        "edg-voms-proxy-init -out %s -key %s -cert %s -confile %s -q %s",
-        new_proxy, old_proxy, old_proxy, vomsconf, arg);
-   ret = system(command);
-
-   (old_env_proxy) ? setenv("X509_USER_PROXY", old_env_proxy, 1) :
-                     unsetenv("X509_USER_PROXY");
-
-   return ret;
-}
-
-#if 0
-static int
-renew_voms_certs(const char *old_proxy, const char *new_proxy)
-{
-   struct vomsdata *voms_info = NULL;
-   struct voms **voms_cert = NULL;
-   STACK_OF(X509) *chain = NULL;
-   EVP_PKEY *privkey = NULL;
-   X509 *cert = NULL;
-   int ret, err;
-   char *buf = NULL;
-   size_t buf_len = 0;
-   X509_EXTENSION *extension = NULL;
-   X509 *new_cert = NULL;
-   EVP_PKEY *new_privkey = NULL;
-
-   voms_info = VOMS_Init(vomsdir, cadir);
-   if (voms_info == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot initialize VOMS context (VOMS_Init() failed)");
-      return EDG_WLPR_ERROR_VOMS;
-   }
-
-   ret = load_proxy(old_proxy, &cert, &privkey, &chain);
-   if (ret)
-      goto end;
-
-   ret = VOMS_Retrieve(cert, chain, RECURSE_CHAIN, voms_info, &err);
-   if (ret == 0) {
-      if (err == VERR_NOEXT) {
-        /* no VOMS cred, no problem; continue */
-        ret = 0;
-      } else {
-         edg_wlpr_Log(LOG_ERR, "Cannot get VOMS certificate(s) from proxy");
-         ret = EDG_WLPR_ERROR_VOMS;
-      }
-      goto end;
-   }
-
-   for (voms_cert = voms_info->data; voms_cert && *voms_cert; voms_cert++) {
-      char *tmp, *ptr;
-      size_t tmp_len;
-
-      ret = renew_voms_cert(voms_cert, old_proxy, &tmp, &tmp_len);
-      if (ret)
-        continue;
-      ptr = realloc(buf, buf_len + tmp_len);
-      if (ptr == NULL) {
-        ret = ENOMEM;
-        goto end;
-      }
-      buf = ptr;
-      memcpy(buf + buf_len, tmp, tmp_len);
-      buf_len += tmp_len;
-   }
-
-   if (buf == NULL) {
-      /* no extension renewed, return */
-      ret = 0;
-      goto end;
-   }
-
-   ret = create_voms_extension(buf, buf_len, &extension);
-   if (ret)
-      goto end;
-
-   X509_free(cert);
-   EVP_PKEY_free(privkey);
-   sk_X509_pop_free(chain, X509_free);
-
-   ret = load_proxy(new_proxy, &cert, &privkey, &chain);
-   if (ret)
-      goto end;
-
-   ret = create_proxy(cert, privkey, extension, &new_cert, &new_privkey);
-   if (ret)
-      goto end;
-
-   sk_X509_insert(chain, cert, 0);
-        
-   ret = save_proxy(new_proxy, new_cert, new_privkey, chain);
-   if (ret)
-      goto end;
-
-   ret = 0;
-
-end:
-   VOMS_Destroy(voms_info);
-
-   return ret;
-}
-#else /* 0 */
-
-#ifdef NOVOMS
-static int
-renew_voms_certs(const char *old_proxy, char *myproxy_proxy, const char *new_proxy)
-{
-       return 0;
-}
-
-#else
-static int
-renew_voms_certs(const char *old_proxy, char *myproxy_proxy, const char *new_proxy)
-{
-   struct vomsdata *voms_info = NULL;
-   struct voms **voms_cert = NULL;
-   STACK_OF(X509) *chain = NULL;
-   EVP_PKEY *privkey = NULL;
-   X509 *cert = NULL;
-   int ret, err;
-   char *arg = NULL;
-
-   voms_info = VOMS_Init(vomsdir, cadir);
-   if (voms_info == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot initialize VOMS context (VOMS_Init() failed)");
-      return EDG_WLPR_ERROR_VOMS;
-   }
-
-   ret = load_proxy(old_proxy, &cert, &privkey, &chain);
-   if (ret)
-      goto end;
-
-   ret = VOMS_Retrieve(cert, chain, RECURSE_CHAIN, voms_info, &err);
-   if (ret == 0) {
-      if (err == VERR_NOEXT) {
-        /* no VOMS cred, no problem; continue */
-        ret = 0;
-      } else {
-         edg_wlpr_Log(LOG_ERR, "Cannot get VOMS certificate(s) from proxy");
-         ret = EDG_WLPR_ERROR_VOMS;
-      }
-      goto end;
-   }
-
-   for (voms_cert = voms_info->data; voms_cert && *voms_cert; voms_cert++) {
-      ret = set_vo_params(voms_cert, &arg);
-      if (ret)
-        goto end;
-   }
-   ret = exec_voms_proxy_init(arg, myproxy_proxy, new_proxy);
-
-end:
-   VOMS_Destroy(voms_info);
-   return ret;
-}
-#endif /* NOVOMS */
-
-#endif /* 0 */
-
-static void
-register_signal(int signal)
-{
-      received_signal = signal;
-}
-
-static int
-renew_proxy(proxy_record *record, char *basename, char **new_proxy)
-{
-   char tmp_proxy[FILENAME_MAX];
-   int tmp_fd;
-   char repository_file[FILENAME_MAX];
-   int ret = -1;
-   char *p;
-   char *server = NULL;
-   myproxy_socket_attrs_t *socket_attrs;
-   myproxy_request_t      *client_request;
-   myproxy_response_t     *server_response;
-   char *renewed_proxy;
-
-   socket_attrs = malloc(sizeof(*socket_attrs));
-   memset(socket_attrs, 0, sizeof(*socket_attrs));
-
-   client_request = malloc(sizeof(*client_request));
-   memset(client_request, 0, sizeof(*client_request));
-
-   server_response = malloc(sizeof(*server_response));
-   memset(server_response, 0, sizeof(*server_response));
-
-   myproxy_set_delegation_defaults(socket_attrs, client_request);
-
-   edg_wlpr_Log(LOG_DEBUG, "Trying to renew proxy in %s.%d",
-               basename, record->suffix);
-
-   snprintf(tmp_proxy, sizeof(tmp_proxy), "%s.%d.renew.XXXXXX", 
-           basename, record->suffix);
-   tmp_fd = mkstemp(tmp_proxy);
-   if (tmp_fd == -1) {
-      edg_wlpr_Log(LOG_ERR, "Cannot create temporary file (%s)",
-                   strerror(errno));
-      return errno;
-   }
-
-   snprintf(repository_file, sizeof(repository_file),"%s.%d",
-           basename, record->suffix);
-
-   ret = get_proxy_base_name(repository_file, &client_request->username);
-   if (ret)
-      goto end;
-
-   client_request->proxy_lifetime = 60 * 60 * DGPR_RETRIEVE_DEFAULT_HOURS;
-   client_request->authzcreds = repository_file;
-
-   server = (record->myproxy_server) ? record->myproxy_server :
-                                       socket_attrs->pshost;
-   if (server == NULL) {
-      edg_wlpr_Log(LOG_ERR, "No myproxy server specified");
-      ret = EINVAL;
-      goto end;
-   }
-   socket_attrs->pshost = strdup(server);
-
-   p = strchr(socket_attrs->pshost, ':');
-   if (p) {
-      *p++ = '\0';
-      ret = edg_wlpr_DecodeInt(p, &socket_attrs->psport);
-      if (ret)
-        goto end;
-   } else
-      socket_attrs->psport = MYPROXY_SERVER_PORT;
-
-   ret = myproxy_get_delegation(socket_attrs, client_request,
-                               server_response, tmp_proxy);
-   if (ret == 1) {
-      ret = EDG_WLPR_ERROR_MYPROXY;
-      edg_wlpr_Log(LOG_ERR, "Cannot get renewed proxy from Myproxy server");
-      goto end;
-   }
-
-   renewed_proxy = tmp_proxy;
-
-   if (voms_enabled) {
-      char tmp_voms_proxy[FILENAME_MAX];
-      int tmp_voms_fd;
-      
-      snprintf(tmp_voms_proxy, sizeof(tmp_voms_proxy), "%s.%d.renew.XXXXXX",
-              basename, record->suffix);
-      tmp_voms_fd = mkstemp(tmp_voms_proxy);
-      if (tmp_voms_fd == -1) {
-        edg_wlpr_Log(LOG_ERR, "Cannot create temporary file (%s)",
-                     strerror(errno));
-        ret = errno;
-        goto end;
-      }
-
-      ret = renew_voms_certs(repository_file, tmp_proxy, tmp_voms_proxy);
-      if (ret)
-        goto end;
-
-      renewed_proxy = tmp_voms_proxy;
-   }
-
-   if (new_proxy)
-      *new_proxy = strdup(renewed_proxy);
-
-   ret = 0;
-
-end:
-   if (socket_attrs->socket_fd)
-      close(socket_attrs->socket_fd);
-   close(tmp_fd);
-   if (ret)
-      unlink(tmp_proxy);
-   myproxy_free(socket_attrs, client_request, server_response);
-
-   return ret;
-}
-
-static void
-check_renewal(char *datafile, int force_renew)
-{
-   char line[1024];
-   proxy_record record;
-   char *p;
-   int ret, i;
-   time_t current_time;
-   FILE *meta_fd = NULL;
-   char basename[FILENAME_MAX];
-   edg_wlpr_Request request;
-   edg_wlpr_Response response;
-   char *new_proxy = NULL;
-   char *entry = NULL;
-   char **tmp;
-   int num = 0;
-
-   assert(datafile != NULL);
-
-   memset(&record, 0, sizeof(record));
-   memset(basename, 0, sizeof(basename));
-   memset(&request, 0, sizeof(request));
-   memset(&response, 0, sizeof(response));
-   
-   strncpy(basename, datafile, sizeof(basename) - 1);
-   p = basename + strlen(basename) - strlen(".data");
-   if (strcmp(p, ".data") != 0) {
-      edg_wlpr_Log(LOG_ERR, "Meta filename doesn't end with '.data'");
-      return;
-   }
-   *p = '\0';
-
-   request.command = EDG_WLPR_COMMAND_UPDATE_DB;
-   request.proxy_filename = strdup(basename);
-
-   meta_fd = fopen(datafile, "r");
-   if (meta_fd == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open meta file %s (%s)",
-                  datafile, strerror(errno));
-      return;
-   }
-
-   current_time = time(NULL);
-   edg_wlpr_Log(LOG_DEBUG, "Reading metafile %s", datafile);
-
-   while (fgets(line, sizeof(line), meta_fd) != NULL) {
-      free_record(&record);
-      p = strchr(line, '\n');
-      if (p)
-        *p = '\0';
-      ret = decode_record(line, &record);
-      if (ret)
-        continue; /* XXX exit? */
-      if (record.jobids.len == 0) /* no jobid registered for this proxy */
-        continue;
-      if (record.end_time - current_time < RENEWAL_CLOCK_SKEW ||
-         abs(record.next_renewal - current_time) < RENEWAL_CLOCK_SKEW ||
-         record.next_renewal < current_time ||
-         record.end_time < current_time ||
-         force_renew) {
-        ret = EDG_WLPR_PROXY_EXPIRED;
-        if (record.end_time >= current_time)
-           /* only try renewal if the proxy hasn't already expired */
-           ret = renew_proxy(&record, basename, &new_proxy);
-
-        /* if the proxy wasn't renewed have the daemon planned another renewal */
-        asprintf(&entry, "%d:%s", record.suffix, (ret == 0) ? new_proxy : "");
-        if (new_proxy) {
-           free(new_proxy); new_proxy = NULL;
-        }
-
-        tmp = realloc(request.entries, (num + 2) * sizeof(*tmp));
-        if (tmp == NULL) {
-           free_record(&record);
-           return;
-        }
-        request.entries = tmp;
-        request.entries[num] = entry;
-        request.entries[num+1] = NULL;
-        num++;
-      }
-   }
-   free_record(&record);
-
-   if (num > 0) {
-      ret = edg_wlpr_RequestSend(&request, &response);
-      if (ret != 0)
-        edg_wlpr_Log(LOG_ERR,
-                     "Failed to send update request to master (%d)", ret);
-      else if (response.response_code != 0)
-        edg_wlpr_Log(LOG_ERR,
-                     "Master failed to update database (%d)", response.response_code);
-
-      /* delete all tmp proxy files which may survive */
-      for (i = 0; i < num; i++) {
-        p = strchr(request.entries[i], ':');
-        if (p+1)
-           unlink(p+1);
-      }
-   }
-   fclose(meta_fd);
-
-   edg_wlpr_CleanResponse(&response);
-   edg_wlpr_CleanRequest(&request);
-
-   return;
-}
-
-int renewal(int force_renew)
-{
-   DIR *dir = NULL;
-   struct dirent *file;
-   FILE *fd;
-
-   edg_wlpr_Log(LOG_DEBUG, "Starting renewal process");
-
-   if (chdir(repository)) {
-      edg_wlpr_Log(LOG_ERR, "Cannot access repository directory %s (%s)",
-                  repository, strerror(errno));
-      return errno;
-   }
-
-   dir = opendir(repository);
-   if (dir == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open repository directory %s (%s)",
-                  repository, strerror(errno));
-      return errno;
-   }
-
-   while ((file = readdir(dir))) {
-      /* read files of format `md5sum`.data, where md5sum() is of fixed length
-        32 chars */
-      if (file->d_name == NULL || strlen(file->d_name) != 37 ||
-         strcmp(file->d_name + 32, ".data") != 0)
-        continue;
-      fd = fopen(file->d_name, "r");
-      if (fd == NULL) {
-        edg_wlpr_Log(LOG_ERR, "Cannot open meta file %s (%s)",
-                     file->d_name, strerror(errno));
-        continue;
-      }
-      check_renewal(file->d_name, force_renew);
-      fclose(fd);
-   }
-   closedir(dir);
-   edg_wlpr_Log(LOG_DEBUG, "Finishing renewal process");
-   return 0;
-}
-
-void
-watchdog_start(void)
-{
-   struct sigaction sa;
-   int force_renewal;
-   
-   memset(&sa,0,sizeof(sa));
-   sa.sa_handler = register_signal;
-   sigaction(SIGUSR1, &sa, NULL);
-
-   /* load_vomses(); */
-
-   while (1) {
-       received_signal = -1;
-       sleep(60 * 5);
-       force_renewal = (received_signal == SIGUSR1) ? 1 : 0;
-       /* XXX uninstall signal handler ? */
-       renewal(force_renewal);
-   }
-}
diff --git a/org.glite.security.proxyrenewal/src/renewal_locl.h b/org.glite.security.proxyrenewal/src/renewal_locl.h

deleted file mode 100644 (file)

index 45317e3..0000000
--- a/org.glite.security.proxyrenewal/src/renewal_locl.h
+++ /dev/null
@@ -1,133 +0,0 @@
-#ifndef RENEWAL_LOCL_H
-#define RENEWAL_LOCL_H
-
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-#include <syslog.h>
-#include <linux/limits.h>
-#include <signal.h>
-#include <assert.h>
-#include <getopt.h>
-#include <dirent.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <openssl/md5.h>
-#include <openssl/x509.h>
-#include <openssl/pem.h>
-#include <openssl/err.h>
-
-#include "renewal.h"
-
-#define JDL_MYPROXY "Myproxy_server="
-
-typedef enum {
-  EDG_WLPR_COMMAND_NONE = 0,
-  EDG_WLPR_COMMAND_REG = 1,
-  EDG_WLPR_COMMAND_UNREG,
-  EDG_WLPR_COMMAND_GET,
-  EDG_WLPR_COMMAND_LIST,
-  EDG_WLPR_COMMAND_STATUS,
-  EDG_WLPR_COMMAND_UPDATE_DB,
-} edg_wlpr_Command;
-
-/* prefix neni nutny */
-#define EDG_WLPR_PROTO_VERSION          "Version="
-#define EDG_WLPR_PROTO_COMMAND          "Command="
-#define EDG_WLPR_PROTO_MYPROXY_SERVER   "Myproxy_server="
-#define EDG_WLPR_PROTO_PROXY            "Proxy_name="
-#define EDG_WLPR_PROTO_UNIQUE_PROXY     "Unique=" /* XXX */
-#define EDG_WLPR_PROTO_JOBID            "Jobid="
-#define EDG_WLPR_PROTO_ENTRY            "Entry="
-
-#define EDG_WLPR_PROTO_RESPONSE         "Response=" /* XXX result ?? */
-#define EDG_WLPR_PROTO_START_TIME       "Start_time="
-#define EDG_WLPR_PROTO_END_TIME         "End_time="
-#define EDG_WLPR_PROTO_RENEWAL_TIME     "Renewal_time=" /* XXX Next renewal ?? */
-
-#define EDG_WLPR_MYPROXY_PORT 7512
-
-#define EDG_WLPR_REPOSITORY_ROOT "/var/spool/edg-wl-renewd"
-
-#define EDG_WLPR_BUF_SIZE 4096
-
-#define EDG_WLPR_VERSION "EDG Proxy Renewal 1.0"
-
-#define MAX_PROXIES 4 /* max. number of jobids sharing one proxy */
-
-typedef struct {
-  char *version;
-  edg_wlpr_Command command;
-  char *myproxy_server;
-  char *proxy_filename;
-  int unique; 
-  char *jobid;
-  char **entries; /* for updates from the renewal part (renew.c) */
-} edg_wlpr_Request;
-
-typedef struct {
-  char *version;
-  int response_code;
-  time_t start_time;
-  time_t end_time;
-  time_t next_renewal_time;
-  int counter;
-  char *myproxy_server;
-  char **filenames;
-} edg_wlpr_Response;
-
-#define DGPR_REG_SOCKET_NAME_ROOT "/tmp/dgpr_renew_"
-
-#if 0
-/* Errors: */
-/* XXX enum */
-#define EDG_WLPR_ERROR_EOF 1
-#define EDG_WLPR_ERROR_PARSE_NOT_FOUND 2
-#define EDG_WLPR_ERROR_PARSE_ERROR 3
-#define EDG_WLPR_ERROR_UNKNOWN_COMMAND 4
-#define EDG_WLPR_ERROR_NOTFOUND 5
-#endif
-
-int
-edg_wlpr_GetToken(const char *msg, const size_t msg_len,
-                  const char *key, const char *separators,
-                  int req_index, char **value);
-
-int
-edg_wlpr_StoreToken(char **buf, size_t *buf_len, char *command,
-                    char *value, const char *separator);
-
-int
-edg_wlpr_Read(int sock, char **buf, size_t *buf_len);
-
-int
-edg_wlpr_Write(int sock, char *buf, size_t buf_len);
-
-void
-edg_wlpr_CleanRequest(edg_wlpr_Request *request);
-
-void
-edg_wlpr_CleanResponse(edg_wlpr_Response *response);
-
-const char *
-edg_wlpr_GetErrorString(int err);
-
-char *
-edg_wlpr_EncodeInt(int num); /* long? time */
-
-int
-edg_wlpr_DecodeInt(char *str, int *num);
-
-int
-edg_wlpr_RequestSend(edg_wlpr_Request *request, edg_wlpr_Response *response);
-
-#endif /* RENEWAL_LOCL_H */
diff --git a/org.glite.security.proxyrenewal/src/renewd.c b/org.glite.security.proxyrenewal/src/renewd.c

deleted file mode 100644 (file)

index adebb09..0000000
--- a/org.glite.security.proxyrenewal/src/renewd.c
+++ /dev/null
@@ -1,709 +0,0 @@
-#include "renewal_locl.h"
-#include "renewd_locl.h"
-
-static const char rcsid[] = "$Header$";
-
-#define SEPARATORS "\n"
-/* GRIDMANAGER_CHECKPROXY_INTERVAL + GRIDMANAGER_MINIMUM_PROXY_TIME */
-#define CONDOR_MINIMUM_PROXY_TIME (1800)
-
-int debug = 0;
-char *repository = NULL;
-time_t condor_limit = CONDOR_MINIMUM_PROXY_TIME;
-char *cadir = NULL;
-char *vomsdir = NULL;
-int voms_enabled = 0;
-
-char *vomsconf = "/opt/edg/etc/vomses";
-#ifndef NOVOMS
-struct vomses_records vomses;
-#endif
-
-static struct option opts[] = {
-   { "help",       no_argument,       NULL,  'h' },
-   { "version",    no_argument,       NULL,  'v' },
-   { "debug",      no_argument,       NULL,  'd' },
-   { "repository", required_argument, NULL,  'r' },
-   { "condor-limit", required_argument, NULL, 'c' }, 
-   { "CAdir",      required_argument, NULL,  'C' },
-   { "VOMSdir",    required_argument, NULL,  'V' },
-   { "enable-voms", no_argument,     NULL,  'A' },
-   { "voms-config", required_argument, NULL, 'G' },
-   { NULL, 0, NULL, 0 }
-};
-
-typedef struct {
-   edg_wlpr_Command code;
-   void (*handler) (edg_wlpr_Request *request, edg_wlpr_Response *response);
-} command_table;
-
-static command_table commands[] = {
-   { EDG_WLPR_COMMAND_REG,     register_proxy,     },
-   { EDG_WLPR_COMMAND_UNREG,   unregister_proxy,   },
-   { EDG_WLPR_COMMAND_GET,     get_proxy,          },
-#if 0
-   { EDG_WLPR_COMMAND_LIST,    list_proxies,       },
-   { EDG_WLPR_COMMAND_STATUS,  status_proxy,       },
-#endif
-   { EDG_WLPR_COMMAND_UPDATE_DB, update_db,        },
-   { 0, NULL },
-};
-
-/* static prototypes */
-static void
-usage(char *progname);
-
-static int
-do_listen(char *socket_name, int *sock);
-
-static int
-encode_response(edg_wlpr_Response *response, char **msg);
-
-static command_table *
-find_command(edg_wlpr_Command code);
-
-static int
-proto(int sock);
-
-static int
-doit(int sock);
-
-static int
-decode_request(const char *msg, const size_t msg_len, edg_wlpr_Request *request);
-
-static command_table *
-find_command(edg_wlpr_Command code)
-{
-   command_table *c;
-
-   for (c = commands; c->code; c++) {
-      if (c->code == code)
-          return c;
-   }
-   return NULL;
-}
-
-static int
-proto(int sock)
-{
-   char  *buf = NULL;
-   size_t  buf_len;
-   int  ret;
-   edg_wlpr_Response  response;
-   edg_wlpr_Request  request;
-   command_table  *command;
-
-   memset(&request, 0, sizeof(request));
-   memset(&response, 0, sizeof(response));
-
-   ret = edg_wlpr_Read(sock, &buf, &buf_len);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Error reading from client: %s",
-                   edg_wlpr_GetErrorString(ret));
-      return ret;
-   }
-
-   ret = decode_request(buf, buf_len, &request);
-   free(buf);
-   if (ret)
-      goto end;
-
-   /* XXX check request (protocol version, ...) */
-
-   command = find_command(request.command);
-   if (command == NULL) {
-      ret = EDG_WLPR_ERROR_UNKNOWN_COMMAND;
-      edg_wlpr_Log(LOG_ERR, "Received unknown command (%d)", request.command);
-      goto end;
-   }
-
-   edg_wlpr_Log(LOG_INFO, "Received command code %d for proxy %s",
-                request.command,
-                request.proxy_filename ? request.proxy_filename : "(unspecified)");
-
-   command->handler(&request, &response);
-
-   ret = encode_response(&response, &buf);
-   if (ret)
-      goto end;
-
-   ret = edg_wlpr_Write(sock, buf, strlen(buf) + 1);
-   free(buf);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Error sending response to client: %s",
-                   edg_wlpr_GetErrorString(ret));
-      goto end;
-   }
-
-end:
-   edg_wlpr_CleanRequest(&request);
-   edg_wlpr_CleanResponse(&response);
-
-   return ret;
-}
-
-static int
-doit(int sock)
-{
-   int newsock;
-   struct sockaddr_un client_addr;
-   int client_addr_len = sizeof(client_addr);
-#if 0
-   next_renewal = LONG_MAX;
-   size_of_proxies = PROXIES_ALLOC_SIZE;
-   proxies = malloc((size_of_proxies) * sizeof(struct guarded_proxy *));
-   if (proxies == NULL) {
-       return ENOMEM;
-   }
-   proxies[0] = NULL;
-#endif
-
-#if 0
-   sigemptyset(&sset);
-   sigaddset(&sset,SIGTERM);
-   sigaddset(&sset,SIGINT);
-   sigaddset(&sset, SIGKILL);
-   sigaddset(&sset, SIGUSR1);
-   sigaddset(&sset, SIGALRM);
-   sigprocmask(SIG_BLOCK,&sset,NULL);
-#endif
-
-   while (1) {
-#if 0
-      sigprocmask(SIG_UNBLOCK,&sset,NULL);
-      newsock = accept(sock, (struct sockaddr *) &client_addr, &client_addr_len);
-      sigprocmask(SIG_BLOCK,&sset,NULL);
-
-      if (newsock == -1) {
-         if (errno == EINTR) /* ERESTARTSYS */
-             proxy_renewal(received_signal);
-         else
-            log();
-         continue;
-      }
-#else
-      newsock = accept(sock, (struct sockaddr *) &client_addr, &client_addr_len);
-      if (newsock == -1) {
-         edg_wlpr_Log(LOG_ERR, "accept() failed");
-         continue;
-      }
-      edg_wlpr_Log(LOG_DEBUG, "Got connection");
-
-#endif
-
-      proto(newsock);
-
-      edg_wlpr_Log(LOG_DEBUG, "Connection closed");
-      close(newsock);
-   }
-}
-
-static int
-decode_request(const char *msg, const size_t msg_len, edg_wlpr_Request *request)
-{
-   char *value = NULL;
-#if 0
-   char *p;
-   int port;
-#endif
-   int ret;
-   int index;
-   
-   /* XXX add an ending zero '\0' */
-
-   assert(msg != NULL);
-   assert(request != NULL);
-   
-   memset(request, 0, sizeof(*request));
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_VERSION, SEPARATORS,
-                          0, &request->version);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Protocol error reading protocol specification: %s",
-                   edg_wlpr_GetErrorString(ret));
-      return ret;
-   }
-   
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_COMMAND, SEPARATORS,
-                          0, &value);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Protocol error reading command specification: %s",
-                   edg_wlpr_GetErrorString(ret));
-      goto err;
-   }
-
-   ret = edg_wlpr_DecodeInt(value, (int *)(&request->command));
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Received non-numeric command specification (%s)",
-                   value);
-      free(value);
-      goto err;
-   }
-   free(value);
-
-   if (find_command(request->command) == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Received unknown command (%d)", request->command);
-      ret = EDG_WLPR_ERROR_UNKNOWN_COMMAND;
-      goto err;
-   }
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_MYPROXY_SERVER,
-                          SEPARATORS, 0, &request->myproxy_server);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      edg_wlpr_Log(LOG_ERR, "Protocol error reading myproxy server specification: %s",
-                   edg_wlpr_GetErrorString(ret));
-      goto err;
-   }
-
-#if 0
-   request->myproxy_port = EDG_WLPR_MYPROXY_PORT; /* ??? */
-   if (request->myproxy_server && (p = strchr(request->myproxy_server, ':'))) {
-      *p = '\0';
-      port = atol(p+1); /* XXX see myproxy for err check */
-      request->myproxy_port = port;
-   }
-#endif
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_PROXY, SEPARATORS, 
-                          0, &request->proxy_filename);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      edg_wlpr_Log(LOG_ERR, "Protocol error reading proxy specification: %s",
-                   edg_wlpr_GetErrorString(ret));
-      goto err;
-   }
-
-#if 0
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_UNIQUE_PROXY, 
-                          SEPARATORS, 0, &value);
-   if (ret && ret != EDG_WLPR_ERROR_PARSE_NOT_FOUND)
-      goto err;
-   if (ret == 0 && strcasecmp(value, "yes") == 0)
-      request->unique = 1;
-   free(value);
-#endif
-
-   ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_JOBID, SEPARATORS,
-                          0, &request->jobid);
-   if (ret && ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND) {
-      edg_wlpr_Log(LOG_ERR, "Protocol error reading JobId : %s",
-                  edg_wlpr_GetErrorString(ret));
-      goto err;
-   }
-
-   index = 0;
-   while ((ret = edg_wlpr_GetToken(msg, msg_len, EDG_WLPR_PROTO_ENTRY,
-                                  SEPARATORS, index, &value)) == 0) {
-      char **tmp;
-
-      tmp = realloc(request->entries, (index + 2) * sizeof(*tmp));
-      if (tmp == NULL) {
-        ret = ENOMEM;
-        goto err;
-      }
-      request->entries = tmp;
-      request->entries[index] = value;
-      index++;
-   }
-   if (ret != EDG_WLPR_ERROR_PROTO_PARSE_NOT_FOUND)
-      goto err;
-   if (request->entries)
-      request->entries[index] = NULL;
-
-   return 0;
-
-err:
-   edg_wlpr_CleanRequest(request);
-   return ret;
-}
-
-static int
-encode_response(edg_wlpr_Response *response, char **msg)
-{
-   char *buf;
-   size_t buf_len;
-   int ret;
-
-   buf_len = EDG_WLPR_BUF_SIZE;
-   buf = malloc(buf_len);
-   if (buf == NULL)
-      return ENOMEM;
-   buf[0] = '\0';
-
-   ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_VERSION,
-                            EDG_WLPR_VERSION, SEPARATORS);
-   if (ret)
-      goto err;
-
-   ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_RESPONSE,
-                             edg_wlpr_EncodeInt(response->response_code),
-                            SEPARATORS);
-   if (ret)
-      goto err;
-
-   if (response->myproxy_server) {
-      char host[1024];
-
-#if 0
-      snprintf(host, sizeof(host), "%s:%d", response->myproxy_server,
-               (response->myproxy_port) ? response->myproxy_port : EDG_WLPR_MYPROXY_PORT);
-#endif
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_MYPROXY_SERVER,
-                                host, SEPARATORS);
-      if (ret)
-         goto err;
-   }
-
-   if (response->start_time) {
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_START_TIME,
-                                edg_wlpr_EncodeInt(response->start_time),
-                               SEPARATORS);
-      if (ret)
-         goto err;
-   }
-
-   if (response->end_time) {
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_END_TIME,
-                                edg_wlpr_EncodeInt(response->end_time),
-                               SEPARATORS);
-      if (ret)
-         goto err;
-   }
-
-   if (response->next_renewal_time) {
-      ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_RENEWAL_TIME,
-                                edg_wlpr_EncodeInt(response->next_renewal_time),
-                               SEPARATORS);
-      if (ret)
-         goto err;
-   }
-
-   if (response->filenames) {
-      char **p = response->filenames;
-      while (*p) {
-         ret = edg_wlpr_StoreToken(&buf, &buf_len, EDG_WLPR_PROTO_PROXY, *p,
-                                  SEPARATORS);
-         if (ret)
-            goto err;
-         p++;
-      }
-   }
-
-   buf[strlen(buf)] = '\0';
-   *msg = buf;
-   return 0;
-
-err:
-   free(buf);
-   *msg = NULL;
-   return ret;
-}
-
-
-static void
-usage(char *progname)
-{
-   fprintf(stderr,"usage: %s [option]\n"
-          "\t-h, --help           display this help and exit\n"
-          "\t-v, --version        output version information and exit\n"
-          "\t-d, --debug          don't fork, print out debugging information\n"
-          "\t-r, --repository     repository directory\n"
-          "\t-c, --condor-limit   how long before expiration the proxy must be renewed\n"
-          "\t-C, --CAdir          trusted certificates directory\n"
-          "\t-V, --VOMSdir        trusted VOMS servers certificates directory\n"
-          "\t-A, --enable-voms    renew also VOMS certificates in proxies\n"
-          "\t-G, --voms-config    location of the vomses configuration file\n",
-          progname);
-}
-
-static int
-do_listen(char *socket_name, int *sock)
-{
-   struct sockaddr_un my_addr;
-   int s;
-   int ret;
-
-   assert(sock != NULL);
-
-   memset(&my_addr, 0, sizeof(my_addr));
-   my_addr.sun_family = AF_UNIX;
-   strncpy(my_addr.sun_path, socket_name, sizeof(my_addr.sun_path));
-   unlink(socket_name);
-   umask(0177);
-
-   s = socket(AF_UNIX, SOCK_STREAM, 0);
-   if (s == -1) {
-      edg_wlpr_Log(LOG_ERR, "socket(): %s", strerror(errno));
-      return errno;
-   }
-
-   ret = bind(s, (struct sockaddr *)&my_addr, sizeof(my_addr));
-   if (ret == -1) {
-      edg_wlpr_Log(LOG_ERR, "bind(): %s", strerror(errno));
-      close(s);
-      return errno;
-   }
-
-   ret = listen(s, 5); /* XXX enough ? */
-   if (ret == -1) {
-      edg_wlpr_Log(LOG_ERR, "listen(): %s", strerror(errno));
-      close(s);
-      return errno;
-   }
-
-   *sock = s;
-   return 0;
-}
-
-void
-edg_wlpr_Log(int dbg_level, const char *format, ...)
-{
-   va_list ap;
-   char    log_mess[1024];
-
-   /* cannot handle the %m format argument specific for syslog() */
-   va_start(ap, format);
-   vsnprintf(log_mess, sizeof(log_mess), format, ap);
-   va_end(ap);
-   
-   if (debug)
-      printf("[%d] %s\n", getpid(), log_mess);
-   else
-      if (dbg_level < LOG_DEBUG) /* XXX make configurable */
-         syslog(dbg_level, "%s", log_mess);
-}
-
-int
-start_watchdog(pid_t *pid)
-{
-   pid_t p;
-
-   switch ((p = fork())) {
-      case -1:
-        edg_wlpr_Log(LOG_ERR, "fork() failed: %s",
-                     strerror(errno));
-        return errno;
-      case 0:
-        watchdog_start();
-        exit(0); 
-        break;
-      default:
-        *pid = p;
-        return 0;
-   }
-   /* not reachable */
-   exit(0);
-}
-
-#ifdef NOVOMS
-static int
-load_vomses()
-{
-       return ENOSYS;
-}
-
-#else
-static int
-load_vomses()
-{
-   FILE *fd = NULL;
-   char line[1024];
-   char *nick, *hostname;
-   int port;
-   vomses_record *rec;
-   vomses_record **tmp;
-   char *p;
-   
-   fd = fopen(vomsconf, "r");
-   if (fd == NULL) {
-      edg_wlpr_Log(LOG_ERR, "Cannot open vomses configuration file (%s)",
-                  strerror(errno));
-      return errno;
-   }
-   while (fgets(line, sizeof(line), fd) != NULL) {
-      p = line;
-      if (*p != '"') {
-        edg_wlpr_Log(LOG_ERR, "Parsing error when reading vomses configuration file");
-        return EINVAL;
-      }
-      nick = strdup(strtok(p+1, "\""));
-
-      p = strtok(NULL, "\"");
-      hostname = strdup(strtok(NULL, "\""));
-
-      p = strtok(NULL, "\"");
-      port = atoi(strdup(strtok(NULL, "\"")));
-
-      if (nick == NULL || hostname == NULL) {
-        edg_wlpr_Log(LOG_ERR, "Parsing error when reading vomses configuration file");
-        return EINVAL;
-      }
-
-      rec = calloc(1, sizeof(*rec));
-      if (rec == NULL) {
-        edg_wlpr_Log(LOG_ERR, "Not enough memory");
-        return ENOMEM;
-      }
-      rec->nick = nick;
-      rec->hostname = hostname;
-      rec->port = port;
-
-      tmp = realloc(vomses.val, vomses.len + 1);
-      if (tmp == NULL) {
-        edg_wlpr_Log(LOG_ERR, "Not enough memory");
-        return ENOMEM;
-      }
-      vomses.val = tmp;
-      vomses.len++;
-
-      vomses.val[vomses.len-1] = rec;
-   }
-   fclose(fd);
-   return 0;
-}
-#endif
-
-int main(int argc, char *argv[])
-{
-   int   sock;
-   char  *progname;
-   int   opt;
-   int   fd;
-   char  sockname[PATH_MAX];
-   int   ret;
-   pid_t pid;
-
-   progname = strrchr(argv[0],'/');
-   if (progname) progname++; 
-   else progname = argv[0];
-
-   repository = EDG_WLPR_REPOSITORY_ROOT;
-   debug = 0;
-
-   while ((opt = getopt_long(argc, argv, "hvdr:c:C:V:AG:", opts, NULL)) != EOF)
-      switch (opt) {
-        case 'h': usage(progname); exit(0);
-        case 'v': fprintf(stdout, "%s:\t%s\n", progname, rcsid); exit(0);
-        case 'd': debug = 1; break;
-         case 'r': repository = optarg; break;
-        case 'c': condor_limit = atoi(optarg); break;
-        case 'C': cadir = optarg; break;
-        case 'V': vomsdir = optarg; break;
-        case 'A': voms_enabled = 1; break;
-        case 'G': vomsconf = optarg; break;
-        case '?': usage(progname); return 1;
-      }
-
-   if (optind < argc) {
-      usage(progname);
-      exit(1);
-   }
-
-   if (chdir(repository)) {
-      edg_wlpr_Log(LOG_ERR, "Cannot access repository directory %s (%s)",
-                  repository, strerror(errno));
-      exit(1);
-   }
-
-   globus_module_activate(GLOBUS_GSI_CERT_UTILS_MODULE);
-
-   if (!debug)
-      for (fd = 3; fd < OPEN_MAX; fd++) close(fd);
-
-   if (!debug) {
-      /* chdir ? */
-      if (daemon(1,0) == -1) {
-        perror("deamon()");
-        exit(1);
-      }
-      openlog(progname, LOG_PID, LOG_DAEMON);
-   }
-
-   if (voms_enabled) {
-      char *path;
-      char *new_path;
-      ret = load_vomses();
-      if (ret)
-        return 1;
-      setenv("GLOBUS_VERSION", "22", 0);
-      if (VOMS_INSTALL_PATH != NULL && *VOMS_INSTALL_PATH != '\0') {
-        path = getenv("PATH");
-        asprintf(&new_path, "%s:%s/bin", path, VOMS_INSTALL_PATH);
-         setenv("PATH", new_path, 1);
-      }
-   }
-   
-   ret = start_watchdog(&pid);
-   if (ret)
-      return 1;
-  
-   umask(0177);
-   snprintf(sockname, sizeof(sockname), "%s%d",
-           DGPR_REG_SOCKET_NAME_ROOT, getuid());
-   /* XXX check that the socket is not already active */
-   ret = do_listen(sockname, &sock);
-   if (ret)
-      return 1;
-   edg_wlpr_Log(LOG_DEBUG, "Listening at %s", sockname);
-
-#if 0
-   /* XXX ??? */
-   install_handlers();
-#endif
-   
-
-#if 0
-   /* XXX this overrides setings done by install_handlers()? */
-   signal(SIGTERM, cleanup);
-   signal(SIGINT, cleanup);
-   signal(SIGKILL, cleanup);
-   signal(SIGPIPE, SIG_IGN);
-
-   atexit(cleanup);
-#endif
-
-   ret = doit(sock);
-
-   close(sock);
-   return ret;
-}
-
-int
-get_proxy_base_name(char *file, char **name)
-{
-   X509 *cert = NULL;
-   EVP_PKEY *key = NULL;
-   STACK_OF(X509) *chain = NULL;
-   X509_NAME *subject = NULL;
-   int ret;
-
-   ret = load_proxy(file, &cert, &key, &chain);
-   if (ret)
-      return ret;
-
-   subject = X509_NAME_dup(X509_get_subject_name(cert));
-
-   sk_X509_insert(chain, cert, 0);
-   cert = NULL;
-
-   ret = globus_gsi_cert_utils_get_base_name(subject, chain);
-   if (ret) {
-      edg_wlpr_Log(LOG_ERR, "Cannot get subject name from proxy %s", file);
-      ret = EDG_WLPR_ERROR_SSL; /* XXX ??? */
-      goto end;
-   }
-
-   *name = X509_NAME_oneline(subject, NULL, 0);
-   ret = 0;
-
-end:
-   if (cert)
-      X509_free(cert);
-   if (key)
-      EVP_PKEY_free(key);
-   if (chain)
-      sk_X509_pop_free(chain, X509_free);
-   if (subject)
-      X509_NAME_free(subject);
-
-   return ret;
-}
diff --git a/org.glite.security.proxyrenewal/src/renewd_locl.h b/org.glite.security.proxyrenewal/src/renewd_locl.h

deleted file mode 100644 (file)

index 426c2ee..0000000
--- a/org.glite.security.proxyrenewal/src/renewd_locl.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef RENEWALD_LOCL_H
-#define RENEWALD_LOCL_H
-
-#ident "$Header$"
-
-#include <myproxy.h>
-#include <myproxy_delegation.h>
-#include <globus_gsi_cert_utils.h>
-
-#include "renewal.h"
-
-#ifdef HAVE_DMALLOC_H
-#include <dmalloc.h>
-#endif
-
-/* XXX */
-#if 0
-#define EDG_WLPR_ERROR_PARSE_NOT_FOUND EDG_WLPR_ERROR_PROTO_PARSE_ERROR
-#define EDG_WLPR_ERROR_NOTFOUND        EDG_WLPR_PROXY_NOT_REGISTERED
-#endif
-
-typedef struct {
-   unsigned int len;
-   char **val;
-} prd_list;
-
-typedef struct {
-   int suffix;
-   prd_list jobids;
-   int unique;
-   int voms_exts;
-   char *myproxy_server;
-   time_t end_time;
-   time_t next_renewal;
-} proxy_record;
-
-typedef struct vomses_record {
-   char *nick;
-   char *hostname;
-   int port;
-} vomses_record;
-
-typedef struct vomses_records {
-   unsigned int len;
-   struct vomses_record **val;
-} vomses_records;
-
-/* commands */
-void
-register_proxy(edg_wlpr_Request *request, edg_wlpr_Response *response);
-
-void
-unregister_proxy(edg_wlpr_Request *request, edg_wlpr_Response *response);
-
-void
-get_proxy(edg_wlpr_Request *request, edg_wlpr_Response *response);
-
-void
-update_db(edg_wlpr_Request *request, edg_wlpr_Response *response);
-
-int
-get_times(char *proxy_file, proxy_record *record);
-
-void
-watchdog_start(void);
-
-void
-edg_wlpr_Log(int dbg_level, const char *format, ...);
-
-int
-decode_record(char *line, proxy_record *record);
-
-int
-encode_record(proxy_record *record, char **line);
-
-void
-free_record(proxy_record *record);
-
-int
-load_proxy(const char *filename, X509 **cert, EVP_PKEY **privkey,
-           STACK_OF(X509) **chain);
-
-int
-get_proxy_base_name(char *file, char **subject);
-
-#endif /* RENEWALD_LOCL_H */
diff --git a/org.glite.wms-utils.exception/.cvsignore b/org.glite.wms-utils.exception/.cvsignore

deleted file mode 100644 (file)

index e970233..0000000
--- a/org.glite.wms-utils.exception/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.project
-\ No newline at end of file
diff --git a/org.glite.wms-utils.exception/LICENSE b/org.glite.wms-utils.exception/LICENSE

deleted file mode 100755 (executable)

index 01b973b..0000000
--- a/org.glite.wms-utils.exception/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware
-================================
-
-Copyright (c) 2004 on behalf of the EU EGEE Project: 
-The European Organization for Nuclear Research (CERN), 
-Istituto Nazionale di Fisica Nucleare (INFN), Italy
-Datamat Spa, Italy
-Centre National de la Recherche Scientifique (CNRS), France
-CS Systeme d'Information (CSSI), France
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-Universiteit van Amsterdam (UvA), Netherlands
-University of Helsinki (UH.HIP), Finlan
-University of Bergen (UiB), Norway
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if
-any, must include the following acknowledgment: "This product includes
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."
-Alternatively, this acknowledgment may appear in the software itself, if
-and wherever such third-party acknowledgments normally appear.
-
-4. The names EGEE and the EU EGEE Project must not be
-used to endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-<email address>.
-
-5. You are under no obligation whatsoever to provide anyone with any
-bug fixes, patches, or upgrades to the features, functionality or
-performance of the Software ("Enhancements") that you may develop over
-time; however, if you choose to provide your Enhancements to The EU
-EGEE Project, or if you choose to otherwise publish or distribute your
-Enhancements, in source code form without contemporaneously requiring
-end users of The EU EGEE Proejct to enter into a separate written license
-agreement for such Enhancements, then you hereby grant The EU EGEE Project
-a non-exclusive, royalty-free perpetual license to install, use, copy,
-modify, prepare derivative works, incorporate into the EGEE Middleware
-or any other computer software, distribute, and sublicense your
-Enhancements or derivative works thereof, in binary and source code
-form (if any), whether developed by The EU EGEE Project or third parties.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the EU EGEE Prject. For more information on The
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/
-
-
diff --git a/org.glite.wms-utils.exception/Makefile.am b/org.glite.wms-utils.exception/Makefile.am

deleted file mode 100755 (executable)

index b66c2bb..0000000
--- a/org.glite.wms-utils.exception/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-## Process this file with automake to produce Makefile.in
-EXTRA_DIST = LICENSE
- 
-docdir = $(datadir)/doc/@PACKAGE@-@VERSION@
-doc_DATA = LICENSE
-## Subdirectories list
-SUBDIRS = interface src 
-
-## Default flags to run aclocal
-ACLOCAL_AMFLAGS = -I project
-
-stage:
-       @set fnord $(MAKEFLAGS); amf=$$2; \
-       dot_seen=no; \
-        target="install"; \
-       prefix_arg="@prefix@"; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target $$prefix_arg in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target $$prefix_arg) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" $$prefix_arg || exit 1; \
-        fi; test -z "$$fail"
-
-distsrc: dist
-       mv $(distdir).tar.gz $(DISTTAR)/$(distdir)_src.tar.gz
-
-distbin:
-       @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        target="install"; \
-       tmpdistbin="$(WORKDIR)/dist_bin"; \
-        prefix_arg="prefix=$$tmpdistbin"; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target $$prefix_arg in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target $$prefix_arg) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" $$prefix_arg || exit 1; \
-        fi; test -z "$$fail"; \
-       pushd $$tmpdistbin; \
-       $(AMTAR) -zcf $(DISTTAR)/$(distdir)_bin.tar.gz .; \
-       popd; \
-       rm -rf $$tmpdistbin
-       
diff --git a/org.glite.wms-utils.exception/bootstrap b/org.glite.wms-utils.exception/bootstrap

deleted file mode 100755 (executable)

index ceeb099..0000000
--- a/org.glite.wms-utils.exception/bootstrap
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-mkdir -p src/autogen
-set -x
-aclocal -I project
-libtoolize --force
-autoheader
-automake --foreign --add-missing --copy
-autoconf
diff --git a/org.glite.wms-utils.exception/build.xml b/org.glite.wms-utils.exception/build.xml

deleted file mode 100755 (executable)

index 4061536..0000000
--- a/org.glite.wms-utils.exception/build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite WMS jobid module
-       
-       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>
-                  Joachim Flammer <Joachim.Flammer@cern.ch>            
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-
--->
-
-<project name="exception" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite WMS Utils Exception Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                 Load configure options (order is important)
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>    
-
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-       
-        <!-- =========================================
-                 Load common targets
-             ========================================= -->
-        <import file="${global.targets-make.file}" />
-               
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-</project>             
diff --git a/org.glite.wms-utils.exception/configure.ac b/org.glite.wms-utils.exception/configure.ac

deleted file mode 100755 (executable)

index 172ca27..0000000
--- a/org.glite.wms-utils.exception/configure.ac
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-#       Copyright (c) 2004 on behalf of the EU EGEE Project:
-#       The European Organization for Nuclear Research (CERN),
-#       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-#       Datamat Spa, Italy
-#       Centre National de la Recherche Scientifique (CNRS), France
-#       CS Systeme d'Information (CSSI), France
-#       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-#       Universiteit van Amsterdam (UvA), Netherlands
-#       University of Helsinki (UH.HIP), Finland
-#       University of Bergen (UiB), Norway
-#       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-#
-#       Common configure.ac file for the GLite WMS Common module
-#
-#       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>
-#       Version info: $Id$
-#       Release: $Name$
-#
-#       Revision history:
-#       $Log$
-#       Revision 1.7  2004/09/21 19:21:57  glbuild
-#       modified module.version
-#
-#       Revision 1.6  2004/08/17 10:41:47  eronchie
-#       Added optimize option
-#
-#       Revision 1.5  2004/07/23 08:02:09  eronchie
-#       Updated configure.ac
-#
-#       Revision 1.4  2004/07/21 18:49:26  eronchie
-#       Added AC_GLITE
-#
-#       Revision 1.3  2004/07/21 18:47:49  eronchie
-#       Removed obsolete things
-#
-#       Revision 1.2  2004/07/21 18:44:22  eronchie
-#       Updated header file
-#
-#       Revision 1.1.1.1  2004/07/21 18:16:57  eronchie
-#       Moved out exception from org.glite.wms.common/src/utilitiesY
-#
-#
-#
-                                                                                                                                                             
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.57)
-AC_INIT([GLite WMS Utils Exception], [0.1.0])
-AC_CONFIG_AUX_DIR([./project])
-AM_INIT_AUTOMAKE([1.6.3 subdir-objects])
-AC_CONFIG_SRCDIR([src/Exception.cpp])
-
-# Notices.
-AC_COPYRIGHT([Copyright (c) 2004 The EU EGEE Project
-See LICENCE file for details
-])
-AC_REVISION([$Revision$])
-
-#Environment.
-WORKDIR=`pwd`
-AC_SUBST(WORKDIR)
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_CHECK_HEADERS([fcntl.h mntent.h sys/vfs.h syslog.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_CHECK_MEMBERS([struct stat.st_rdev])
-AC_TYPE_UID_T
-AC_CHECK_TYPES([ptrdiff_t])
-
-# Checks for library functions.
-AC_HEADER_STDC
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_GETMNTENT
-AC_FUNC_MEMCMP
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero endpwent ftruncate getmntent memset mkdir pow strerror strtol])
-
-AC_GLITE
-
-AC_OPTIMIZE
-
-# Configuration items
-AC_PREFIX_DEFAULT([/opt/glite])
-AM_CONFIG_HEADER([src/autogen/config.h])
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_FILES([interface/Makefile])
-
-AC_OUTPUT
-
diff --git a/org.glite.wms-utils.exception/interface/Makefile.am b/org.glite.wms-utils.exception/interface/Makefile.am

deleted file mode 100755 (executable)

index 3c4ccb7..0000000
--- a/org.glite.wms-utils.exception/interface/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-exceptiondir = $(includedir)
-nobase_exception_HEADERS = \
-       glite/wmsutils/exception/exception_codes.h \
-       glite/wmsutils/exception/Exception.h
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/org.glite.wms-utils.exception/interface/glite/wmsutils/exception/Exception.h b/org.glite.wms-utils.exception/interface/glite/wmsutils/exception/Exception.h

deleted file mode 100644 (file)

index 7ba0fda..0000000
--- a/org.glite.wms-utils.exception/interface/glite/wmsutils/exception/Exception.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef  GLITE_WMS_UTILS_EXCEPTION_EXCEPTION_H
-#define GLITE_WMS_UTILS_EXCEPTION_EXCEPTION_H
-
-/*
- * Exception.h
- * Copyright (c) 2001 The European Datagrid Project - IST programme, all rights reserved.
- * Contributors are mentioned in the code where appropriate.
- */
-
-#include <fstream>
-#include <cstdlib>
-//#include <list>
-#include <syslog.h>  // For logging exceptions to log file
-#include <errno.h> // list the exception codes
-#include <string>
-#include <vector>
-#include <exception> // base ancestor stl::exception
-
-
-namespace glite {
-       namespace wmsutils {
-               namespace exception {
-
-extern pthread_mutex_t METHOD_MUTEX; //  used in order to store info into a file (rather then syslog)
-#define GLITE_STACK_TRY(method_name) std::string METHOD = method_name ;  int LINE = __LINE__ ; try {
-#define GLITE_STACK_CATCH() } catch (glite::wmsutils::exception::Exception &exc){ exc.push_back ( __FILE__ , LINE,  METHOD ); throw exc ;  }
-
-/**
- * The Exception base classe contains attributes into which are placed exception information and provides
- * constructor that beyond the error code take parameters specifying the source file and line number
- * (e.g. through __FILE__ and __LINE__) where the error has been generated and string messages,
- * allowing an easy way of storing the origin of the exception.
- * Moreover it provides methods for getting all the exception information and for logging them either
- * in a log file or to the syslog daemon.
- * Each of the derived types may contain its private attributes describing the actual error instance in detail.
- * Moreover each exception has an attribute representing the exception identifier that is set by the
- * class constructor and allows the identification of the original exception.
- *
- * @version 0.1
- * @date 22 July 2004
- * @author Alessandro Maraschini <alessandro.maraschini@datamat.it>
-*/
-
-class Exception : public std::exception{
-   public:
-       /**
-       *  Constructor Update all mandatory fields
-       * @param method the name of the method that raised the exception
-       * @param source The source that raised the exception (could be the file path, the class Name, etc etc)
-       * @param  exc the previous exception as in the stack trace */
-       Exception (  const std::string& source,  const std::string& method,  Exception *exc);
-       /**
-       *  Constructor Update all mandatory fields
-       * @param code the code representing the thrown exception
-       * @param exception the name of the thrown exception
-       * @param method the name of the method that raised the exception
-       * @param source The source that raised the exception (could be the file path, the class Name, etc etc)
-       * @param line_number the number of the line in the file that raised the exception(if the source has been given as a file)  */
-       Exception ( const std::string& source, const std::string& method,  int code,  const std::string& exception);
-
-       /**
-       *  Constructor Update all mandatory fields
-       * @param source the path of the file that raised the exception
-       * @param line_number the number of the line in the file that raised the exception
-       * @param method the name of the method that raised the exception
-       * @param code the code representing the thrown exception
-       * @param exception the name of the thrown exception */
-       Exception (const std::string& source,  int line_number,   const std::string& method,  int code,  const std::string& exception);
-       /**
-       * Default Destructor
-       */
-       virtual ~Exception() throw ();
-       /**
-       *  Return a string debug message containing information about Exception thrown
-       * Debug message contains all the attributes stored in an exception instance such as the method, the file and the line
-       * that threw the exception.
-       *@return the debug message string representation
-       */
-       virtual std::string dbgMessage();
-       /**
-       *  Return the error code
-       * @return The integer representing the code of the error that generated the exception
-       */
-       virtual int getCode();
-
-       /**
-       * return the Error Message associated to the Exception
-       * @return The Exception string message representation
-       */
-       virtual const char* what() const  throw ();
-
-       /**
-       *  Print Exception error information into a log file
-       * @param logfile the file where to log exception information
-       */
-       virtual void log(const std::string& logfile = "");
-       /**
-       *   Retrieve the Exception name
-       * @return the name of the Exception thrown
-       */
-       virtual std::string getExceptionName();
-
-       /**
-       *   Retrieve the Stack of the exception as a list of previous generated exceptions
-       *@return the string representation of the stack trace: each line correspond to an exception message
-       */
-       virtual std::string printStackTrace() ;
-       /**
-       *   Return the list of methods that caused the Exception
-       */
-       virtual std::vector<std::string> getStackTrace() ;
-       /**
-       * Update stack information
-       */
-       virtual void push_back (  const std::string& source, int line_number,  const std::string& method   ) ;
-  protected:
-               Exception();
-               int                   error_code;
-               std::string          error_message ;
-               int                   line;
-               std::string          source_file;
-               std::string          exception_name;
-               std::string          method_name ;
-               std::string          stack;
-               std::vector< std::string> stack_strings ;
-               std::string          ancestor ;
-}; //End  Exception Class
-}}}  // Closing namespace
-#endif
diff --git a/org.glite.wms-utils.exception/interface/glite/wmsutils/exception/exception_codes.h b/org.glite.wms-utils.exception/interface/glite/wmsutils/exception/exception_codes.h

deleted file mode 100755 (executable)

index fce99aa..0000000
--- a/org.glite.wms-utils.exception/interface/glite/wmsutils/exception/exception_codes.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef   GLITE_WMSUTILS_EXCEPTION_CODES_H
-#define  GLITE_WMSUTILS_EXCEPTION_CODES_H
-// pure C-style code (needed by some libraries)
-#define GLITE_WMS_COMMON_ERROR_BASE 900
-#define GLITE_WMS_USERINTERFACE_ERROR_BASE 1000
-#define GLITE_WMS_NETWORKSERVER_ERROR_BASE 1200
-#define GLITE_WMS_SOCKET_ERROR_BASE 1300
-#define GLITE_WMS_LDAP_ERROR_BASE 1350
-#define GLITE_WMS_LOGGING_ERROR_BASE 1400
-#define GLITE_WMS_REQUESTAD_ERROR_BASE 1500
-#define GLITE_WMS_CHECKPOINT_ERROR_BASE 1600
-#define GLITE_WMS_CONFIGURATION_ERROR_BASE 1800
-#ifdef __cplusplus
-namespace glite { 
-namespace wmsutils { 
-namespace exception {
-       /**
-       * The Error Code
-       */
-       enum {
-                       WMS_COMMON_BASE = GLITE_WMS_COMMON_ERROR_BASE,
-                       THREAD_INIT  ,          // pthread_attr_init              method failed
-                       THREAD_DETACH ,         // pthread_attr_setdetachstate    method failed
-                       THREAD_CREATE ,         // pthread_create                 method failed
-                       THREAD_JOIN,
-                       THREAD_SSL,
-                       WMS_FATAL_ERROR,
-                       WMS_UI_ERROR_BASE            = GLITE_WMS_USERINTERFACE_ERROR_BASE,
-                       WMS_NS_ERROR_BASE            = GLITE_WMS_NETWORKSERVER_ERROR_BASE,
-                       WMS_SOCKET_ERROR_BASE        = GLITE_WMS_SOCKET_ERROR_BASE,
-                       WMS_LDAP_ERROR_BASE          = GLITE_WMS_LDAP_ERROR_BASE,
-                       WMS_LB_ERROR_BASE            = GLITE_WMS_LOGGING_ERROR_BASE ,
-                       WMS_REQUESTAD_ERROR_BASE     = GLITE_WMS_REQUESTAD_ERROR_BASE,
-                       WMS_CHKPT_ERROR_BASE         = GLITE_WMS_CHECKPOINT_ERROR_BASE,
-                       WMS_CONFIGURATION_ERROR_BASE = GLITE_WMS_CONFIGURATION_ERROR_BASE
-       };
-} // exception namespace
-} // wmsutils namespace
-} // glite namespace
-#endif   //ifdef c++
-#endif
diff --git a/org.glite.wms-utils.exception/project/build.properties b/org.glite.wms-utils.exception/project/build.properties

deleted file mode 100755 (executable)

index e69de29..0000000
diff --git a/org.glite.wms-utils.exception/project/configure.properties.xml b/org.glite.wms-utils.exception/project/configure.properties.xml

deleted file mode 100644 (file)

index 04d3b17..0000000
--- a/org.glite.wms-utils.exception/project/configure.properties.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-       <!-- ======================================================
-                 Define extra properties here ...
-                 ====================================================== -->
-        
-       <project name="configure options">                                                                        
-        <property name="configure.args"
-               value="--prefix=${workspace.abs.dir}/stage --with-globus-prefix=${with.globus.prefix} --with-globus-thr-flavor=${with.globus.thr.flavor} --with-globus-nothr-flavor=${with.globus.nothr.flavor} --with-cppunit-prefix=${with.cppunit.prefix} --with-glite-location=${with.glite.location} --with-dist-location=${with.dist.location} --disable-optimization"/>
-
-       </project>
diff --git a/org.glite.wms-utils.exception/project/properties.xml b/org.glite.wms-utils.exception/project/properties.xml

deleted file mode 100755 (executable)

index 1e49af0..0000000
--- a/org.glite.wms-utils.exception/project/properties.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite WMS Common component
-       
-       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>          
-                  Joachim Flammer <Joachim.Flammer@cern.ch>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.5  2004/08/04 07:40:02  eronchie
-       Added cppunit
-       
-       Revision 1.4  2004/07/28 07:26:45  eronchie
-       Added /
-       
-       Revision 1.3  2004/07/28 07:19:56  eronchie
-       Added m4files.list
-       
-       Revision 1.2  2004/07/23 15:37:26  eronchie
-       Commit
-       
-       Revision 1.1.1.1  2004/07/21 18:16:57  eronchie
-       Moved out exception from org.glite.wms.common/src/utilitiesY
-       
-       Revision 1.2  2004/07/16 14:56:56  flammer
-       Corrected input path of build.properties.
-       
-       Revision 1.1.1.1  2004/05/26 18:45:05  eronchie
-       Import of wms jobid
-       
-       
--->
-
-<project name="WMS Utils Exception component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${wms-utils.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${wms-utils.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="exception" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-                                               
-       <!-- ======================================================
-                Define extra properties here ...
-                ====================================================== -->
-                
-       <property name="m4files.list" value="glite.m4 cppunit optimize.m4"/>
-
-</project>
diff --git a/org.glite.wms-utils.exception/project/version.properties b/org.glite.wms-utils.exception/project/version.properties

deleted file mode 100755 (executable)

index 8a50f0a..0000000
--- a/org.glite.wms-utils.exception/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 06:26:31 CEST 2004
-module.version=0.1.0
-module.build=45
-module.age=0
diff --git a/org.glite.wms-utils.exception/src/Exception.cpp b/org.glite.wms-utils.exception/src/Exception.cpp

deleted file mode 100644 (file)

index 1ec3b4a..0000000
--- a/org.glite.wms-utils.exception/src/Exception.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/* **************************************************************************
-*  filename  : Exceptions.cpp
-*  author    : Alessandro Maraschini <alessandro.maraschini@datamat.it>
-*  copyright : (C) 2002 by DATAMAT
-***************************************************************************/
-
-#include "glite/wmsutils/exception/Exception.h"
-#include "glite/wmsutils/exception/exception_codes.h"
-
-namespace glite {
-namespace wmsutils{
-namespace exception {
-using namespace std ;
-pthread_mutex_t METHOD_MUTEX  ;  // This mutex is used in order to lock the file for writing log infornation
-/* *********************************
-* Exception Class Implementation
-************************************/
-//Constructor/Destructor
-
-Exception::Exception () {
-       line = 0;
-} ;
-Exception::~Exception() throw(){ }
-/**
-* Exception chainig
-*/
-void Exception::push_back (  const string& source, int line_number,  const string& method ){
-       stack_strings.push_back ( dbgMessage() ) ;
-       ancestor = what() ;
-       source_file = source ;
-       line = line_number ;
-       method_name    =  method;
-       error_message = "" ;
-       exception_name="" ;
-}
-Exception::Exception( const std::string& file, int line_number,  const std::string& method,  int code, const std::string& name)
-       : error_code(code), exception_name(name){
-       source_file    = file;
-       line           = line_number;
-       method_name    = method;
-};
-Exception::Exception (const string& source, const string& method, int code, const string& exception)
-       : error_code(code), exception_name(exception){
-       source_file    = source;
-       method_name    = method;
-       // stack= "";
-       line = 0;
-};
-int Exception::getCode(){
-    if  (error_code != 0)
-       return error_code ;
-    else
-       return WMS_COMMON_BASE;
-};
-const char* Exception::what() const throw(){
-  if (!ancestor.empty() )
-       return ancestor.c_str() ;
-  if  ( error_message != "")
-       return error_message.c_str() ;
-  else       return "" ;
-
-};
-string Exception::getExceptionName(){
-   if  (exception_name!= "")
-     return exception_name;
-   else
-     return "" ;
-};
-void Exception::log(const std::string& logfile)
-{
-    if (  logfile == "")
-       syslog (  LOG_PERROR,   (char *)  (dbgMessage()).c_str()  );
-    else{
-       pthread_mutex_lock( &METHOD_MUTEX);                   //   LOCK
-       //TBD : test if file exist-->>Create HEADER   ??
-       ofstream fout ((char *)   logfile.c_str()  , ios::app );  //Open the file for writing (if it doesn't exist then it will be created)
-       fout << "\n" << dbgMessage() ;  //write (append) the message
-       fout.close();  //close the file
-       pthread_mutex_unlock( &METHOD_MUTEX);               //   UNLOCK
-    }
-};
-string Exception::printStackTrace(){
-       string stack = "" ;
-       for (unsigned int i = 0 ; i < stack_strings.size() ; i++ ){
-               stack+=stack_strings[i] +"\n" ;
-       }
-       return stack +dbgMessage();
-};
-vector<string> Exception::getStackTrace(){
-       // make a copy of the stack
-       vector<string> stack = stack_strings ;
-       stack.push_back(dbgMessage() ) ;
-       return stack;
-};
-
-string Exception::dbgMessage(){
-   string result ;
-   //Adding exception Name
-   if ( exception_name!="")
-        result = exception_name ;
-   //Adding error msg
-   if (error_message!="")
-        result +=": " + string(what());
-   if (result != "")
-      result+="\n";
-   //Adding  Source
-   result +="\tat " + method_name  +"[" +source_file;
-   //Adding line number
-   if (line!=0){
-      char buffer [1024] ;
-      sprintf (buffer, "%i" ,  line) ;
-      result += ":" + string ( buffer );
-   }
-   result +="]" ;
-   return result;
-}
-
-}}}  // Closing namespace
-
diff --git a/org.glite.wms-utils.exception/src/Makefile.am b/org.glite.wms-utils.exception/src/Makefile.am

deleted file mode 100755 (executable)

index 0c5caac..0000000
--- a/org.glite.wms-utils.exception/src/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-lib_LTLIBRARIES    = libglite_wmsutils_exception.la
-
-libglite_wmsutils_exception_la_SOURCES = \
-       Exception.cpp
-
-AM_CPPFLAGS = -I$(top_srcdir)/interface \
-       -I$(top_srcdir)/src 
-
-MAINTAINERCLEANFILES = Makefile.in *.*~
diff --git a/org.glite.wms-utils.jobid/.cvsignore b/org.glite.wms-utils.jobid/.cvsignore

deleted file mode 100755 (executable)

index 1df717b..0000000
--- a/org.glite.wms-utils.jobid/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.project
-.cdtproject
-\ No newline at end of file
diff --git a/org.glite.wms-utils.jobid/LICENSE b/org.glite.wms-utils.jobid/LICENSE

deleted file mode 100755 (executable)

index 01b973b..0000000
--- a/org.glite.wms-utils.jobid/LICENSE
+++ /dev/null
@@ -1,69 +0,0 @@
-LICENSE file for EGEE Middleware
-================================
-
-Copyright (c) 2004 on behalf of the EU EGEE Project: 
-The European Organization for Nuclear Research (CERN), 
-Istituto Nazionale di Fisica Nucleare (INFN), Italy
-Datamat Spa, Italy
-Centre National de la Recherche Scientifique (CNRS), France
-CS Systeme d'Information (CSSI), France
-Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-Universiteit van Amsterdam (UvA), Netherlands
-University of Helsinki (UH.HIP), Finlan
-University of Bergen (UiB), Norway
-Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if
-any, must include the following acknowledgment: "This product includes
-software developed by The EU EGEE Project (http://cern.ch/eu-egee/)."
-Alternatively, this acknowledgment may appear in the software itself, if
-and wherever such third-party acknowledgments normally appear.
-
-4. The names EGEE and the EU EGEE Project must not be
-used to endorse or promote products derived from this software without
-prior written permission. For written permission, please contact
-<email address>.
-
-5. You are under no obligation whatsoever to provide anyone with any
-bug fixes, patches, or upgrades to the features, functionality or
-performance of the Software ("Enhancements") that you may develop over
-time; however, if you choose to provide your Enhancements to The EU
-EGEE Project, or if you choose to otherwise publish or distribute your
-Enhancements, in source code form without contemporaneously requiring
-end users of The EU EGEE Proejct to enter into a separate written license
-agreement for such Enhancements, then you hereby grant The EU EGEE Project
-a non-exclusive, royalty-free perpetual license to install, use, copy,
-modify, prepare derivative works, incorporate into the EGEE Middleware
-or any other computer software, distribute, and sublicense your
-Enhancements or derivative works thereof, in binary and source code
-form (if any), whether developed by The EU EGEE Project or third parties.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL PROJECT OR ITS CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the EU EGEE Prject. For more information on The
-EU EGEE Project, please see http://cern.ch/eu-egee/. For more information on
-EGEE Middleware, please see http://egee-jra1.web.cern.ch/egee-jra1/
-
-
diff --git a/org.glite.wms-utils.jobid/Makefile.am b/org.glite.wms-utils.jobid/Makefile.am

deleted file mode 100755 (executable)

index bf956e1..0000000
--- a/org.glite.wms-utils.jobid/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-## Process this file with automake to produce Makefile.in
-
-EXTRA_DIST = LICENSE
-
-docdir = $(datadir)/doc/@PACKAGE@-@VERSION@
-doc_DATA = LICENSE
-
-## Subdirectories list
-SUBDIRS = interface src examples 
-
-## Default flags to run aclocal
-ACLOCAL_AMFLAGS = -I project
-
-stage:
-       @set fnord $(MAKEFLAGS); amf=$$2; \
-       dot_seen=no; \
-        target="install"; \
-       prefix_arg="@prefix@"; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target $$prefix_arg in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target $$prefix_arg) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" $$prefix_arg || exit 1; \
-        fi; test -z "$$fail"
-
-distsrc: dist
-       mv $(distdir).tar.gz $(DISTTAR)/$(distdir)_src.tar.gz
-
-distbin:
-       @set fnord $(MAKEFLAGS); amf=$$2; \
-        dot_seen=no; \
-        target="install"; \
-       tmpdistbin="$(WORKDIR)/dist_bin"; \
-        prefix_arg="prefix=$$tmpdistbin"; \
-        list='$(SUBDIRS)'; for subdir in $$list; do \
-          echo "Making $$target $$prefix_arg in $$subdir"; \
-          if test "$$subdir" = "."; then \
-            dot_seen=yes; \
-            local_target="$$target-am"; \
-          else \
-            local_target="$$target"; \
-          fi; \
-          (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target $$prefix_arg) \
-           || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-        done; \
-        if test "$$dot_seen" = "no"; then \
-          $(MAKE) $(AM_MAKEFLAGS) "$$target-am" $$prefix_arg || exit 1; \
-        fi; test -z "$$fail"; \
-       pushd $$tmpdistbin; \
-       $(AMTAR) -zcf $(DISTTAR)/$(distdir)_bin.tar.gz .; \
-       popd; \
-       rm -rf $$tmpdistbin
-       
diff --git a/org.glite.wms-utils.jobid/bootstrap b/org.glite.wms-utils.jobid/bootstrap

deleted file mode 100755 (executable)

index ceeb099..0000000
--- a/org.glite.wms-utils.jobid/bootstrap
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-
-mkdir -p src/autogen
-set -x
-aclocal -I project
-libtoolize --force
-autoheader
-automake --foreign --add-missing --copy
-autoconf
diff --git a/org.glite.wms-utils.jobid/build.xml b/org.glite.wms-utils.jobid/build.xml

deleted file mode 100755 (executable)

index 220b2a6..0000000
--- a/org.glite.wms-utils.jobid/build.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Build file for the GLite WMS jobid module
-       
-       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>
-                  Joachim Flammer <Joachim.Flammer@cern.ch>            
-       Version info: $Id$
-       Release: $Name$
-
-       Revision history:
-       $Log$
-
--->
-
-<project name="jobid" default="dist">
-       
-       <!-- =========================================
-                Builds the GLite WMS Utils Jobid Module
-            ========================================= -->
-       
-       <!-- =========================================
-            Import properties (order is important)
-            ========================================= -->
-
-       <!-- import baseline & user properties -->
-       <import file="../org.glite/project/baseline.properties.xml" />
-
-       <!-- import component build properties,
-                       component properties &
-                       component common properties -->
-       <import file="./project/properties.xml"/>
-       
-       <!-- import subsystem build properties,
-                       subsystem properties &
-                       subsystem common properties -->
-       <import file="${subsystem.properties.file}"/>
-
-       <!-- import global build properties &
-                       global properties -->
-       <import file="${global.properties.file}" />
-               
-       <!-- =========================================
-                Load dependency property files (order is important)
-            ========================================= -->
-       <property file="${user.dependencies.file}"/>
-       <property file="${component.dependencies.file}" />
-       <property file="${subsystem.dependencies.file}" />
-       <property file="${global.dependencies.file}"/>
-       
-       <!-- =========================================
-                 Load configure options (order is important)
-             ========================================= -->
-        <import file="${global.configure.options.file}"/>
-       <import file="${component.configure.options.file}"/>    
-
-       <!-- =========================================
-                Import task definitions (order is important)
-            ========================================= -->
-       <import file="${subsystem.taskdefs.file}" />
-       <import file="${global.taskdefs.file}" />
-       
-        <!-- =========================================
-                 Load common targets
-             ========================================= -->
-        <import file="${global.targets-make.file}" />
-               
-       <!-- =========================================
-                Load version file 
-            ========================================= -->
-       <property file="${module.version.file}"/>
-               
-       <!-- ==============================================
-                Local private targets
-            ============================================== -->
-       
-       <target name="localinit"
-               description="Module specific initialization tasks">
-       </target>
-               
-       <target name="localcompile"
-               description="Module specific compile tasks">
-       </target>
-       
-       <target name="localclean"
-               description="Module specific cleaning tasks">
-       </target>
-       
-</project>             
diff --git a/org.glite.wms-utils.jobid/configure.ac b/org.glite.wms-utils.jobid/configure.ac

deleted file mode 100755 (executable)

index d4094d0..0000000
--- a/org.glite.wms-utils.jobid/configure.ac
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-#       Copyright (c) 2004 on behalf of the EU EGEE Project:
-#       The European Organization for Nuclear Research (CERN),
-#       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-#       Datamat Spa, Italy
-#       Centre National de la Recherche Scientifique (CNRS), France
-#       CS Systeme d'Information (CSSI), France
-#       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-#       Universiteit van Amsterdam (UvA), Netherlands
-#       University of Helsinki (UH.HIP), Finland
-#       University of Bergen (UiB), Norway
-#       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-#
-#       Common configure.ac file for the GLite WMS Common module
-#
-#       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>
-#       Version info: $Id$
-#       Release: $Name$
-#
-#       Revision history:
-#       $Log$
-#       Revision 1.12  2004/09/21 19:22:09  glbuild
-#       modified module.version
-#
-#       Revision 1.11  2004/08/17 13:46:28  eronchie
-#       Added interface
-#
-#       Revision 1.10  2004/08/17 13:41:20  eronchie
-#       Moved out JobIdExceptions.h cjobid.h JobId.h
-#       Put in interface/glite/wmsutils/jobid
-#
-#       Revision 1.9  2004/08/17 10:40:34  eronchie
-#       Added optimize option
-#
-#       Revision 1.8  2004/07/27 09:14:19  eronchie
-#       Removed AC_WMSUTILS_EXCEPTION and AC_GLOBUS_SSL_UTILS checks
-#       Set directly exception library macro
-#
-#       Revision 1.7  2004/07/21 17:53:36  eronchie
-#       Moved out org.glite.wms.jobid from org.glite.wms and put in org.glite.wms-utils
-#
-#
-#
-                                                                                                                                                             
-# Process this file with autoconf to produce a configure script.
-
-AC_PREREQ(2.57)
-AC_INIT([GLite WMS Utils Jobid], [0.1.0])
-AC_CONFIG_AUX_DIR([./project])
-AM_INIT_AUTOMAKE([1.6.3 subdir-objects])
-AC_CONFIG_SRCDIR([src/jobid/strmd5.h])
-
-# Notices.
-AC_COPYRIGHT([Copyright (c) 2004 The EU EGEE Project
-See LICENCE file for details
-])
-AC_REVISION([$Revision$])
-
-#Environment.
-WORKDIR=`pwd`
-AC_SUBST(WORKDIR)
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AM_PROG_CC_C_O
-AC_PROG_LIBTOOL
-
-# Checks for libraries.
-
-# Checks for header files.
-AC_CHECK_HEADERS([fcntl.h mntent.h sys/vfs.h syslog.h unistd.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_OFF_T
-AC_TYPE_SIZE_T
-AC_CHECK_MEMBERS([struct stat.st_rdev])
-AC_TYPE_UID_T
-AC_CHECK_TYPES([ptrdiff_t])
-
-# Checks for library functions.
-AC_HEADER_STDC
-AC_FUNC_ERROR_AT_LINE
-AC_FUNC_GETMNTENT
-AC_FUNC_MEMCMP
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero endpwent ftruncate getmntent memset mkdir pow strerror strtol])
-
-have_globus=no
-                                                                                
-AC_GLOBUS([], have_globus=yes, have_globus=no)
-AC_MSG_RESULT(["GLOBUS found $have_globus"])
-
-have_glite_wmsutils_exception=no
-                                                                                
-AC_GLITE
-
-GLITE_WMSUTILS_EXCEPTION_LIBS="-L$GLITE_LOCATION/lib -lglite_wmsutils_exception"AC_SUBST(GLITE_WMSUTILS_EXCEPTION_LIBS)
-
-AC_OPTIMIZE
-
-# Configuration items
-AC_PREFIX_DEFAULT([/opt/glite])
-AM_CONFIG_HEADER([src/autogen/config.h])
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([examples/Makefile])
-AC_CONFIG_FILES([interface/Makefile])
-AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_FILES([src/jobid/Makefile])
-
-AC_OUTPUT
-
diff --git a/org.glite.wms-utils.jobid/examples/Makefile.am b/org.glite.wms-utils.jobid/examples/Makefile.am

deleted file mode 100755 (executable)

index fa9a407..0000000
--- a/org.glite.wms-utils.jobid/examples/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-STDCPP = -lstdc++
-
-JOBID = $(top_builddir)/src/jobid/libglite_wmsutils_cjobid.la
-
-check_PROGRAMS = testjobid 
-
-testjobid_SOURCES = testjobid.c
-testjobid_LDADD = \
-       $(JOBID) \
-       $(GLITE_WMSUTILS_EXCEPTION_LIBS) \
-       $(GLOBUS_SSL_THR_LIBS) \
-       $(STDCPP)
-
-AM_CPPFLAGS = -I$(top_srcdir)/src \
-       -I$(top_srcdir)/interface \
-        $(GLITE_CFLAGS) \
-       $(GLOBUS_THR_CFLAGS)
-
-MAINTAINERCLEANFILES = Makefile.in *~
-
diff --git a/org.glite.wms-utils.jobid/examples/testjobid.c b/org.glite.wms-utils.jobid/examples/testjobid.c

deleted file mode 100755 (executable)

index 56f6cba..0000000
--- a/org.glite.wms-utils.jobid/examples/testjobid.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* test code for jobid routines */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-int main(int argc, char* argv[])
-{
-  char* ju;
-  char* bkserver = "ujsa.uhjs";
-
-  edg_wlc_JobId ji = 0;
-  edg_wlc_JobId ji2 = 0;
-
-  int r = edg_wlc_JobIdCreate(bkserver, 0, &ji);
-  printf("Create: %d\n", r);
-
-  ju = edg_wlc_JobIdUnparse(ji);
-  printf("Unparse:  %s\n", ju);
-
-  edg_wlc_JobIdParse(ju, &ji2);
-  free(ju);
-
-  ju = edg_wlc_JobIdUnparse(ji);
-  printf("Unparse2: %s\n", ju);
-  free(ju);
-
-  edg_wlc_JobIdFree(ji);
-  edg_wlc_JobIdFree(ji2);
-
-  return 0;
-}
diff --git a/org.glite.wms-utils.jobid/interface/Makefile.am b/org.glite.wms-utils.jobid/interface/Makefile.am

deleted file mode 100755 (executable)

index 8737f19..0000000
--- a/org.glite.wms-utils.jobid/interface/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-jobiddir = $(includedir)
-nobase_jobid_HEADERS = \
-       glite/wmsutils/jobid/cjobid.h \
-       glite/wmsutils/jobid/manipulation.h \
-       glite/wmsutils/jobid/JobIdExceptions.h \
-       glite/wmsutils/jobid/JobId.h
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h

deleted file mode 100755 (executable)

index f7c1bb5..0000000
--- a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobId.h
+++ /dev/null
@@ -1,120 +0,0 @@
-#ifndef GLITE_WMSUTILS_JOBID_JOBID_H
-#define GLITE_WMSUTILS_JOBID_JOBID_H
-
-/*
- * JobId.h
- * Copyright (c) 2001 The European Datagrid Project - IST programme, all rights reserved.
- *
- */
-
-#include <string>
-#include <iosfwd>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-
-typedef struct _edg_wlc_jobid_s* edg_wlc_jobid_t;
-
-namespace glite { 
-namespace wmsutils { 
-namespace jobid {
-
-/**
- * Managing Identification, checking, retreiving info from a job
- * File name: JobId.h
- * The JobId class provides a representation of the Datagrid job identifier
- * (dg_jobId) and the methods for manipulating it.
- * We remind that the format of the dg_jobId is as follows:
- * <LB address>:<LB port>/<Unique String>
- *
- * @ingroup common
- * @version 0.1
- * @date 15 April 2002
- * @author Alessandro Maraschini <alessandro.maraschini@datamat.it>  */ 
-
-class JobId {
-public:
-    /**@name Constructors/Destructor */
-    //@{
-    /** Instantiates an empty  JobId object */
-    JobId() ;
-    /**
-     * Instantiates a JobId object from the passed dg_jobId in string format.
-     * @param  job_id_string a string representig a classAd expression
-     * @throws  WrongIdException When a string is passed in a wrong format
-     */
-    JobId(const std::string& job_id_string ) ;
-    JobId(const JobId&);
-    JobId(const edg_wlc_JobId&);
-    /**
-     * Destructor
-     * Destroy the Job Id instance
-     */
-    ~JobId() ;
-  //@}
-
-    /**@name Miscellaneous  */
-    //@{
-    /** Unsets the JobId instance. Clear all it's memebers */
-    void clear() ;
-    /**
-     * Check wheater the jobId has been already created (true) or not (false)
-     *@return  true (jobId created) or false (jobId not yet created)
-     */
-    bool isSet() { return ( m_JobId != 0 ) ; }
-    /**
-     * Set the JobId instance according to the LB and RB server addresses and the unique string passed as input parameters.
-     * @param lb_server  Loggin and Bookkeeping server  address
-     * @param port Loggin and Bookkeeping port ( dafault value is 9000 )
-     * @param  unique A Unique identification ( automatically generatad by md5 protocol )
-     * @throws  WrongIdException  When one parameter has been passed in a wrong format  */
-    void setJobId(const std::string& lb_server, int port = 0, const std::string& unique = "");
-  //@}
-    /**@name Get Methods */
-  //@{
-    /** @return the LB address  into its string format
-    * @throws  EmptyIdException  If the jobId has not been initialised yet */
-    std::string getServer() const;
-    /** @return the Unique string into its string format
-    * @throws  EmptyIdException  If the jobId has not been initialised yet */
-    std::string getUnique() const;
-  //@}
-    /** This method sets the JobId instance from the JobId in string format given
-    * as input.
-    * @param dg_JobId the string representing the job
-    * @throws  WrongIdException  When a string is passed in a wrong format */
-    void fromString ( const std::string& dg_JobId );
-    /** Converts the jobId into a string
-    @return the string representation of a JobId*/
-    std::string toString() const;
-    operator const edg_wlc_JobId() const { return m_JobId; }
-    JobId & operator=(JobId const &);
-    JobId & operator=(const edg_wlc_JobId &);
-    edg_wlc_JobId  getId() const ;
-private:
-    // This Variable stores the Job unique identification String
-    edg_wlc_JobId m_JobId;
-    mutable char* m_pStr;
-    mutable char* m_pBkserver;
-    mutable char* m_pUnique;
-
-    friend bool operator<(JobId const& lhs, JobId const& rhs);
-    friend bool operator==(JobId const& lhs, JobId const& rhs);
-};
-
-inline bool operator<(JobId const& lhs, JobId const& rhs)
-{
-  return    strcmp ( lhs.m_pStr , rhs.m_pStr )  <0 ;
-}
-
-inline bool operator==(JobId const& lhs, JobId const& rhs)
-{
-return     strcmp ( lhs.m_pStr , rhs.m_pStr ) ==0 ;
-}
-
-std::ostream& operator<<(std::ostream& os, JobId const& id);
-
-} // namespace jobid
-} // namespace wmsutils
-} // namespace glite
-
-#endif // GLITE_WMSUTILS_JOBID_JOBID_H
diff --git a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobIdExceptions.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobIdExceptions.h

deleted file mode 100755 (executable)

index 42cbdf4..0000000
--- a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/JobIdExceptions.h
+++ /dev/null
@@ -1,80 +0,0 @@
-#ifndef GLITE_WMSUTILS_JOBID_EXCEPTIONS_H
-#define GLITE_WMSUTILS_JOBID_EXCEPTIONS_H
-
-/*
- * JobIdExceptions.h
- * Copyright (c) 2001 The European Datagrid Project - IST programme, all rights reserved.
- */
-
-#include "glite/wmsutils/exception/Exception.h"
-
-namespace glite { 
-namespace wmsutils { 
-namespace jobid {
-
-/**
- * JobIdException - Exception thrown by JobId Class
- * @ingroup Common
- * @version 0.1
- * @date 15 April 2002
- * @author Alessandro Maraschini <alessandro.maraschini@datamat.it>
-*/
-
-class JobIdException : public glite::wmsutils::exception::Exception {
-public:
-    /**
-     * Update all mandatory Exception Information
-     */
-  JobIdException (const std::string& file,
-                                   int line,
-                                   const std::string& method,
-                                   int code,
-                                   const std::string& exception_name) ;
-};//End CLass  JobIdException
-
-/**
-* WrongIdFieldException
-* This Exception is thrown when a Job Id syntax error is found
-* A valid Job Identification string should be made as follows:
-* <LB address>:<LB port>/ <Unique string> */
-class  WrongIdException  : public JobIdException {
-public:
-  /**
-  * Constructor
-  * @param file - The source file which has generated the Exception
-  * @param line - The line number in the source file where the Exception has been thrown
-  * @param method - The Name of the method which has thrown the Exception
-  * @param code - The Code of the Error raised
-  * @param field - The wrong expression catched */
-    WrongIdException(const std::string& file,
-                                      int line,
-                                      const std::string& method,
-                                      int code );
-}; //End CLass WrongIdException
-/**
-*  EmptyIdException
-* This Exception is thrown when the user tries to get information from a JobId
-* which has not been initialized yet, i.e tries to use the get<field name> Methods
-*/
-class EmptyIdException : public JobIdException {
-public:
-  /**
-  * Constructor
-  * @param file - The source file which has generated the Exception
-  * @param line - The line number in the source file where the Exception has been thrown
-  * @param method - The Name of the method which has thrown the Exception
-  * @param code - The Code of the Error raised
-  * @param field - The Empty filed requested for */
-    EmptyIdException::EmptyIdException(const std::string& file,
-                                      int line,
-                                      const std::string& method,
-                                      int code ,
-                                      const std::string& field );
-}; //End CLass EmptyIdException
-
-} // namespace jobid
-} // namespace wmsutils
-} // namespace glite
-
-#endif // GLITE_WMSUTILS_JOBID_EXCEPTIONS_H
-
diff --git a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/cjobid.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/cjobid.h

deleted file mode 100755 (executable)

index e8f84f5..0000000
--- a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/cjobid.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#ifndef _GLITE_JOBID_H
-#define _GLITE_JOBID_H
-
-/*!
- * \file cjobid.h
- * \brief L&B consumer API
- */
-
-#ident "$Header$"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct _edg_wlc_JobId *edg_wlc_JobId;
-
-#define GLITE_WMSC_JOBID_DEFAULT_PORT 9000 /**< Default port where bookkeeping server listens */
-#define GLITE_WMSC_JOBID_PROTO_PREFIX "https://" /**< JobId protocol prefix */
-
-
-/* All the pointer functions return malloc'ed objects (or NULL on error) */
-
-/**
- * Create a Job ID.
- * See the lb_draft document for details on its construction and components
- * \param bkserver book keeping server hostname
- * \param port port for the bk service
- * \param jobid new created job id
- * \ret al 0 success
- * \retval EINVAL invalid bkserver
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdCreate(const char * bkserver, int port, edg_wlc_JobId * jobid);
-
-/**
- * Recreate a Job ID
- * \param bkserver bookkeeping server hostname
- * \param port port for the bk service
- * \param unique string which represent created jobid (if NULL then new
- * one is created)
- * \param jobid new created job id
- * \retval 0 success
- * \retval EINVAL invalid bkserver
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdRecreate(const char *bkserver, int port, const char * unique, edg_wlc_JobId * jobid);
-
-/**
- * Create copy of Job ID
- * \param in jobid for duplication
- * \param jobid  duplicated jobid
- * \retval 0 for success
- * \retval EINVAL invalid jobid
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdDup(const edg_wlc_JobId in, edg_wlc_JobId * jobid);
-
-/*
- * Free jobid structure
- * \param jobid for dealocation
- */
-void edg_wlc_JobIdFree(edg_wlc_JobId jobid);
-
-/**
- * Parse Job ID string and creates jobid structure
- * \param jobidstr string representation of jobid
- * \param jobid parsed job id
- * \retval 0 for success
- * \retval EINVAL jobidstr can't be parsed
- * \retval ENOMEM if memory allocation fails
- */
-int edg_wlc_JobIdParse(const char* jobidstr, edg_wlc_JobId * jobid);
-
-/**
- * Unparse Job ID (produce the string form of JobId).
- * \param jobid to be converted to string
- * \return allocated string which represents jobid
- */
-char* edg_wlc_JobIdUnparse(const edg_wlc_JobId jobid);
-
-/**
- * Extract bookkeeping server address (address:port)
- * \param jobid from which the bkserver address should be extracted
- * \retval pointer to allocated string with bkserver address
- * \retval NULL if jobid is 0 or memory allocation fails
- */
-char* edg_wlc_JobIdGetServer(const edg_wlc_JobId jobid);
-
-/**
- * Extract bookkeeping server address and port
- * \param jobid from which the bkserver address should be extracted
- * \param srvName pointer where to return server name
- * \param srvPort pointer where to return server port
- *     */
-void edg_wlc_JobIdGetServerParts(const edg_wlc_JobId jobid, char **srvName, unsigned int *srvPort);
-
-/**
- * Extract unique string 
- * \param jobid
- * \retval pointer to allocated unique string representing jobid
- * \retval NULL if jobid is 0 or memory allocation fails
- */
-char* edg_wlc_JobIdGetUnique(const edg_wlc_JobId jobid);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GLITE_JOBID_H */
diff --git a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/manipulation.h b/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/manipulation.h

deleted file mode 100755 (executable)

index 9f862ae..0000000
--- a/org.glite.wms-utils.jobid/interface/glite/wmsutils/jobid/manipulation.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef GLITE_WMSUTILS_JOBID_MANIPULATION_H
-#define GLITE_WMSUTILS_JOBID_MANIPULATION_H
-
-#include <string>
-
-namespace glite {
-namespace wmsutils {
-namespace jobid {
-
-class JobId;
-
-std::string get_reduced_part( const JobId &id, int level = 0 );
-std::string to_filename( const JobId &id );
-JobId from_filename( const std::string &filename );
-
-} // namespace jobid
-} // namespace wmsutils
-} // namespace glite
-
-#endif /* GLITE_WMSUTILS_JOBID_MANIPULATION_H */
-
-// Local Variables:
-// mode: c++
-// End:
diff --git a/org.glite.wms-utils.jobid/project/build.properties b/org.glite.wms-utils.jobid/project/build.properties

deleted file mode 100755 (executable)

index e69de29..0000000
diff --git a/org.glite.wms-utils.jobid/project/configure.properties.xml b/org.glite.wms-utils.jobid/project/configure.properties.xml

deleted file mode 100644 (file)

index 04d3b17..0000000
--- a/org.glite.wms-utils.jobid/project/configure.properties.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-       <!-- ======================================================
-                 Define extra properties here ...
-                 ====================================================== -->
-        
-       <project name="configure options">                                                                        
-        <property name="configure.args"
-               value="--prefix=${workspace.abs.dir}/stage --with-globus-prefix=${with.globus.prefix} --with-globus-thr-flavor=${with.globus.thr.flavor} --with-globus-nothr-flavor=${with.globus.nothr.flavor} --with-cppunit-prefix=${with.cppunit.prefix} --with-glite-location=${with.glite.location} --with-dist-location=${with.dist.location} --disable-optimization"/>
-
-       </project>
diff --git a/org.glite.wms-utils.jobid/project/properties.xml b/org.glite.wms-utils.jobid/project/properties.xml

deleted file mode 100755 (executable)

index 9662658..0000000
--- a/org.glite.wms-utils.jobid/project/properties.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) 2004 on behalf of the EU EGEE Project: 
-       The European Organization for Nuclear Research (CERN), 
-       Istituto Nazionale di Fisica Nucleare (INFN), Italy
-       Datamat Spa, Italy
-       Centre National de la Recherche Scientifique (CNRS), France
-       CS Systeme d'Information (CSSI), France
-       Royal Institute of Technology, Center for Parallel Computers (KTH-PDC), Sweden
-       Universiteit van Amsterdam (UvA), Netherlands
-       University of Helsinki (UH.HIP), Finland
-       University of Bergen (UiB), Norway
-       Council for the Central Laboratory of the Research Councils (CCLRC), United Kingdom
-
-       Common build properties file for the Glite WMS Common component
-       
-       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>          
-                  Joachim Flammer <Joachim.Flammer@cern.ch>
-       Version info: $Id$
-       Release: $Name$ 
-       
-       Revision history:
-       $Log$
-       Revision 1.8  2004/08/04 07:42:42  eronchie
-       Added cppunit.m4
-       
-       Revision 1.7  2004/08/04 07:38:27  eronchie
-       Added cppunit
-       
-       Revision 1.6  2004/07/28 07:27:22  eronchie
-       Added /
-       
-       Revision 1.5  2004/07/28 07:21:58  eronchie
-       Added m4files.list property
-       
-       Revision 1.4  2004/07/23 14:47:01  eronchie
-       Removed....
-       
-       Revision 1.3  2004/07/21 18:22:38  eronchie
-       Changed wms in wms-utils
-       
-       Revision 1.2  2004/07/16 14:56:56  flammer
-       Corrected input path of build.properties.
-       
-       Revision 1.1.1.1  2004/05/26 18:45:05  eronchie
-       Import of wms jobid
-       
-       
--->
-
-<project name="WMS Utils jobid component common properties">
-
-       <!-- Include build properties to allow overwriting 
-            of properties for subsystem                    -->
-       <property file="project/build.properties" />    
-
-       <!-- ======================================================
-          Define corresponding subsystem properties
-                ====================================================== -->
-
-       <!-- Subsystem name -->
-       <property name="subsystem.name" value="${wms-utils.subsystem.name}"/>
-               
-       <!-- Subsystem prefix -->
-       <property name="subsystem.prefix" value="${wms-utils.subsystem.prefix}"/>
-
-       <!-- ======================================================
-          Define component properties
-                ====================================================== -->
-                               
-       <!-- Component name prefix -->
-       <property name="component.prefix" value="jobid" />
-                       
-       <!-- ======================================================
-          Define general component properties
-                ====================================================== -->
-       
-       <import file="${component.general.properties.file}" />
-
-       <!-- ======================================================
-                 Define extra properties here ...
-                 ====================================================== -->
-
-        <property name="m4files.list" value="globus.m4 glite.m4 cppunit.m4 optimize.m4"/>
-       
-</project>
diff --git a/org.glite.wms-utils.jobid/project/version.properties b/org.glite.wms-utils.jobid/project/version.properties

deleted file mode 100755 (executable)

index fdc8bb7..0000000
--- a/org.glite.wms-utils.jobid/project/version.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Oct 19 06:29:55 CEST 2004
-module.version=0.1.0
-module.build=45
-module.age=0
diff --git a/org.glite.wms-utils.jobid/src/Makefile.am b/org.glite.wms-utils.jobid/src/Makefile.am

deleted file mode 100755 (executable)

index 5225c64..0000000
--- a/org.glite.wms-utils.jobid/src/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-## Subdirectories list
-SUBDIRS = jobid 
-
-MAINTAINERCLEANFILES = Makefile.in 
diff --git a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp b/org.glite.wms-utils.jobid/src/jobid/JobId.cpp

deleted file mode 100755 (executable)

index 273f9f9..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/JobId.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-/* **************************************************************************
- *  filename  : JobId.cpp
- *  author    : Alessandro Maraschini <alessandro.maraschini@datamat.it>
- *  copyright : (C) 2002 by DATAMAT
- ***************************************************************************/
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-#include <iostream>
-
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
-
-namespace glite {
-namespace wmsutils {
-namespace jobid {
-
-using namespace std ;
-
-/******************************************************************
- Constructor / Destructor
- *******************************************************************/
-JobId::JobId() : m_JobId( 0 ), m_pStr( 0 ), m_pBkserver( 0 ), m_pUnique( 0 )
-{
-}
-
-JobId::JobId(const std::string& job_id_string )
-    : m_JobId( 0 ), m_pStr( 0 ), m_pBkserver( 0 ), m_pUnique( 0 )
-{
-    fromString( job_id_string ) ;
-}
-
-JobId::JobId(const JobId &old)
-{
-       edg_wlc_JobIdDup(old.m_JobId,&m_JobId);
-       m_pStr = old.m_pStr ? strdup(old.m_pStr) : 0;
-       m_pBkserver = old.m_pBkserver ? strdup(old.m_pBkserver) : 0;
-       m_pUnique = old.m_pUnique ? strdup(old.m_pUnique) : 0;
-}
-
-JobId & JobId::operator=(JobId const &old)
-{
-       clear();
-       edg_wlc_JobIdDup(old.m_JobId,&m_JobId);
-       m_pStr = old.m_pStr ? strdup(old.m_pStr) : 0;
-       m_pBkserver = old.m_pBkserver ? strdup(old.m_pBkserver) : 0;
-       m_pUnique = old.m_pUnique ? strdup(old.m_pUnique) : 0;
-
-       return *this;
-}
-
-
-JobId::JobId(const edg_wlc_JobId &old)
-       : m_pStr(0), m_pBkserver(0), m_pUnique(0)
-{
-       edg_wlc_JobIdDup(old,&m_JobId);
-}
-
-
-JobId & JobId::operator=(const edg_wlc_JobId &old)
-{
-       clear();
-       edg_wlc_JobIdDup(old,&m_JobId);
-       m_pStr = 0;
-       m_pBkserver = 0;
-       m_pUnique = 0;
-       return(*this);
-}
-
-JobId::~JobId()
-{
-    clear();
-}
-
-/******************************************************************
- method : clear
- unsets the JobId instance.
- *******************************************************************/
-void JobId::clear()
-{
-    if ( m_JobId )
-    {
-       edg_wlc_JobIdFree( m_JobId );
-       m_JobId = 0;
-       if (m_pStr)
-            free(m_pStr);
-       if (m_pBkserver)
-            free(m_pBkserver);
-       if (m_pUnique)
-           free(m_pUnique);
-        m_pStr = m_pBkserver = m_pUnique = NULL;
-    }
-}
-
-
-/******************************************************************
- method :    setJobId
- sets the JobId instance according to the LB and RB
- server addresses and the unique string passed as input parameters.
- *******************************************************************/
-void JobId::setJobId(const string& bkserver, int port, const string& unique)
-{
-    int code = edg_wlc_JobIdRecreate(bkserver.c_str(), port, unique.size() ? unique.c_str() : NULL, &m_JobId) ;
-    if (  code != 0 )
-       throw WrongIdException(__FILE__ , __LINE__ ,  "setJobId(const string& bkserver, int port, const string& unique)" , code  )  ;
-}
-
-
-/******************************************************************
- Protected method :    fromString
- sets the JobId instance from the dg_jobId in string format given as input.
- *******************************************************************/
-void JobId::fromString (const string& dg_JobId)
-{
-    clear();
-    int code = edg_wlc_JobIdParse(dg_JobId.c_str(), &m_JobId)  ;
-    if  ( code != 0 )
-       throw WrongIdException(__FILE__ , __LINE__ , "fromString (const string& dg_JobId)" , code )  ;
-}
-
-/******************************************************************
- method :    ToString
- converts the JobId instance into its string format.
- and put it in the dg_jobId output variable
- *******************************************************************/
-std::string JobId::toString() const
-{
-    if ( m_JobId && !m_pStr )
-       m_pStr = edg_wlc_JobIdUnparse(m_JobId) ;
-    if ( !m_pStr )
-       throw EmptyIdException (__FILE__ , __LINE__ ,"toString()" ,ENOENT , "JobId")  ;
-    return m_pStr;
-}
-
-/******************************************************************
- method :   getServer
- return a string containing the LB server address,
- *******************************************************************/
-std::string JobId::getServer() const
-{
-    if ( m_JobId && !m_pBkserver )
-       m_pBkserver = edg_wlc_JobIdGetServer( m_JobId ) ;
-
-    if ( !m_pBkserver )
-       throw EmptyIdException (__FILE__ , __LINE__ , "getServer()",  ENOENT , "LB server Address")  ;
-
-    return m_pBkserver;
-}
-
-/******************************************************************
- method :   getUnique
- return a string containing unique jobid string
- *******************************************************************/
-std::string JobId::getUnique() const
-{
-    if ( m_JobId && !m_pUnique )
-       m_pUnique = edg_wlc_JobIdGetUnique( m_JobId ) ;
-
-    if ( !m_pUnique )
-       throw EmptyIdException (__FILE__ , __LINE__ , "getUnique()" ,  ENOENT , "Unique")  ;
-
-    return m_pUnique;
-}
-/******************************************************************
- method :   getId
- return the c JobId struct representing this instance
- *******************************************************************/
-edg_wlc_JobId  JobId::getId() const
-{
-       edg_wlc_JobId out ;
-       if ( edg_wlc_JobIdDup(m_JobId,  &out)  )
-               throw EmptyIdException (__FILE__ , __LINE__ , "getId()" ,  ENOENT , "JobId")  ;
-       return out ;
-}
-
-std::ostream&
-operator<<(std::ostream& os, JobId const& id)
-{
-  return os << id.toString();
-}
-
-} // namespace jobid
-} // namespace wmsutils
-} // namespace glite 
diff --git a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp b/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp

deleted file mode 100755 (executable)

index 6be40b7..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/JobIdExceptions.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/* **************************************************************************
-*  filename  : JobIdExecptions.cpp
-*  author    : Alessandro Maraschini <alessandro.maraschini@datamat.it>
-*  copyright : (C) 2002 by DATAMAT
-***************************************************************************/
-
-#include "glite/wmsutils/jobid/JobIdExceptions.h"
-
-namespace glite {
-namespace wmsutils {
-namespace jobid {
-
-using namespace std;
-using namespace glite::wmsutils::exception;
-
-/*****************************
-* JobIdException
-*****************************/
-JobIdException::JobIdException (const string& file,
-                                   int line,
-                                   const string& method,
-                                   int code,
-                                   const string& exception_name)
-       : Exception(file, line, method, code, exception_name)
-{
-}
-
-/*****************************
-* WrongIdException
-*****************************/
-WrongIdException::WrongIdException(const string& file,
-                                      int line,
-                                      const string& method,
-                                      int code )
-       : JobIdException(file, line, method, code,
-                        "WrongIdException")
-{
-       error_message = "Wrong Field caught while parsing Job Id" ;
-}
-
-/*****************************
-* EmptyIdException
-*****************************/
-EmptyIdException::EmptyIdException(const string& file,
-                                      int line,
-                                      const string& method,
-                                      int code ,
-                                      const string& field )
-       : JobIdException(file, line, method, code,
-                        "EmptyIdException")
-{
-       error_message = "Unable to retrieve " + field + ": the instance has not been initialized yet";
-}
-
-} // namespace jobid
-} // namespace wmsutils
-} // namespace glite
-
diff --git a/org.glite.wms-utils.jobid/src/jobid/Makefile.am b/org.glite.wms-utils.jobid/src/jobid/Makefile.am

deleted file mode 100755 (executable)

index 7a23118..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-## *********************************************************************
-## *
-## * Copyright (c) 2002 CERN and INFN on behalf of the EU DataGrid.
-## * For license conditions see LICENSE file or
-## * http://www.edg.org/license.html
-## *
-## *********************************************************************
-
-lib_LTLIBRARIES = libglite_wmsutils_jobid.la libglite_wmsutils_cjobid.la
-
-libglite_wmsutils_jobid_la_SOURCES = \
-       JobId.cpp \
-       JobIdExceptions.cpp \
-       manipulation.cpp 
-
-libglite_wmsutils_cjobid_la_SOURCES = \
-        cjobid.c \
-        strmd5.c
-
-jobidincludedir = $(includedir)/glite/wmsutils/jobid
-jobidinclude_HEADERS = \
-       strmd5.h 
-
-AM_CPPFLAGS = -I$(top_srcdir)/src \
-       -I$(top_srcdir)/interface \
-       $(GLITE_CFLAGS) \
-       $(GLOBUS_THR_CFLAGS) \
-       -D_GNU_SOURCE
-
-MAINTAINERCLEANFILES = Makefile.in
diff --git a/org.glite.wms-utils.jobid/src/jobid/cjobid.c b/org.glite.wms-utils.jobid/src/jobid/cjobid.c

deleted file mode 100755 (executable)

index 2fa0010..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/cjobid.c
+++ /dev/null
@@ -1,258 +0,0 @@
-#ident "$Header$"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-
-#include <netdb.h>
-#include <sys/time.h>
-#include <unistd.h>
-
-#include "glite/wmsutils/jobid/cjobid.h"
-#include "strmd5.h"
-
-struct _edg_wlc_JobId {
-    char               *id;    /* unique job identification */
-    /* additional information */
-    char               *BShost;/* bookkeeping server hostname */
-    unsigned int       BSport; /* bookkeeping server port */
-    char               *info;  /* additional information (after ? in URI) */
-};
-
-int edg_wlc_JobIdCreate(const char *bkserver, int port, edg_wlc_JobId *jobId)
-{
-    return edg_wlc_JobIdRecreate(bkserver, port, NULL, jobId);
-}
-
-
-int edg_wlc_JobIdRecreate(const char* bkserver, int port, const char *unique, edg_wlc_JobId *jobId)
-{
-    edg_wlc_JobId out;
-    char hostname[200]; /* used to hold string for encrypt */
-    struct timeval tv;
-    int skip;
-    char* portbeg;
-
-    struct hostent* he;
-
-    if (!bkserver)
-        return EINVAL;
-
-    if (unique == NULL) {
-       gethostname(hostname, 100);
-       he = gethostbyname(hostname);
-       assert(he->h_length > 0);
-       gettimeofday(&tv, NULL);
-       srandom(tv.tv_usec);
-
-       skip = strlen(hostname);
-       skip += sprintf(hostname + skip, "-IP:0x%x-pid:%d-rnd:%d-time:%d:%d",
-                   *((int*)he->h_addr_list[0]), getpid(), (int)random(),
-                   (int)tv.tv_sec, (int)tv.tv_usec);
-    }
-
-    *jobId = NULL;
-    out = (edg_wlc_JobId) malloc (sizeof(*out));
-    if (!out)
-       return ENOMEM;
-
-    memset(out, 0, sizeof(*out));
-
-    /* check if it begins with prefix */
-    /* unsupported */
-    if (strncmp(bkserver, GLITE_WMSC_JOBID_PROTO_PREFIX, sizeof(GLITE_WMSC_JOBID_PROTO_PREFIX)-1) == 0)
-        return EINVAL;
-
-    out->BShost = strdup(bkserver);
-    portbeg = strchr(out->BShost, ':');
-    if (portbeg) {
-       *portbeg = 0;
-        /* try to get port number */
-       if (port == 0)
-           port = atoi(portbeg + 1);
-    }
-
-    if (port == 0)
-        port = GLITE_WMSC_JOBID_DEFAULT_PORT;
-
-    out->BSport = port;
-
-    out->id = (unique) ? strdup(unique) : str2md5base64(hostname);
-    //printf("Encrypt: %s\nBASE64 %s\n", hostname, out->id);
-
-    if (!out->id || !out->BShost) {
-       edg_wlc_JobIdFree(out);
-       return ENOMEM;
-    }
-
-    *jobId = out;
-    return 0;
-}
-
-
-int edg_wlc_JobIdDup(const edg_wlc_JobId in, edg_wlc_JobId *out)
-{
-    edg_wlc_JobId jid;
-    *out = NULL;
-    if (in == NULL)
-       return 0;
-
-    jid = malloc(sizeof(*jid));
-    if (!jid)
-       return ENOMEM;
-
-    memset(jid, 0,sizeof(*jid));
-    jid->BShost = strdup(in->BShost);
-    jid->id = strdup(in->id);
-    if (in->info)
-       jid->info = strdup(in->info);
-
-    if (jid->BShost == NULL || jid->id == NULL) {
-       edg_wlc_JobIdFree(jid);
-       return ENOMEM;
-    }
-
-    jid->BSport = in->BSport;
-    *out = jid;
-    return 0;
-}
-
-
-// XXX
-// use recreate
-// parse name, port, unique
-int edg_wlc_JobIdParse(const char *idString, edg_wlc_JobId *jobId)
-{
-    char *pom, *pom1, *pom2;
-    edg_wlc_JobId out;
-
-    *jobId = NULL;
-
-    out = (edg_wlc_JobId) malloc (sizeof(*out));
-    if (out == NULL )
-       return ENOMEM;
-
-    memset(out,0,sizeof(*out));
-
-    if (strncmp(idString, GLITE_WMSC_JOBID_PROTO_PREFIX, sizeof(GLITE_WMSC_JOBID_PROTO_PREFIX) - 1)) {
-       out->BShost  = (char *) NULL;
-       out->BSport  = 0;
-
-       free(out);
-       return EINVAL;
-    }
-
-    pom = strdup(idString + sizeof(GLITE_WMSC_JOBID_PROTO_PREFIX) - 1);
-    pom1 = strchr(pom, '/');
-    pom2 = strchr(pom, ':');
-
-    if (!pom1) { free(pom); free(out); return EINVAL; }
-
-    if ( pom2 && (pom1 > pom2)) {
-       pom[pom2-pom]     = '\0';
-       out->BShost  = strdup(pom);
-       pom[pom1-pom]     = '\0';
-       out->BSport  = (unsigned int) strtoul(pom2 + 1,NULL,10);
-    } else {
-       pom[pom1-pom]     = '\0';
-       out->BShost  = strdup(pom);
-       out->BSport  = GLITE_WMSC_JOBID_DEFAULT_PORT;
-    }
-
-    /* XXX: localhost not supported in jobid 
-    if (!strncmp(out->BShost,"localhost",9) {
-       free(pom);
-       free(out->BShost);
-       free(out);
-       return EINVAL;
-    }
-    */
-
-    /* additional info from URI */
-    pom2 = strchr(pom1+1,'?');
-    if (pom2) {
-       *pom2 = 0;
-       out->info = strdup(pom2+1);
-    }
-
-    /* extract the unique part */
-    out->id = strdup(pom1+1);
-
-    for (pom1 = out->BShost; *pom1; pom1++)
-       if (isspace(*pom1)) break;
-
-    for (pom2 = out->id; *pom2; pom2++)
-       if (isspace(*pom2)) break;
-
-    if (*pom1 || *pom2) {
-           free(pom);
-           edg_wlc_JobIdFree(out);
-           return EINVAL;
-    }
-
-    free(pom);
-    *jobId = out;
-    return 0;
-}
-
-
-void edg_wlc_JobIdFree(edg_wlc_JobId job)
-{
-    if (job) {
-       free(job->id);
-       free(job->BShost);
-       free(job->info);
-       free(job);
-    }
-}
-
-
-char* edg_wlc_JobIdUnparse(const edg_wlc_JobId jobid)
-{
-    char *out, port[40];
-
-    if (!jobid)
-       return NULL;
-
-    if (jobid->BSport)
-       sprintf(port,":%d",jobid->BSport);
-    else
-        *port = 0;
-
-    asprintf(&out, GLITE_WMSC_JOBID_PROTO_PREFIX"%s%s/%s%s%s",
-            jobid->BShost,port,
-            jobid->id,
-            (jobid->info ? "?" : ""),
-            (jobid->info ? jobid->info : ""));
-
-    return out;
-}
-
-
-char* edg_wlc_JobIdGetServer(const edg_wlc_JobId jobid)
-{
-    char *bs = NULL;
-
-    if (jobid)
-       asprintf(&bs, "%s:%u", jobid->BShost,
-                jobid->BSport ? jobid->BSport : GLITE_WMSC_JOBID_DEFAULT_PORT);
-
-    return bs;
-}
-
-
-void edg_wlc_JobIdGetServerParts(const edg_wlc_JobId jobid, char **srvName, unsigned int *srvPort)
-{
-    if (jobid) {
-       *srvName = strdup(jobid->BShost);
-       *srvPort = jobid->BSport ? jobid->BSport : GLITE_WMSC_JOBID_DEFAULT_PORT;
-    }
-}
-
-
-char* edg_wlc_JobIdGetUnique(const edg_wlc_JobId jobid)
-{
-    return jobid ? strdup(jobid->id) : NULL;
-}
diff --git a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp b/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp

deleted file mode 100755 (executable)

index cf3a710..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/manipulation.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-#include <cctype>
-
-#include <string>
-#include <algorithm>
-
-#include "glite/wmsutils/jobid/JobId.h"
-
-using namespace std;
-
-namespace glite {
-namespace wmsutils {
-namespace jobid {
-
-namespace {
-
-class HexInt {
-public:
-  HexInt( unsigned int i = 0 );
-  HexInt( const string &str );
-  HexInt( string::const_iterator begin, string::const_iterator end );
-  ~HexInt( void );
-
-  inline operator unsigned int( void ) const { return this->hi_int; }
-  inline operator const string &( void ) const { return this->hi_str; }
-
-  static unsigned int least( void ) { return hi_s_least; }
-  static void least( unsigned int least ) { hi_s_least = least; }
-
-private:
-  void parseString( void );
-
-  unsigned int    hi_int;
-  string          hi_str;
-
-  static unsigned int  hi_s_least;
-  static const char   *hi_s_map;
-};
-
-class BadChar {
-public:
-  BadChar( void );
-  ~BadChar( void );
-
-  inline bool operator()( char c )
-  { return( !(((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')) || ((c >= '0') && (c <= '9')) ||
-             (c == '.') || (c == '-') || (c == ' ')) ); }
-};
-
-unsigned int  HexInt::hi_s_least = 2;
-const char   *HexInt::hi_s_map = "0123456789abcdef";
-
-HexInt::HexInt( unsigned int ui ) : hi_int( ui ), hi_str( hi_s_least, '0' )
-{
-  int                       n;
-  string::reverse_iterator  pos = this->hi_str.rbegin();
-
-  while( ui != 0 ) {
-    n = ui % 16;
-    if( pos != this->hi_str.rend() ) {
-      *pos = hi_s_map[n];
-      pos += 1;
-    }
-    else this->hi_str.insert( this->hi_str.begin(), hi_s_map[n] );
-
-    ui /= 16;
-  }
-
-  if( this->hi_str.length() < hi_s_least )
-    this->hi_str.insert( this->hi_str.begin(), (hi_s_least - this->hi_str.length()), '0' );
-}
-
-HexInt::HexInt( const string &str ) : hi_int( 0 ), hi_str( str )
-{
-  this->parseString();
-}
-
-HexInt::HexInt( string::const_iterator begin, string::const_iterator end ) : hi_int( 0 ), hi_str( begin, end )
-{
-  this->parseString();
-}
-
-void HexInt::parseString( void )
-{
-  int                        hexbase;
-  char                      *pos, *end = (char *) hi_s_map + 16;
-  string::reverse_iterator   it;
-
-  for( it = this->hi_str.rbegin(), hexbase = 1; it != this->hi_str.rend(); ++it, hexbase *= 16 ) {
-    pos = find( (char *) hi_s_map, end, (char) tolower(*it) );
-
-    if( pos != end ) this->hi_int += hexbase * (pos - hi_s_map);
-    else {
-      this->hi_int = 0;
-      break;
-    }
-  }
-
-  return;
-}
-
-HexInt::~HexInt( void ) {}
-
-BadChar::BadChar( void ) {}
-
-BadChar::~BadChar( void ) {}
-
-/*
-  Helper function for the get_reduced_part(...)
-*/
-string get_reduced_part_internal( const string &unique, int level )
-{
-  string::size_type  length = unique.length();
-  string             piece( unique.substr(0, 2) ), answer;
-
-  if( (level == 0) || (length <= 2) ) answer.assign( piece );
-  else if( length != 0 ) {
-    answer.assign( piece );
-    answer.append( 1, '/' );
-    answer.append( get_reduced_part_internal(unique.substr(2, length - 2),  level - 1) );
-  }
-
-  return answer;
-}
-
-}; // Unnamed namespace
-
-string get_reduced_part( const JobId &id, int level )
-{
-  return get_reduced_part_internal( id.getUnique(), level );
-}
-
-string to_filename( const JobId &id )
-{
-  string            sid( id.toString() ), coded;
-  string::iterator  last, next;
-
-  last = sid.begin();
-  do {
-    next = find_if( last, sid.end(), BadChar() );
-
-    if( next != sid.end() ) {
-      if( last != next ) coded.append( last, next );
-      coded.append( 1, '_' );
-      coded.append( HexInt(*next) );
-
-      last = next + 1;
-    }
-    else coded.append( last, sid.end() );
-  } while( next != sid.end() );
-
-  return coded;
-}
-
-JobId from_filename( const string &filename )
-{
-  char                     c;
-  string                   decoded;
-  string::const_iterator   last, next;
-
-  last = filename.begin();
-  do {
-    next = find( last, filename.end(), '_' );
-
-    if( next != filename.end() ) {
-      c = HexInt( next + 1, next + 3 );
-
-      if( last != next ) decoded.append( last, next );
-      decoded.append( 1, c );
-
-      last = next + 3;
-    }
-    else decoded.append( last, filename.end() );
-  } while( next != filename.end() );
-
-  return JobId( decoded );
-}
-
-} // namespace jobid
-} // namespace wmsutils
-} // namespace glite
diff --git a/org.glite.wms-utils.jobid/src/jobid/strmd5.c b/org.glite.wms-utils.jobid/src/jobid/strmd5.c

deleted file mode 100755 (executable)

index 0433f55..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/strmd5.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#ident "$Header$"
-
-#include <openssl/md5.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "jobid/strmd5.h"
-
-#warning Thread unsafe!
-static char mbuf[33];
-
-static int base64_encode(const void *enc, int enc_size, char *out, int out_max_size)
-{
-    static const char* b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
-
-    unsigned char* enc_buf = (unsigned char*)enc;
-    int                  out_size = 0;
-    unsigned int  bits = 0;
-    unsigned int  shift = 0;
-
-    while ( out_size < out_max_size ) {
-       if ( enc_size>0 ) {
-           // Shift in byte
-           bits <<= 8;
-           bits |= *enc_buf;
-           shift += 8;
-           // Next byte
-           enc_buf++;
-           enc_size--;
-       } else if ( shift>0 ) {
-           // Pad last bits to 6 bits - will end next loop
-           bits <<= 6 - shift;
-           shift = 6;
-       } else {
-           // Terminate with Mime style '='
-           *out = '=';
-           out_size++;
-
-           return out_size;
-       }
-
-       // Encode 6 bit segments
-       while ( shift>=6 ) {
-           shift -= 6;
-           *out = b64[ (bits >> shift) & 0x3F ];
-           out++;
-           out_size++;
-       }
-    }
-
-    // Output overflow
-    return -1;
-}
-
-char *strmd5(const char *s, unsigned char *digest)
-{
-    MD5_CTX md5;
-    unsigned char d[16];
-    int        i;
-
-    MD5_Init(&md5);
-    MD5_Update(&md5,s,strlen(s));
-    MD5_Final(d,&md5);
-
-    if (digest) memcpy(digest,d,sizeof(d));
-
-    for (i=0; i<16; i++) {
-       int     dd = d[i] & 0x0f;
-       mbuf[2*i+1] = dd<10 ? dd+'0' : dd-10+'a';
-       dd = d[i] >> 4;
-       mbuf[2*i] = dd<10 ? dd+'0' : dd-10+'a';
-    }
-    mbuf[32] = 0;
-    return (char *) mbuf;
-}
-
-char *str2md5(const char *s)
-{
-    MD5_CTX md5;
-    unsigned char d[16];
-    char* ret = malloc(33);
-    int        i;
-
-    if (!ret)
-       return NULL;
-
-    MD5_Init(&md5);
-    MD5_Update(&md5, s, strlen(s));
-    MD5_Final(d, &md5);
-
-    for (i=0; i<16; i++) {
-       int  dd = d[i] & 0x0f;
-       ret[2*i+1] = dd<10 ? dd+'0' : dd-10+'a';
-       dd = d[i] >> 4;
-       ret[2*i] = dd<10 ? dd+'0' : dd-10+'a';
-    }
-    ret[32] = 0;
-    return ret;
-}
-
-char *str2md5base64(const char *s)
-{
-    MD5_CTX md5;
-    unsigned char d[16];
-    char buf[50];
-    int l;
-
-    MD5_Init(&md5);
-    MD5_Update(&md5, s, strlen(s));
-    MD5_Final(d, &md5);
-
-    l = base64_encode(d, 16, buf, sizeof(buf) - 1);
-    if (l < 1)
-       return NULL;
-    buf[l - 1] = 0;
-    return strdup(buf);
-}
diff --git a/org.glite.wms-utils.jobid/src/jobid/strmd5.h b/org.glite.wms-utils.jobid/src/jobid/strmd5.h

deleted file mode 100755 (executable)

index c5d76b6..0000000
--- a/org.glite.wms-utils.jobid/src/jobid/strmd5.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _GLITE_STRMD5_H
-#define _GLITE_STRMD5_H
-
-#ident "$Header$"
-
-/* Compute MD5 sum of the first argument.
- * The sum is returned in the 16-byte array pointed to by 2nd argument
- *     (if not NULL)
- *
- * Return value: ASCII string of the sum, i.e. 32 characters [0-9a-f]
- *     (pointer to static area, changed by subsequent calls)
- */
-
-char *strmd5(const char *src, unsigned char *dst);
-
-/**
- * Returns: allocated 32bytes long ASCII string with md5 sum
- * of the first argument
- */
-char *str2md5(const char *src);
-
-/**
- * Returns: allocated 22bytes long ASCII string with md5 sum in base64
- * format of the source argument
- */
-char *str2md5base64(const char *src);
-
-#endif /* _GLITE_STRMD5_H */
author	cvs2svn <admin@example.com>
	Tue, 19 Oct 2004 13:51:59 +0000 (13:51 +0000)
committer	cvs2svn <admin@example.com>
	Tue, 19 Oct 2004 13:51:59 +0000 (13:51 +0000)