Index: branches/slurm-drmaa-1.0.0/m4/ax_slurm.m4
===================================================================
--- branches/slurm-drmaa-1.0.0/m4/ax_slurm.m4	(revision 5)
+++ branches/slurm-drmaa-1.0.0/m4/ax_slurm.m4	(revision 5)
@@ -0,0 +1,112 @@
+# $Id$
+#
+# SYNOPSIS
+#
+#   AX_SLURM([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   Check for SLURM libraries and headers.
+#
+#   This macro caslurms::
+#
+#     AC_SUBST(SLURM_INCLUDES)
+#     AC_SUBST(SLURM_LDFLAGS)
+#     AC_SUBST(SLURM_LIBS)
+#
+# LAST MODIFICATION
+#
+#   2010-09-09
+#
+# LICENSE
+#
+#   Written by:
+#     MichaÅ MatÅoka <michal.matloka@student.put.poznan.pl>
+#   Based on macro for LSF written by
+#     Mariusz MamoÅski <mamonski@man.poznan.pl>
+#   Placed under Public Domain.
+#
+
+AC_DEFUN([AX_SLURM],[
+AC_ARG_WITH([slurm-inc], [AC_HELP_STRING([--with-slurm-inc=<include-dir>],
+		[Path to headers directory (containing slurm/slurm.h)])])
+AC_ARG_WITH([slurm-lib], [AC_HELP_STRING([--with-slurm-lib=<lib-dir>],
+		[Path to directory with SLURM libraries (containing libslurm.a)])])
+
+AC_SUBST(SLURM_INCLUDES)
+AC_SUBST(SLURM_LDFLAGS)
+AC_SUBST(SLURM_LIBS)
+
+AC_MSG_NOTICE([checking for SLURM])
+
+AC_MSG_CHECKING([for SLURM compile flags])
+ax_slurm_msg=""
+if test x$with_slurm_inc != x; then
+	SLURM_INCLUDES="-I${with_slurm_inc}"
+else
+	SRUN_PATH=`which srun`
+	if test x"$SRUN_PATH" != x; then
+		SRUN_DIR=`dirname $SRUN_PATH`
+		SLURM_HOME=`dirname $SRUN_DIR`
+		SLURM_INCLUDES="-I$SLURM_HOME/include"
+	else
+		ax_slurm_msg="no srun in PATH"
+	fi
+fi
+
+AC_MSG_RESULT([$SLURM_INCLUDES$ax_slurm_msg])
+
+AC_MSG_CHECKING([for SLURM library dir])
+ax_slurm_msg=""
+if test x$with_slurm_lib == x; then
+	
+	SRUN_PATH=`which srun`
+	
+	if test x"$SRUN_PATH" != x; then
+		SRUN_DIR=`dirname $SRUN_PATH`
+		SLURM_HOME=`dirname $SRUN_DIR`
+		with_slurm_lib=$SLURM_HOME/lib
+	else
+		ax_slurm_msg="no srun in PATH"
+	fi
+fi
+AC_MSG_RESULT([$with_slurm_lib$ax_slurm_msg])
+
+
+SLURM_LIBS="-lslurm "
+SLURM_LDFLAGS="-L${with_slurm_lib}"
+
+
+CPPFLAGS_save="$CPPFLAGS"
+LDFLAGS_save="$LDFLAGS"
+LIBS_save="$LIBS"
+CPPFLAGS="$CPPFLAGS $SLURM_INCLUDES"
+LDFLAGS="$LDFLAGS $SLURM_LDFLAGS"
+LIBS="$LIBS $SLURM_LIBS"
+
+ax_slurm_ok="no"
+
+AC_MSG_CHECKING([for usable SLURM libraries/headers])
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include "slurm/slurm.h" ]],
+		[[ job_desc_msg_t job_req; /*at least check for declared structs */
+		   return 0;
+		 ]])],
+	[ ax_slurm_ok="yes"],
+	[ echo "*** The SLURM test program failed to link or run. See the file config.log"
+	  echo "*** for the exact error that occured."],
+	[
+		ax_slurm_ok=yes
+		echo $ac_n "cross compiling; assumed OK... $ac_c"
+	])
+
+CPPFLAGS="$CPPFLAGS_save"
+LDFLAGS="$LDFLAGS_save"
+LIBS="$LIBS_save"
+AC_MSG_RESULT([$ax_slurm_ok])
+
+if test x"$ax_slurm_ok" = xyes; then
+	ifelse([$1], , :, [$1])
+else
+	ifelse([$2], , :, [$2])
+fi
+])
Index: branches/slurm-drmaa-1.0.0/m4/ax_gcc_warnings.m4
===================================================================
--- branches/slurm-drmaa-1.0.0/m4/ax_gcc_warnings.m4	(revision 5)
+++ branches/slurm-drmaa-1.0.0/m4/ax_gcc_warnings.m4	(revision 5)
@@ -0,0 +1,50 @@
+# $Id$
+#
+# SYNOPSIS
+#
+#   AX_GCC_FLAGS()
+#
+# DESCRIPTION
+#
+#   Check for LSF libraries and headers.
+#
+#   This macro calls::
+#
+#			AC_SUBST(GCC_W_NO_MISSING_FIELD_INITIALIZERS)
+#			AC_SUBST(GCC_W_NO_FORMAT_ZERO_LENGTH)
+#
+# LAST MODIFICATION
+#
+#   2008-10-13
+#
+# LICENSE
+#
+#   Written by Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>
+#   and placed under Public Domain.
+#
+AC_DEFUN([AX_GCC_WARNINGS], [
+if test x$GCC == xyes; then
+	AC_SUBST([GCC_W_NO_MISSING_FIELD_INITIALIZERS])
+	AC_SUBST([GCC_W_NO_FORMAT_ZERO_LENGTH])
+	CFLAGS_save="$CFLAGS"
+
+	AC_MSG_CHECKING([whether gcc accepts -Wno-missing-field-initializers])
+	CFLAGS="$CFLAGS_save -Wall -Wextra -Wno-missing-field-initializers"
+	ax_gcc_warnings_src="int main(){ return 0; }"
+	AC_COMPILE_IFELSE([$ax_gcc_warnings_src],
+		[GCC_W_NO_MISSING_FIELD_INITIALIZERS="-Wno-missing-field-initializers"
+		AC_MSG_RESULT([yes])],
+		[GCC_W_NO_MISSING_FIELD_INITIALIZERS="-Wno-extra"
+		AC_MSG_RESULT([no])])
+
+	AC_MSG_CHECKING([whether gcc accepts -Wno-format-zero-length])
+	CFLAGS="$CFLAGS_save -Wno-format-zero-length"
+	AC_COMPILE_IFELSE([$ax_gcc_warnings_src],
+		[GCC_W_NO_FORMAT_ZERO_LENGTH="-Wno-format-zero-length"
+		AC_MSG_RESULT([yes])],
+		[GCC_W_NO_FORMAT_ZERO_LENGTH="-Wno-format"
+		AC_MSG_RESULT([no])])
+
+	CFLAGS="$CFLAGS_save"
+fi
+])
Index: branches/slurm-drmaa-1.0.0/m4/ax_docutils.m4
===================================================================
--- branches/slurm-drmaa-1.0.0/m4/ax_docutils.m4	(revision 5)
+++ branches/slurm-drmaa-1.0.0/m4/ax_docutils.m4	(revision 5)
@@ -0,0 +1,33 @@
+# $Id$
+#
+# SYNOPSIS
+#
+#   AX_DOCUTILS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   Test for the Docutils -- Python driven reStructuredText processor.
+#   This macro calls (through AC_CHECK_PROGS)::
+#
+#     AC_SUBST(RST2HTML)
+#     AC_SUBST(RST2LATEX)
+#
+# LAST MODIFICATION
+#
+#   2007-12-14
+#
+# LICENSE
+#
+#   Written by Åukasz CieÅnik <lukasz.ciesnik@fedstage.com>
+#   and placed under Public Domain
+#
+
+AC_DEFUN([AX_DOCUTILS], [
+	AC_CHECK_PROGS([RST2HTML], [rst2html rst2html.py])
+	AC_CHECK_PROGS([RST2LATEX], [rst2latex rst2latex.py])
+	if test x$RST2HTML != x -a x$RST2LATEX != x; then
+		ifelse([$1], , :, [$1])
+	else
+		ifelse([$2], , :, [$2])
+	fi
+])
Index: branches/slurm-drmaa-1.0.0/m4/acx_pthread.m4
===================================================================
--- branches/slurm-drmaa-1.0.0/m4/acx_pthread.m4	(revision 5)
+++ branches/slurm-drmaa-1.0.0/m4/acx_pthread.m4	(revision 5)
@@ -0,0 +1,245 @@
+dnl $Id$
+
+dnl
+dnl Check for libs/cppflags needed for POSIX Threads
+dnl
+
+dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl
+dnl Modified from the original version:
+dnl * Removed pthread-specific CC support
+dnl * Added FreeBSD specific -pthread/-lpthread flags
+dnl Notes:
+dnl * -D_THREAD_SAFE may not be necessary on FreeBSD
+dnl   and elsewhere.
+dnl - landonf March 25th, 2005
+dnl
+dnl This macro figures out how to build C programs using POSIX threads.
+dnl It sets the PTHREAD_LIBS output variable to the threads library and
+dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
+dnl C compiler flags that are needed. (The user can also force certain
+dnl compiler flags/libs to be tested by setting these environment
+dnl variables.)
+dnl
+dnl NOTE: You are assumed to not only compile your program with these
+dnl flags, but also link it with them as well. e.g. you should link
+dnl with $CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+dnl $LIBS
+dnl
+dnl If you are only building threads programs, you may wish to use
+dnl these variables in your default LIBS, and CFLAGS:
+dnl
+dnl        LIBS="$PTHREAD_LIBS $LIBS"
+dnl        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
+dnl default action will define HAVE_PTHREAD.
+dnl
+dnl Please let the authors know if this macro fails on any platform, or
+dnl if you have any other suggestions or comments. This macro was based
+dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
+dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
+dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
+dnl We are also grateful for the helpful feedback of numerous users.
+dnl
+dnl @category InstalledPackages
+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
+dnl @version 2005-01-14
+dnl @license GPLWithACException
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test x"$acx_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+        *solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthread or
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags"
+        ;;
+
+	*freebsd*)
+	# freebsd 4 uses -pthread, freebsd 5 uses -lpthread
+	acx_pthread_flags="pthread -pthread"
+	;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                PTHREAD_LIBS="$flag"
+                ;;
+
+		pthread-config)
+		AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+		if test x"$acx_pthread_config" = xno; then continue; fi
+		PTHREAD_CFLAGS="`pthread-config --cflags`"
+		PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+		;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_TRY_LINK([#include <pthread.h>],
+                    [pthread_t th; pthread_join(th, 0);
+                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+                    [acx_pthread_ok=yes])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT($acx_pthread_ok)
+        if test "x$acx_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+	AC_MSG_CHECKING([for joinable pthread attribute])
+	attr_name=unknown
+	for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+	    AC_TRY_LINK([#include <pthread.h>], [int attr=$attr;],
+                        [attr_name=$attr; break])
+	done
+        AC_MSG_RESULT($attr_name)
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case "${host_cpu}-${host_os}" in
+            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+        esac
+        AC_MSG_RESULT(${flag})
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+        :
+else
+        acx_pthread_ok=no
+        $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
Index: branches/slurm-drmaa-1.0.0/m4/missing-dev-prog.sh
===================================================================
--- branches/slurm-drmaa-1.0.0/m4/missing-dev-prog.sh	(revision 5)
+++ branches/slurm-drmaa-1.0.0/m4/missing-dev-prog.sh	(revision 5)
@@ -0,0 +1,7 @@
+#!/bin/sh
+cat >&2 <<MESSAGE
+ * ERROR: $1 was not found at configuration time while some
+ * sources are build by it.  Either install $1 or download
+ * tarball with generated sources included.
+MESSAGE
+exit 1
Index: branches/slurm-drmaa-1.0.0/.ignore
===================================================================
--- branches/slurm-drmaa-1.0.0/.ignore	(revision 1)
+++ branches/slurm-drmaa-1.0.0/.ignore	(revision 1)
@@ -0,0 +1,31 @@
+configure
+Makefile.in
+config.log
+scripts
+config.status
+stamp-h1
+config.h
+config.h.in
+std.out
+autom4te.cache
+drmaa_utils
+libtool
+aclocal.m4
+Makefile
+ltsugar.m4
+libtool.m4
+ltversion.m4
+lt~obsolete.m4
+ltoptions.m4
+readme.html
+readme.tex
+.libs
+.deps
+.project
+.cproject
+slurm_drmaa-1.0.0.tar.gz
+readme.toc
+readme.out
+readme.pdf
+readme.aux
+readme.log
Index: branches/slurm-drmaa-1.0.0/configure.ac
===================================================================
--- branches/slurm-drmaa-1.0.0/configure.ac	(revision 7)
+++ branches/slurm-drmaa-1.0.0/configure.ac	(revision 7)
@@ -0,0 +1,190 @@
+AC_INIT([PSNC DRMAA for SLURM], [1.0.0], [mamonski@man.poznan.pl], [slurm_drmaa])
+AC_PREREQ(2.59)
+AC_REVISION([$Id$])
+AC_COPYRIGHT([
+PSNC DRMAA for SLURM
+Copyright (C) 2010 Poznan Supercomputing and Networking Center
+
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+])
+
+SLURM_DRMAA_MAJOR=1
+SLURM_DRMAA_MINOR=0
+SLURM_DRMAA_MICRO=0
+SLURM_DRMAA_VERSION_INFO=1:0:0
+AC_SUBST([SLURM_DRMAA_MAJOR])
+AC_SUBST([SLURM_DRMAA_MINOR])
+AC_SUBST([SLURM_DRMAA_MICRO])
+AC_SUBST([SLURM_DRMAA_VERSION_INFO])
+
+AC_CONFIG_SRCDIR([slurm_drmaa/drmaa.c])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([scripts])
+
+AM_INIT_AUTOMAKE
+
+# command-line arguments:
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],
+			[produce code suiteable for debugging and print logs at runtime]))
+AC_ARG_ENABLE(development, AC_HELP_STRING([--enable-development],
+			[enable development mode: make additional checks (suitable for PSNC DRMAA for SLURM)]))
+
+# programs:
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_RANLIB
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+AC_PROG_LN_S
+
+AX_DOCUTILS()
+if test x$RST2HTML = x; then
+	RST2HTML="sh m4/missing-dev-prog.sh docutils"
+fi
+if test x$RST2LATEX = x; then
+	RST2LATEX="sh m4/missing-dev-prog.sh docutils"
+fi
+
+# check compiler / set basic flags:
+if test x$ac_cv_prog_cc_stdc = xno; then
+	AC_MSG_ERROR([ANSI C compiler is required])
+fi
+
+if test x$GCC = xyes; then
+	CFLAGS="-pedantic -ansi ${CFLAGS}"
+fi
+AM_CONDITIONAL([GCC], [test x$GCC = xyes])
+
+AX_GCC_WARNINGS()
+
+AH_TEMPLATE([DEBUGGING], [Produce debugging code])
+if test x$enable_debug = xyes; then
+	AC_DEFINE(DEBUGGING,[1])
+	CFLAGS="${CFLAGS} -O0"
+else
+	CPPFLAGS="-DNDEBUG ${CPPFLAGS}"
+fi
+
+AH_TEMPLATE([DEVELOPMENT], [Development mode])
+if test x$enable_development = xyes; then
+	AC_DEFINE(DEVELOPMENT, [1])
+fi
+
+AH_BOTTOM([
+#ifndef __GNUC__
+#	define __attribute__ /* nothing */
+#endif
+])
+
+# system:
+CPPFLAGS="-D_REENTRANT -D_THREAD_SAFE ${CPPFLAGS}"
+
+AC_CANONICAL_HOST
+case "$host_os" in
+	*linux*)
+		CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE"
+		;;
+	*solaris*)
+		CPPFLAGS="${CPPFLAGS} -D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
+		;;
+	*freebsd*)
+		;;
+	*darwin*)
+		CPPFLAGS="${CPPFLAGS} -D_XOPEN_SOURCE=400"
+		;;
+	*)
+		CPPFLAGS="${CPPFLAGS} -D_XOPEN_SOURCE=500"
+		;;
+esac
+
+# project prerequisites:
+
+# libraries:
+ACX_PTHREAD([CFLAGS="$CFLAGS $PTHREAD_CFLAGS" LIBS="$PTHREAD_LIBS $LIBS"],
+		[AC_MSG_ERROR([POSIX threads library is required.])])
+		
+AX_SLURM([:], [AC_MSG_ERROR([
+SLURM libraries/headers not found;
+add --with-slurm-inc and --with-slurm-lib with appropriate locations.]) ])
+if ! echo $ac_configure_args | ${EGREP} -q '(--)(exec-)?prefix'; then
+	if test ${sysconfdir} == '${prefix}/etc'; then
+		# do not install configuration in /usr/local/etc
+		sysconfdir='/etc'
+		ac_configure_args="${ac_configure_args} --sysconfdir=${sysconfdir}"
+	fi
+fi
+CPPFLAGS="${CPPFLAGS} -DCONFDIR=${sysconfdir}"
+
+# headers:
+AC_HEADER_STDC
+AC_HEADER_TIME
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([stddef.h stdlib.h string.h strings.h sys/time.h unistd.h])
+
+# types and structures:
+AC_TYPE_SIZE_T
+AC_STRUCT_TM
+
+# compiler characteristic
+AC_C_CONST
+AC_C_INLINE
+AC_C_VOLATILE
+
+# functions:
+AC_FUNC_MALLOC
+AC_FUNC_STRFTIME
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([ \
+	asprintf \
+	fstat \
+	getcwd \
+	gettimeofday \
+	localtime_r \
+	memset \
+	mkstemp \
+	setenv \
+	strcasecmp \
+	strchr \
+	strdup \
+	strerror \
+	strlcpy \
+	strndup \
+	strstr \
+	strtol \
+	vasprintf \
+	])
+
+# system services:
+
+# turn on warning after all tests
+if test x$GCC = xyes; then
+	if test x$enable_development = xyes; then
+		CFLAGS="-Werror ${CFLAGS}"
+	fi
+	CFLAGS="-Wall -W -Wno-unused-parameter $GCC_W_NO_FORMAT_ZERO_LENGTH ${CFLAGS}"
+fi
+
+AC_CONFIG_FILES([
+	Makefile
+	slurm_drmaa/Makefile
+])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SUBDIRS([drmaa_utils])
+AC_OUTPUT
+
+echo
+echo "Run 'make' now."
+
Index: branches/slurm-drmaa-1.0.0/autoclean.sh
===================================================================
--- branches/slurm-drmaa-1.0.0/autoclean.sh	(revision 5)
+++ branches/slurm-drmaa-1.0.0/autoclean.sh	(revision 5)
@@ -0,0 +1,25 @@
+#!/bin/sh
+# $Id$
+
+echo "Removing all generated files. ($PWD)"
+
+make maintainer-clean
+
+rm -f aclocal.m4 configure configure.scan config.h.in confdefs.h libtool
+
+rm -rf autom4te.cache
+rm -rf scripts
+
+find . -name Makefile.in -exec rm -f {} \;
+find . -name Makefile -exec rm -f {} \;
+find . -name \*~ -exec rm -f {} \;
+find . -name \.#* -exec rm -f {} \;
+find . -name \*.core -exec rm -f {} \;
+find . -name \*.log -exec rm -f {} \;
+find . -name \*.a -exec rm -f {} \;
+find . -name \*.o -exec rm -f {} \;
+find . -name \*.lo* -exec rm -f {} \;
+find . -name \*.la* -exec rm -f {} \;
+
+(cd drmaa_utils && sh autoclean.sh "$@")
+echo "done."
Index: branches/slurm-drmaa-1.0.0/doc/Makefile.am
===================================================================
--- branches/slurm-drmaa-1.0.0/doc/Makefile.am	(revision 5)
+++ branches/slurm-drmaa-1.0.0/doc/Makefile.am	(revision 5)
@@ -0,0 +1,53 @@
+# $Id$
+#
+# PSNC DRMAA for LoadLeveler
+# Copyright (C) 2010 Poznan Supercomputing and Networking Center
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+DOCUTILSFLAGS = \
+ -i utf-8 \
+ -o utf-8 \
+ --language=en \
+ --file-insertion-enabled \
+ --no-generator \
+ --tab-width=4
+RST2HTMLFLAGS = $(DOCUTILSFLAGS) \
+ --stylesheet=stylesheet.css \
+ --link-stylesheet
+RST2LATEXFLAGS = $(DOCUTILSFLAGS) \
+ --documentclass=article \
+ --documentoptions=a4paper,10pt \
+ --font-encoding=OT4 \
+ --graphicx-option=pdftex \
+ --use-latex-footnotes \
+ --footnote-references=superscript \
+ --use-latex-citations \
+ --use-latex-toc
+
+readme.html: $(top_srcdir)/README
+	$(RST2HTML) $(RST2HTMLFLAGS) $< $@
+readme.tex: $(top_srcdir)/README
+	$(RST2LATEX) $(RST2LATEXFLAGS) $< $@
+.tex.pdf:
+	pdflatex $< && pdflatex $<
+
+noinst_DATA = readme.html readme.pdf
+EXTRA_DIST = readme.html readme.tex readme.pdf
+
+clean-local:
+	-rm -rf *.log *.aux *.toc *.out
+MAINTAINERCLEANFILES = readme.html readme.tex readme.pdf
+
Index: branches/slurm-drmaa-1.0.0/doc/rst.css
===================================================================
--- branches/slurm-drmaa-1.0.0/doc/rst.css	(revision 5)
+++ branches/slurm-drmaa-1.0.0/doc/rst.css	(revision 5)
@@ -0,0 +1,273 @@
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id$
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+
+See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left {
+  clear: left }
+
+img.align-right {
+  clear: right }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font-family: serif ;
+  font-size: 100% }
+
+pre.literal-block, pre.doctest-block {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
Index: branches/slurm-drmaa-1.0.0/doc/stylesheet.css
===================================================================
--- branches/slurm-drmaa-1.0.0/doc/stylesheet.css	(revision 5)
+++ branches/slurm-drmaa-1.0.0/doc/stylesheet.css	(revision 5)
@@ -0,0 +1,137 @@
+/*
+:Authors: Ian Bicking, Michael Foord
+:Contact: fuzzyman@voidspace.org.uk
+:Date: 2005/08/26 
+:Version: 0.1.0
+:Copyright: This stylesheet has been placed in the public domain.
+
+Stylesheet for Docutils.
+Based on ``blue_box.css`` by Ian Bicking
+and ``html4css1.css`` revision 1.46.
+*/
+
+@import url(html4css1.css);
+
+body {
+  font-family: Arial, sans-serif;
+}
+
+em, i {
+  /* Typically serif fonts have much nicer italics */
+  font-family: Times New Roman, Times, serif;
+}
+
+a.target {
+  color: blue;
+}
+
+a.target {
+  color: blue;
+}
+
+a.toc-backref {
+  text-decoration: none;
+  color: black;
+}
+
+a.toc-backref:hover {
+  background-color: inherit;
+}
+
+a:hover {
+  background-color: #cccccc;
+}
+
+div.attention, div.caution, div.danger, div.error, div.hint,
+div.important, div.note, div.tip, div.warning {
+  background-color: #cccccc;
+  padding: 3px;
+  width: 80%;
+}
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title  {
+  text-align: center;
+  background-color: #999999;
+  display: block;
+  margin: 0;
+}
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title {
+  color: #cc0000;
+  font-family: sans-serif;
+  text-align: center;
+  background-color: #999999;
+  display: block;
+  margin: 0;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: Helvetica, Arial, sans-serif;
+  border: thin solid black;
+  /* This makes the borders rounded on Mozilla, which pleases me */
+  -moz-border-radius: 8px;
+  padding: 4px;
+}
+
+h1 {
+  background-color: #444499;
+  color: #ffffff;
+  border: medium solid black;
+}
+
+h1 a.toc-backref, h2 a.toc-backref { 
+  color: #ffffff;
+}
+
+h2 {
+  background-color: #666666;
+  color: #ffffff;
+  border: medium solid black;
+}
+
+h3, h4, h5, h6 {
+  background-color: #cccccc;
+  color: #000000;
+}
+
+h3 a.toc-backref, h4 a.toc-backref, h5 a.toc-backref, 
+h6 a.toc-backref { 
+  color: #000000;
+}
+
+h1.title {
+  text-align: center;
+  background-color: #444499;
+  color: #eeeeee;
+  border: thick solid black;
+  -moz-border-radius: 20px;
+}
+
+table.footnote {
+  padding-left: 0.5ex;
+}
+
+table.citation {
+  padding-left: 0.5ex
+}
+
+pre.literal-block, pre.doctest-block {
+  border: thin black solid;
+  padding: 5px;
+}
+
+.image img { border-style : solid;
+            border-width : 2px;
+}
+
+h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
+  font-size: 100%;
+}
+
+code, tt {
+  color: #000066;
+}
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/job.c
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/job.c	(revision 7)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/job.c	(revision 7)
@@ -0,0 +1,631 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <signal.h>
+
+#include <drmaa_utils/common.h>
+#include <drmaa_utils/conf.h>
+#include <drmaa_utils/datetime.h>
+#include <drmaa_utils/drmaa.h>
+#include <drmaa_utils/drmaa_util.h>
+#include <drmaa_utils/environ.h>
+#include <drmaa_utils/template.h>
+
+#include <slurm_drmaa/job.h>
+#include <slurm_drmaa/session.h>
+#include <slurm_drmaa/util.h>
+
+#include <slurm/slurm.h>
+#include <stdint.h>
+
+static void
+slurmdrmaa_job_control( fsd_job_t *self, int action )
+{
+	slurmdrmaa_job_t *slurm_self = (slurmdrmaa_job_t*)self;
+	job_desc_msg_t job_desc;
+
+	fsd_log_enter(( "({job_id=%s}, action=%d)", self->job_id, action ));
+
+	fsd_mutex_lock( &self->session->drm_connection_mutex );
+	TRY
+	 {
+		switch( action )
+		 {
+			case DRMAA_CONTROL_SUSPEND:
+				if(slurm_suspend(fsd_atoi(self->job_id)) == -1) {
+					fsd_exc_raise_fmt(	FSD_ERRNO_INTERNAL_ERROR,"slurm_suspend error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
+				}
+				slurm_self->user_suspended = true;
+				break;
+			case DRMAA_CONTROL_HOLD:
+				/* change priority to 0*/
+				slurm_init_job_desc_msg(&job_desc);
+				slurm_self->old_priority = job_desc.priority;
+				job_desc.job_id = atoi(self->job_id);
+				job_desc.priority = 0;
+				if(slurm_update_job(&job_desc) == -1) {
+					fsd_exc_raise_fmt(	FSD_ERRNO_INTERNAL_ERROR,"slurm_update_job error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
+				}
+				break;
+			case DRMAA_CONTROL_RESUME:
+				if(slurm_resume(fsd_atoi(self->job_id)) == -1) {
+					fsd_exc_raise_fmt(	FSD_ERRNO_INTERNAL_ERROR,"slurm_resume error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
+				}
+				slurm_self->user_suspended = false;
+				break;
+			case DRMAA_CONTROL_RELEASE:
+			  /* change priority back*/
+			  	slurm_init_job_desc_msg(&job_desc);
+				job_desc.priority = 1;
+				job_desc.job_id = atoi(self->job_id);
+				if(slurm_update_job(&job_desc) == -1) {
+					fsd_exc_raise_fmt(	FSD_ERRNO_INTERNAL_ERROR,"slurm_update_job error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
+				}
+				break;
+			case DRMAA_CONTROL_TERMINATE:
+				if(slurm_kill_job(fsd_atoi(self->job_id),SIGKILL,0) == -1) {
+					fsd_exc_raise_fmt(	FSD_ERRNO_INTERNAL_ERROR,"slurm_terminate_job error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
+				}
+				break;
+			default:
+				fsd_exc_raise_fmt(
+						FSD_ERRNO_INVALID_ARGUMENT,
+						"job::control: unknown action %d", action );
+		 }
+					
+		fsd_log_debug(("job::control: successful"));
+	 }
+	FINALLY
+	 {
+		fsd_mutex_unlock( &self->session->drm_connection_mutex );
+	 }
+	END_TRY
+
+	fsd_log_return(( "" ));
+}
+
+
+static void
+slurmdrmaa_job_update_status( fsd_job_t *self )
+{
+	job_info_msg_t *job_info = NULL;
+	slurmdrmaa_job_t * slurm_self = (slurmdrmaa_job_t *) self;
+	fsd_log_enter(( "({job_id=%s})", self->job_id ));
+
+	fsd_mutex_lock( &self->session->drm_connection_mutex );
+	TRY
+	{
+		if ( slurm_load_job( &job_info, fsd_atoi(self->job_id), SHOW_ALL) ) {
+			fsd_exc_raise_fmt(	FSD_ERRNO_INTERNAL_ERROR,"slurm_load_jobs error: %s,job_id: %s",slurm_strerror(slurm_get_errno()),self->job_id);
+        }
+		
+		self->exit_status = job_info->job_array[0].exit_code;
+		fsd_log_debug(("exit_status = %d -> %d",self->exit_status, WEXITSTATUS(self->exit_status)));
+
+		switch(job_info->job_array[0].job_state)
+		{
+			case JOB_PENDING:
+				switch(job_info->job_array[0].state_reason)
+				{
+					case WAIT_NO_REASON:
+					case WAIT_PRIORITY:
+					case WAIT_DEPENDENCY:
+					case WAIT_RESOURCES:
+					case WAIT_PART_NODE_LIMIT: 
+					case WAIT_PART_TIME_LIMIT: 
+					case WAIT_PART_STATE: 
+						self->state = DRMAA_PS_QUEUED_ACTIVE;
+						break;
+					case WAIT_HELD:
+						self->state = DRMAA_PS_USER_ON_HOLD;
+						break;
+					case WAIT_TIME:
+					case WAIT_LICENSES:
+					case WAIT_ASSOC_JOB_LIMIT:
+					case WAIT_ASSOC_RESOURCE_LIMIT: 
+					case WAIT_ASSOC_TIME_LIMIT:
+					case WAIT_RESERVATION: 
+					case WAIT_NODE_NOT_AVAIL:
+					case WAIT_TBD1:
+					case WAIT_TBD2:
+						self->state = DRMAA_PS_QUEUED_ACTIVE;
+						break;
+					case FAIL_DOWN_PARTITION:
+					case FAIL_DOWN_NODE:
+					case FAIL_BAD_CONSTRAINTS:
+					case FAIL_SYSTEM:
+					case FAIL_LAUNCH:
+					case FAIL_EXIT_CODE:
+					case FAIL_TIMEOUT:
+					case FAIL_INACTIVE_LIMIT:
+					case FAIL_BANK_ACCOUNT:
+						self->state = DRMAA_PS_FAILED;
+						break;
+					default:
+						fsd_log_error(("job_state_reason = %d, assert(0)",job_info->job_array[0].state_reason));
+						fsd_assert(false);
+	
+				}
+				break;
+			case JOB_RUNNING:
+				self->state = DRMAA_PS_RUNNING;
+				break;
+			case JOB_SUSPENDED:
+				if(slurm_self->user_suspended == true)
+					self->state = DRMAA_PS_USER_SUSPENDED;
+				else
+					self->state = DRMAA_PS_SYSTEM_SUSPENDED; /* assume SYSTEM - suspendig jobs is administrator only */
+				break;
+			case JOB_COMPLETE:
+				self->state = DRMAA_PS_DONE;
+				break;
+			case JOB_CANCELLED:
+				self->exit_status = -1;
+			case JOB_FAILED:
+			case JOB_TIMEOUT:
+			case JOB_NODE_FAIL:
+				self->state = DRMAA_PS_FAILED;
+				break;
+			default: /*transient states */
+				if(job_info->job_array[0].job_state >= 0x8000) {
+					fsd_log_debug(("state COMPLETING"));
+				}
+				else if (job_info->job_array[0].job_state >= 0x4000) {
+					fsd_log_debug(("state Allocated nodes booting"));
+				}
+				else {
+					fsd_log_error(("job_state = %d, assert(0)",job_info->job_array[0].job_state));
+					fsd_assert(false);
+				}
+		}
+
+		if(self->exit_status == -1) /* input,output,error path failure etc*/
+			self->state = DRMAA_PS_FAILED;
+
+		fsd_log_debug(("state: %d ,state_reason: %d-> %s", job_info->job_array[0].job_state, job_info->job_array[0].state_reason, drmaa_job_ps_to_str(self->state)));
+
+		self->last_update_time = time(NULL);
+	
+		if( self->state >= DRMAA_PS_DONE )
+			fsd_cond_broadcast( &self->status_cond );
+	}
+	FINALLY
+	{
+		if(job_info != NULL)
+			slurm_free_job_info_msg (job_info);
+
+		fsd_mutex_unlock( &self->session->drm_connection_mutex );
+	}
+	END_TRY
+	
+	fsd_log_return(( "" ));
+}
+
+fsd_job_t *
+slurmdrmaa_job_new( char *job_id )
+{
+	slurmdrmaa_job_t *self = NULL;
+	self = (slurmdrmaa_job_t*)fsd_job_new( job_id );
+
+	fsd_realloc( self, 1, slurmdrmaa_job_t );
+
+	self->super.control = slurmdrmaa_job_control;
+	self->super.update_status = slurmdrmaa_job_update_status;
+	self->old_priority = UINT32_MAX;
+	self->user_suspended = true;
+	return (fsd_job_t*)self;
+}
+
+
+void
+slurmdrmaa_job_create_req(
+		fsd_drmaa_session_t *session,
+		const fsd_template_t *jt,
+		fsd_environ_t **envp,
+		job_desc_msg_t * job_desc,
+		int n_job /* ~job_step */
+		)
+{
+	fsd_expand_drmaa_ph_t *volatile expand = NULL;
+
+	TRY
+	 {
+		expand = fsd_expand_drmaa_ph_new( NULL, NULL, fsd_asprintf("%d",n_job) );
+		slurmdrmaa_job_create( session, jt, envp, expand, job_desc, n_job);
+	 }
+	EXCEPT_DEFAULT
+	 {
+		fsd_exc_reraise();
+	 }
+	FINALLY
+	 {
+		if( expand )
+			expand->destroy( expand );
+	 }
+	END_TRY
+}
+
+static char *
+internal_map_file( fsd_expand_drmaa_ph_t *expand, const char *path,
+		bool *host_given, const char *name )
+{
+	const char *p;
+
+	for( p = path;  *p != ':';  p++ )
+		if( *p == '\0' )
+			fsd_exc_raise_fmt( FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_FORMAT,
+							"invalid format of drmaa_%s_path: missing colon", name );
+	if( host_given )
+		*host_given = ( p != path );
+
+	p++;
+
+	return expand->expand( expand, fsd_strdup(p), FSD_DRMAA_PH_HD | FSD_DRMAA_PH_WD | FSD_DRMAA_PH_INCR );
+}
+
+void
+slurmdrmaa_job_create(
+		fsd_drmaa_session_t *session,
+		const fsd_template_t *jt,
+		fsd_environ_t **envp,
+		fsd_expand_drmaa_ph_t *expand, 
+		job_desc_msg_t * job_desc,
+		int n_job
+		)
+{
+	const char *input_path_orig = NULL;
+	const char *output_path_orig = NULL;
+	const char *error_path_orig = NULL;
+	char *volatile input_path = NULL;
+	char *volatile output_path = NULL;
+	char *volatile error_path = NULL;
+	bool input_host = false;
+	bool output_host = false;
+	bool error_host = false;
+	bool join_files = false;
+	const char *value;
+	const char *const *vector;
+	const char *job_category = "default";
+	
+	slurmdrmaa_init_job_desc( job_desc );
+
+	slurm_init_job_desc_msg( job_desc );
+	
+	job_desc->user_id = getuid();
+	job_desc->group_id = getgid();
+
+	job_desc->env_size = 0;
+	
+	/* job name */
+	value = jt->get_attr( jt, DRMAA_JOB_NAME );
+	if( value )
+	{
+		job_desc->name = fsd_strdup(value);
+		fsd_log_debug(("# job_name = %s",job_desc->name));
+	}
+	
+	/* job state at submit */
+	value = jt->get_attr( jt, DRMAA_JS_STATE );
+	if( value )
+	{
+		if( 0 == strcmp( value, DRMAA_SUBMISSION_STATE_ACTIVE ) )
+		{}
+		else if( 0 == strcmp( value, DRMAA_SUBMISSION_STATE_HOLD ) )
+		{
+			job_desc->priority = 0;
+			fsd_log_debug(("# hold = user"));
+		}
+		else
+		{
+			fsd_exc_raise_msg(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE, "invalid value of drmaa_js_state attribute" );
+		}
+	}
+	
+	TRY
+	{
+		const char *command = NULL;
+		char *command_expanded = NULL;
+		char *temp_script_old = NULL;
+		char *temp_script = "";
+		const char *const *i;
+		int j;
+
+		/* remote command */
+		command = jt->get_attr( jt, DRMAA_REMOTE_COMMAND );
+		if( command == NULL )
+			fsd_exc_raise_msg(
+					FSD_DRMAA_ERRNO_CONFLICTING_ATTRIBUTE_VALUES,
+					"drmaa_remote_command not set for job template"
+					);
+
+		command_expanded = expand->expand( expand, fsd_strdup(command), FSD_DRMAA_PH_HD | FSD_DRMAA_PH_WD );
+
+		temp_script = fsd_asprintf("#!/bin/bash\n%s",command_expanded);
+		fsd_free(command_expanded);
+
+		/* arguments list */
+		vector = jt->get_v_attr( jt, DRMAA_V_ARGV );
+
+		if( vector )
+	 	{
+			for( i = vector, j = 2;  *i;  i++, j++ )
+			{
+				char *arg_expanded = expand->expand( expand, fsd_strdup(*i), FSD_DRMAA_PH_HD | FSD_DRMAA_PH_WD );
+				
+				temp_script_old = fsd_strdup(temp_script);
+				
+				if (strcmp(temp_script, "") != 0) {
+					fsd_free(temp_script);
+				}
+				/* add too script */
+				temp_script = fsd_asprintf("%s '%s'", temp_script_old, arg_expanded);
+				fsd_free(temp_script_old);
+				fsd_free(arg_expanded);
+			}
+		}
+		
+		job_desc->script = fsd_asprintf("%s\n", temp_script);
+		fsd_log_debug(("# Script:\n%s", job_desc->script));
+		fsd_free(temp_script);
+	}
+	END_TRY
+	
+
+	/* start time */
+	value = jt->get_attr( jt, DRMAA_START_TIME );
+	if( value )
+ 	{ 
+		job_desc->begin_time = fsd_datetime_parse( value );
+		fsd_log_debug(( "\n  drmaa_start_time: %s -> %ld", value, (long)job_desc->begin_time));
+	}
+
+	/* environment */
+	vector = jt->get_v_attr( jt, DRMAA_V_ENV );
+	if( vector )
+	{
+		const char *const *i;
+		unsigned j = 0;
+
+		for( i = vector;  *i;  i++ )
+ 		{
+			job_desc->env_size++;
+		}
+		fsd_log_debug(("env_size = %d",job_desc->env_size));
+
+		fsd_log_debug(("# environment ="));
+		fsd_calloc(job_desc->environment, job_desc->env_size+1, char *);
+
+		for( i = vector;  *i;  i++,j++ )
+ 		{
+			job_desc->environment[j] = fsd_strdup(*i);
+			fsd_log_debug((" %s", job_desc->environment[j]));
+		}
+	 }
+	
+ 	/* wall clock time hard limit */
+	value = jt->get_attr( jt, DRMAA_WCT_HLIMIT );
+	if (value)
+	{
+		job_desc->time_limit = slurmdrmaa_datetime_parse( value );
+		fsd_log_debug(("# wct_hlimit = %s -> %ld",value,slurmdrmaa_datetime_parse( value )));
+	}
+
+		
+	/*expand->set(expand, FSD_DRMAA_PH_INCR,fsd_asprintf("%d", n_job));*/ /* set current value */
+	/* TODO: test drmaa_ph_incr */
+	/* job working directory */
+	value = jt->get_attr( jt, DRMAA_WD );
+	if( value )
+	{
+		char *cwd_expanded = expand->expand( expand, fsd_strdup(value), FSD_DRMAA_PH_HD | FSD_DRMAA_PH_INCR );
+
+		expand->set( expand, FSD_DRMAA_PH_WD, fsd_strdup(cwd_expanded));
+
+		fsd_log_debug(("# work_dir = %s",cwd_expanded));
+		job_desc->work_dir = fsd_strdup(cwd_expanded);
+		fsd_free(cwd_expanded);
+	}
+	else
+	{
+		char cwdbuf[4096] = "";
+
+		if ((getcwd(cwdbuf, 4095)) == NULL) {
+			char errbuf[256] = "InternalError";
+			(void)strerror_r(errno, errbuf, 256); /*on error the default message would be returned */
+			fsd_log_error(("getcwd failed: %s", errbuf));
+			job_desc->work_dir = fsd_strdup(".");
+		} else {
+			job_desc->work_dir = fsd_strdup(cwdbuf);
+		}
+
+		fsd_log_debug(("work_dir(default:CWD) %s", job_desc->work_dir));
+	}
+
+	TRY
+ 	{
+		/* input path */
+		input_path_orig = jt->get_attr( jt, DRMAA_INPUT_PATH );
+		if( input_path_orig )
+		{
+			input_path = internal_map_file( expand, input_path_orig, &input_host,"input" );
+			fsd_log_debug(( "\n  drmaa_input_path: %s -> %s", input_path_orig, input_path ));
+		}
+
+		/* output path */
+		output_path_orig = jt->get_attr( jt, DRMAA_OUTPUT_PATH );
+		if( output_path_orig )
+		{
+			output_path = internal_map_file( expand, output_path_orig, &output_host,"output" );
+			fsd_log_debug(( "\n  drmaa_output_path: %s -> %s", output_path_orig, output_path ));
+		}
+
+		/* error path */
+		error_path_orig = jt->get_attr( jt, DRMAA_ERROR_PATH );
+		if( error_path_orig )
+		{
+			error_path = internal_map_file( expand, error_path_orig, &error_host,"error" );
+			fsd_log_debug(( "\n  drmaa_error_path: %s -> %s", error_path_orig, error_path ));
+		}
+
+		/* join files */
+		value = jt->get_attr( jt, DRMAA_JOIN_FILES );
+		if( value )
+		{
+			if( (value[0] == 'y' || value[0] == 'Y')  &&  value[1] == '\0' )
+				join_files = true;
+			else if( (value[0] == 'n' || value[0] == 'N')  &&  value[1] == '\0' )
+				join_files = false;
+			else
+				fsd_exc_raise_msg(
+						FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+						"invalid value of drmaa_join_files attribute" );
+		}
+
+		if( join_files )
+		{
+			if( output_path == NULL )
+				fsd_exc_raise_msg(FSD_DRMAA_ERRNO_CONFLICTING_ATTRIBUTE_VALUES,	"drmaa_join_files is set and output file is not given" );
+			if( error_path!=NULL && 0 != strcmp( output_path, error_path ) )
+				fsd_log_warning(( "Error file was given but will be ignored since drmaa_join_files was set." ));
+
+			if (error_path)
+				fsd_free(error_path);
+
+			 error_path = fsd_strdup(output_path);
+		}
+		else
+		{
+			if( error_path == NULL  &&  output_path )
+				error_path = fsd_strdup( "/dev/null" );
+			if( output_path == NULL  &&  error_path )
+				output_path = fsd_strdup( "/dev/null" );
+		}
+
+
+		/* email addresses to send notifications */
+		vector = jt->get_v_attr( jt, DRMAA_V_EMAIL );
+		if( vector  &&  vector[0] )
+		{
+			/* only to one email address message may be send */
+			job_desc->mail_user = fsd_strdup(vector[0]);
+			fsd_log_debug(("# mail_user = %s\n",vector[0]));
+			if( vector[1] != NULL )
+			{
+				fsd_log_error(( "LL only supports one e-mail notification address" ));
+				fsd_exc_raise_msg(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,"LL only supports one e-mail notification address");
+			}
+		}
+
+		/* block email */
+		value = jt->get_attr( jt, DRMAA_BLOCK_EMAIL );
+		if( value )
+		{
+			bool block;
+			if( strcmp(value, "0") == 0 )
+			{
+				block = true;
+				fsd_log_debug(("# block_email = true"));
+				fsd_log_debug(("# mail_user delated"));
+				fsd_free(job_desc->mail_user);
+				job_desc->mail_user = NULL;
+			}
+			else if( strcmp(value, "1") == 0 )
+				block = false;
+			else
+				fsd_exc_raise_msg(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,"invalid value of drmaa_block_email attribute" );
+
+			if( block && output_path == NULL )
+			{
+				fsd_log_debug(( "output path not set and we want to block e-mail, set to /dev/null" ));
+				output_path = fsd_strdup( "/dev/null" );
+			}
+		}
+
+		if( input_path )
+		{
+			job_desc->std_in = fsd_strdup(input_path);
+			fsd_log_debug(("# input = %s", input_path));
+		}
+
+		if( output_path )
+		{
+			job_desc->std_out = fsd_strdup(output_path);
+			fsd_log_debug(("# output = %s", output_path));
+		}
+
+		if( error_path )
+		{
+			job_desc->std_err = fsd_strdup(error_path);
+			fsd_log_debug(("# error = %s", error_path));
+		}
+	 }
+	FINALLY
+	{
+		fsd_free( input_path );
+		fsd_free( output_path );
+		fsd_free( error_path );
+		input_path = NULL;
+		output_path = NULL;
+		error_path = NULL;
+	}
+	END_TRY			
+	
+	/* native specification */
+	value = jt->get_attr( jt, DRMAA_NATIVE_SPECIFICATION );
+	if( value )
+	{
+		fsd_log_debug(("# Native specification: %s\n", value));
+		slurmdrmaa_parse_native(job_desc, value);
+	}
+		
+	/* job category */
+	value = jt->get_attr( jt, DRMAA_JOB_CATEGORY );
+	if( value )
+		job_category = value;
+
+	{
+		fsd_conf_option_t *category_value = NULL;
+		category_value = fsd_conf_dict_get( session->job_categories, job_category );
+
+		if( category_value != NULL )
+	 	{
+			if( category_value->type != FSD_CONF_STRING )
+				fsd_exc_raise_fmt(
+						FSD_ERRNO_INTERNAL_ERROR,
+						"configuration error: job category should be string"
+						);
+
+			fsd_log_debug(("# Job category %s : %s\n",value,category_value->val.string));			
+			slurmdrmaa_parse_native(job_desc,category_value->val.string);			
+	 	}
+		else
+	 	{
+			if( value != NULL )
+				fsd_exc_raise_fmt(
+						FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+						"invalid job category: %s", job_category
+						);
+	 	}
+ 	}
+	
+}		
+		
+
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/util.c
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/util.c	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/util.c	(revision 5)
@@ -0,0 +1,411 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <drmaa_utils/common.h>
+#include <drmaa_utils/exception.h>
+#include <slurm_drmaa/util.h>
+#include <string.h>
+
+#include <time.h>
+#include <drmaa_utils/datetime.h>
+#include <drmaa_utils/datetime_impl.h>
+
+#ifndef lint
+static char rcsid[]
+#	ifdef __GNUC__
+		__attribute__ ((unused))
+#	endif
+	= "$Id$";
+#endif
+
+unsigned
+slurmdrmaa_datetime_parse( const char *string )
+{
+#ifdef DEBUGGING
+	char dbg[256];
+#endif
+	fsd_dt_parser_t *volatile parser = NULL;
+	fsd_dt_lexer_t *volatile lexer = NULL;
+	int parse_err = 0;
+	fsd_datetime_t dt;
+
+	memset(&dt, 0, sizeof(fsd_datetime_t));
+
+	fsd_log_enter(( "(%s)", string ));
+	TRY
+	 {
+		fsd_malloc( parser, fsd_dt_parser_t );
+		fsd_malloc( lexer, fsd_dt_lexer_t );
+
+		parser->lexer = lexer;
+		parser->n_errors = 0;
+		lexer->parser = parser;
+		lexer->begin = lexer->p = (unsigned char*)string;
+		lexer->end = (unsigned char*)( string + strlen(string) );
+		parse_err = fsd_dt_parse( parser, lexer );
+		if( parse_err || parser->n_errors )
+			fsd_exc_raise_fmt(
+					FSD_ERRNO_INVALID_VALUE_FORMAT,
+					"invalid date/time format: %s", string
+					);
+
+		dt = parser->result;
+#ifdef DEBUGGING
+		fsd_datetime_dump( &dt, dbg, sizeof(dbg) );
+		fsd_log_debug(( "parsed: %s", dbg ));
+#endif
+	}
+	FINALLY
+	 {
+		fsd_free( parser );
+		fsd_free( lexer );
+	 }
+	END_TRY
+
+	fsd_log_return(( "(%s) =%u", string, (unsigned)60*dt.hour+dt.minute ));
+	return 60*dt.hour+dt.minute;
+}
+
+enum slurm_native {
+	SLURM_NATIVE_ACCOUNT,
+	SLURM_NATIVE_ACCTG_FREQ,
+	SLURM_NATIVE_COMMENT,
+	SLURM_NATIVE_CONSTRAINT,
+	SLURM_NATIVE_CONTIGUOUS,
+	SLURM_NATIVE_EXCLUSIVE,
+	SLURM_NATIVE_MEM,
+	SLURM_NATIVE_MEM_PER_CPU,
+	SLURM_NATIVE_MINCPUS,
+	SLURM_NATIVE_NODELIST,
+	SLURM_NATIVE_NODES,
+	SLURM_NATIVE_NTASKS_PER_NODE,
+	SLURM_NATIVE_PARTITION,
+	SLURM_NATIVE_QOS,
+	SLURM_NATIVE_REQUEUE,
+	SLURM_NATIVE_RESERVATION,
+	SLURM_NATIVE_SHARE
+};
+
+void
+slurmdrmaa_init_job_desc(job_desc_msg_t *job_desc)
+{
+	memset(job_desc, 0, sizeof(job_desc_msg_t));
+}
+
+void
+slurmdrmaa_free_job_desc(job_desc_msg_t *job_desc)
+{
+	unsigned i = 0;
+	fsd_log_enter(( "" ));
+	fsd_free(job_desc->account);	
+	fsd_free(job_desc->comment);
+	
+	for(i = 0;i<job_desc->env_size;i++)
+	{
+		fsd_free(job_desc->environment[i]);
+	}	
+	fsd_free(job_desc->environment);
+	fsd_free(job_desc->features);
+	fsd_free(job_desc->name);	
+	fsd_free(job_desc->mail_user);
+	fsd_free(job_desc->partition);
+	fsd_free(job_desc->qos);
+	fsd_free(job_desc->req_nodes);
+	fsd_free(job_desc->reservation);
+	fsd_free(job_desc->script);
+	fsd_free(job_desc->std_in);
+	fsd_free(job_desc->std_out);
+	fsd_free(job_desc->std_err);	
+	fsd_free(job_desc->work_dir);
+	
+	fsd_log_return(( "" ));
+}
+
+void
+slurmdrmaa_add_attribute(job_desc_msg_t *job_desc, unsigned attr, const char *value)
+{
+	char * ptr = NULL;
+	char * rest = NULL;
+	char * token = NULL;
+
+	switch(attr)
+	{
+		case SLURM_NATIVE_ACCOUNT:
+			fsd_free(job_desc->account);
+			fsd_log_debug(("# account = %s",value));
+			job_desc->account = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_ACCTG_FREQ:
+			fsd_log_debug(("# acctg_freq = %s",value));
+			job_desc->acctg_freq = fsd_atoi(value);
+			break;
+		case SLURM_NATIVE_COMMENT:
+			fsd_free(job_desc->comment);
+			fsd_log_debug(("# comment = %s",value));
+			job_desc->comment = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_CONSTRAINT:
+			fsd_free(job_desc->features);
+			fsd_log_debug(("# constraints -> features = %s",value));
+			job_desc->features = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_CONTIGUOUS:
+			fsd_log_debug(( "# contiguous = 1"));
+			job_desc->contiguous = 1;
+			break;
+		case SLURM_NATIVE_EXCLUSIVE:
+			fsd_log_debug(( "# exclusive -> shared = 0"));
+			job_desc->shared = 0;
+			break;
+		case SLURM_NATIVE_MEM:
+			if(job_desc->job_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->job_min_memory) {
+				fsd_log_debug(("# job_min_memory = %s",value));
+				job_desc->job_min_memory = fsd_atoi(value);
+			}
+			else {
+				fsd_log_debug(("mem value defined lower or equal to mem-per-cpu or value defined before"));
+			}
+			break;
+		case SLURM_NATIVE_MEM_PER_CPU:
+			if(job_desc->job_min_memory == NO_VAL ||  fsd_atoi(value) > (int)job_desc->job_min_memory) {
+				fsd_log_debug(("# job_min_memory = %s",value));
+				job_desc->job_min_memory = fsd_atoi(value);
+			}
+			else {
+				fsd_log_debug(("mem-per-cpu value defined lower or equal to mem or value defined before"));
+			}
+			break;
+		case SLURM_NATIVE_MINCPUS:
+			fsd_log_debug(("# job_min_cpus = %s",value));
+			job_desc->job_min_cpus = fsd_atoi(value);
+			break;
+		case SLURM_NATIVE_NODELIST:
+			fsd_free(job_desc->req_nodes);
+			fsd_log_debug(("# node-list - > req_nodes = %s",value));
+			job_desc->req_nodes = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_NODES:
+			ptr = strdup(value);
+
+			if((token = strtok_r(ptr,"=",&rest)) == NULL){
+				fsd_log_error(("strtok_r returned NULL"));
+			}
+						
+			fsd_log_debug(("nodes: %s ->",value));
+			fsd_log_debug(("# min_nodes = %s",token));
+			job_desc->min_nodes = fsd_atoi(token);
+						
+			if(strcmp(rest,"") !=0 ) {
+				fsd_log_debug(("# max_nodes = %s",rest));
+				job_desc->max_nodes = fsd_atoi(rest);
+			}
+			fsd_free(ptr);
+			break;		
+		case SLURM_NATIVE_NTASKS_PER_NODE:
+			fsd_log_debug(("# ntasks_per_node = %s",value));
+			job_desc->ntasks_per_node = fsd_atoi(value);
+			break;
+		case SLURM_NATIVE_PARTITION:
+			fsd_free(job_desc->partition);
+			fsd_log_debug(("# partition = %s",value));
+			job_desc->partition = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_QOS:
+			fsd_free(job_desc->qos);
+			fsd_log_debug(("# qos = %s",value));
+			job_desc->qos = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_REQUEUE:
+			fsd_log_debug(( "# requeue = 1"));
+			job_desc->requeue = 1;
+			break;
+		case SLURM_NATIVE_RESERVATION:
+			fsd_log_debug(("# reservation = %s",value));
+			job_desc->reservation = fsd_strdup(value);
+			break;
+		case SLURM_NATIVE_SHARE:
+			fsd_log_debug(("# shared = 1"));
+			job_desc->shared = 1;
+			break;
+		default:
+			fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,"Invalid attribute");
+	}
+}
+
+void 
+slurmdrmaa_parse_additional_attr(job_desc_msg_t *job_desc,const char *add_attr)
+{
+	char * volatile name = NULL;
+	char *value = NULL;
+	char *ctxt = NULL;
+	char * volatile add_attr_copy = fsd_strdup(add_attr);
+
+	TRY
+	  {
+		name = fsd_strdup(strtok_r(add_attr_copy, "=", &ctxt));
+		value = strtok_r(NULL, "=", &ctxt);
+			
+		if(strcmp(name,"account") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_ACCOUNT,value);
+		}
+		else if(strcmp(name,"acctg-freq") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_ACCTG_FREQ,value);
+		}
+		else if (strcmp(name,"comment") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_COMMENT,value);
+		}
+		else if (strcmp(name,"constraint") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CONSTRAINT,value);
+		}
+		else if (strcmp(name,"contiguous") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CONTIGUOUS,NULL);
+		}
+		else if(strcmp(name,"exclusive") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_EXCLUSIVE,NULL);
+		}
+		else if (strcmp(name,"mem") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_MEM,value);
+		}
+		else if (strcmp(name,"mem-per-cpu") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_MEM_PER_CPU,value);
+		}
+		else if (strcmp(name,"mincpus") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_MINCPUS,value);
+		}
+		else if (strcmp(name,"nodelist") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_NODELIST,value);			
+		}
+		else if (strcmp(name,"nodes") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_NODES,value);
+		}
+		else if (strcmp(name,"ntasks-per-node") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_NTASKS_PER_NODE,value);
+		}
+		else if (strcmp(name,"partition") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_PARTITION,value);
+		}
+		else if (strcmp(name,"qos") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_QOS,value);
+		}
+		else if (strcmp(name,"requeue") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_REQUEUE,NULL);
+		}
+		else if (strcmp(name,"reservation") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_RESERVATION,value);
+		}
+		else if (strcmp(name,"share") == 0) {
+			slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_SHARE,NULL);
+		}		
+		else {
+			fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+					"Invalid native specification: %s (Unsupported option: --%s)",
+					add_attr, name);
+		}
+	
+		/*}*/
+	  }
+	FINALLY
+	  {
+		fsd_free(name);
+		fsd_free(add_attr_copy);
+	  }
+	END_TRY
+}
+
+void 
+slurmdrmaa_parse_native(job_desc_msg_t *job_desc, const char * value)
+{
+	char *arg = NULL;
+	char * volatile native_specification = fsd_strdup(value);
+	char * volatile native_spec_copy = fsd_strdup(native_specification);
+	char * ctxt = NULL;
+	int opt = 0;
+		
+	fsd_log_enter(( "" ));
+	TRY
+	 {
+		for (arg = strtok_r(native_spec_copy, " \t", &ctxt); arg; arg = strtok_r(NULL, " \t",&ctxt) ) {
+			if (!opt) {
+				if ( (arg[0] != '-') || ((strlen(arg) != 2) && (strlen(arg) > 2) && arg[2] != ' ' && arg[1] !='-' ) ) {
+					fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+							"Invalid native specification: %s",
+							native_specification);
+				}
+				if(arg[1] == '-') {
+					slurmdrmaa_parse_additional_attr(job_desc, arg+2);
+				}
+				else {
+					opt = arg[1];
+				}		
+			} else {
+				switch (opt) {			
+					case 'A' :
+						slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_ACCOUNT, arg);
+						break;
+					case 'C' :
+						slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_CONSTRAINT, arg);
+						break;	
+					case 'N' :	
+						slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_NODES, arg);
+						break;	
+					case 'p' :
+						slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_PARTITION, arg);
+						break;
+					case 's' :
+						slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_SHARE, NULL);
+						break;	
+					case 'w' :
+						slurmdrmaa_add_attribute(job_desc,SLURM_NATIVE_NODELIST, arg);
+						break;		
+					default :								
+							fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+									"Invalid native specification: %s (Unsupported option: -%c)",
+									native_specification, opt);
+				}
+				if (arg[0] == '-' && strlen(arg) == 2) { /* attribute without arg */
+					opt = arg[1];
+				}
+				else {
+					opt = 0;
+				}
+			}
+		}
+
+		if(strlen(native_spec_copy) == 2 && native_spec_copy[0] == '-' && native_spec_copy[1] == 's')
+		{
+			slurmdrmaa_add_attribute(job_desc, SLURM_NATIVE_SHARE, NULL);
+			opt = 0;
+		}
+		
+		if (opt)
+			fsd_exc_raise_fmt(FSD_DRMAA_ERRNO_INVALID_ATTRIBUTE_VALUE,
+					"Invalid native specification: %s",
+					native_specification);
+
+	 }
+	FINALLY
+	 {
+		fsd_free(native_spec_copy);
+		fsd_free(native_specification);
+	 }
+	END_TRY
+
+	fsd_log_return(( "" ));
+}
+
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/job.h
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/job.h	(revision 7)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/job.h	(revision 7)
@@ -0,0 +1,49 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SLURM_DRMAA__JOB_H
+#define __SLURM_DRMAA__JOB_H
+
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <drmaa_utils/job.h>
+#include <drmaa_utils/environ.h>
+
+#include <slurm/slurm.h>
+
+typedef struct slurmdrmaa_job_s slurmdrmaa_job_t;
+
+fsd_job_t *
+slurmdrmaa_job_new(char *job_id );
+
+struct slurmdrmaa_job_s {
+	fsd_job_t super;
+	
+	/* job priority before hold */
+	uint32_t old_priority;
+	bool user_suspended;
+};
+
+void slurmdrmaa_job_create_req(fsd_drmaa_session_t *session,const fsd_template_t *jt,fsd_environ_t **envp, job_desc_msg_t * job_desc,	int n_job );
+void slurmdrmaa_job_create(fsd_drmaa_session_t *session,const fsd_template_t *jt,fsd_environ_t **envp,fsd_expand_drmaa_ph_t *expand, job_desc_msg_t * job_desc,	int n_job);
+
+#endif /* __SLURM_DRMAA__JOB_H */
+
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/util.h
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/util.h	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/util.h	(revision 5)
@@ -0,0 +1,36 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LL_DRMAA__UTIL_H
+#define __LL_DRMAA__UTIL_H
+
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <slurm/slurm.h>
+
+/* Parse time to minutes */
+unsigned slurmdrmaa_datetime_parse( const char *string );
+
+void slurmdrmaa_init_job_desc(job_desc_msg_t *job_desc);
+void slurmdrmaa_free_job_desc(job_desc_msg_t *job_desc);
+void slurmdrmaa_parse_native(job_desc_msg_t *job_desc, const char * value);
+
+#endif /* __SLURM_DRMAA__UTIL_H */
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/session.c
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/session.c	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/session.c	(revision 5)
@@ -0,0 +1,199 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <unistd.h>
+
+#include <drmaa_utils/iter.h>
+#include <drmaa_utils/conf.h>
+#include <slurm_drmaa/job.h>
+#include <slurm_drmaa/session.h>
+#include <slurm_drmaa/util.h>
+
+#include <slurm/slurm.h>
+
+static char *slurmdrmaa_session_run_job(fsd_drmaa_session_t *self, const fsd_template_t *jt);
+
+static fsd_iter_t *slurmdrmaa_session_run_bulk(	fsd_drmaa_session_t *self,const fsd_template_t *jt, int start, int end, int incr );
+
+static fsd_job_t *slurmdrmaa_session_new_job( fsd_drmaa_session_t *self, const char *job_id );
+
+fsd_drmaa_session_t *
+slurmdrmaa_session_new( const char *contact )
+{
+	slurmdrmaa_session_t *volatile self = NULL;
+	TRY
+	 {
+		self = (slurmdrmaa_session_t*)fsd_drmaa_session_new(contact);
+
+		fsd_realloc( self, 1, slurmdrmaa_session_t );
+
+		self->super.run_job = slurmdrmaa_session_run_job;
+		self->super.run_bulk = slurmdrmaa_session_run_bulk;
+		self->super.new_job = slurmdrmaa_session_new_job;
+
+		self->super.load_configuration( &self->super, "slurm_drmaa" );
+	 }
+	EXCEPT_DEFAULT
+	 {
+		fsd_free( self );
+		fsd_exc_reraise();
+	 }
+	END_TRY
+	return (fsd_drmaa_session_t*)self;
+}
+
+
+char *
+slurmdrmaa_session_run_job(
+		fsd_drmaa_session_t *self,
+		const fsd_template_t *jt
+		)
+{
+	char *job_id = NULL;
+	fsd_iter_t *volatile job_ids = NULL;
+
+	TRY
+	 {
+		job_ids = self->run_bulk( self, jt, 0, 0, 0 ); /* single job run as bulk job specialization */
+		job_id = fsd_strdup( job_ids->next( job_ids ) );
+	 }
+	FINALLY
+	 {
+		if( job_ids )
+			job_ids->destroy( job_ids );
+	 }
+	END_TRY
+	return job_id;
+}
+
+
+fsd_iter_t *
+slurmdrmaa_session_run_bulk(
+		fsd_drmaa_session_t *self,
+		const fsd_template_t *jt,
+		int start, int end, int incr )
+{
+	fsd_job_t *volatile job = NULL;
+	char **volatile job_ids = NULL;
+	unsigned n_jobs = 0;
+	volatile bool connection_lock = false;
+	fsd_environ_t *volatile env = NULL;
+	job_desc_msg_t job_desc;
+	submit_response_msg_t *submit_response = NULL;
+	
+	TRY
+	 {
+
+		if( start != end )
+			n_jobs = (end - start) / incr + 1;
+		else 
+			n_jobs = 1;	
+
+		if(  start != end )
+		 {
+			unsigned idx, i;
+
+			fsd_calloc( job_ids, n_jobs+1, char* );
+
+			for( idx = start, i = 0;  idx <= (unsigned)end;  idx += incr, i++ )
+			 {
+				connection_lock = fsd_mutex_lock( &self->drm_connection_mutex );
+				slurmdrmaa_job_create_req( self, jt, (fsd_environ_t**)&env , &job_desc, idx);
+				if(slurm_submit_batch_job(&job_desc,&submit_response)){
+					fsd_exc_raise_fmt(
+						FSD_ERRNO_INTERNAL_ERROR,"slurm_submit_batch_job: %s",slurm_strerror(slurm_get_errno()));
+				}
+
+				fsd_log_debug(("job %u submitted", submit_response->job_id));         
+				connection_lock = fsd_mutex_unlock( &self->drm_connection_mutex );
+
+
+				job_ids[i] = fsd_asprintf("%d",submit_response->job_id); /*TODO  */
+
+				job = slurmdrmaa_job_new( fsd_strdup(job_ids[i]) ); 
+				job->session = self;
+				job->submit_time = time(NULL);
+				self->jobs->add( self->jobs, job );
+				job->release( job );  
+				job = NULL;
+			 }
+			fsd_assert( i == n_jobs );
+		 }
+		else /* ! bulk */
+		 {
+			fsd_calloc( job_ids, n_jobs+1, char* );
+			
+			connection_lock = fsd_mutex_lock( &self->drm_connection_mutex );
+			slurmdrmaa_job_create_req( self, jt, (fsd_environ_t**)&env , &job_desc, 0);
+			if(slurm_submit_batch_job(&job_desc,&submit_response)){
+				fsd_exc_raise_fmt(
+					FSD_ERRNO_INTERNAL_ERROR,"slurm_submit_batch_job: %s",slurm_strerror(slurm_get_errno()));
+			}
+
+			fsd_log_debug(("job %u submitted", submit_response->job_id));         
+			connection_lock = fsd_mutex_unlock( &self->drm_connection_mutex );
+			
+			job_ids[0] = fsd_asprintf( "%d", submit_response->job_id); /* .0*/
+
+			job = slurmdrmaa_job_new( fsd_strdup(job_ids[0]) ); /* TODO: ??? */
+			job->session = self;
+			job->submit_time = time(NULL);
+			self->jobs->add( self->jobs, job );
+			job->release( job );
+			job = NULL;
+		 }
+	 }
+	 ELSE
+	{
+		if ( !connection_lock )
+			connection_lock = fsd_mutex_lock( &self->drm_connection_mutex );
+
+		slurm_free_submit_response_response_msg ( submit_response );
+	}
+	FINALLY
+	 {
+		
+			
+		if( connection_lock )
+			fsd_mutex_unlock( &self->drm_connection_mutex );
+
+		if( job )
+			job->release( job );
+
+		if( fsd_exc_get() != NULL )
+			fsd_free_vector( job_ids );
+			
+		slurmdrmaa_free_job_desc(&job_desc);
+	 }
+	END_TRY
+
+	return fsd_iter_new( job_ids, n_jobs );
+}
+
+
+fsd_job_t *
+slurmdrmaa_session_new_job( fsd_drmaa_session_t *self, const char *job_id )
+{
+	fsd_job_t *job;
+	job = slurmdrmaa_job_new( fsd_strdup(job_id) );
+	job->session = self;
+	return job;
+}
+
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/slurm_drmaa.conf.example
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/slurm_drmaa.conf.example	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/slurm_drmaa.conf.example	(revision 5)
@@ -0,0 +1,15 @@
+## $Id$
+## slurm_drmaa.conf.example - Sample slurm_drmaa configuration file.
+
+## Cache job state for number of seconds.  If set to positive integer
+## `drmaa_job_ps()` returns remembered job state without communicating with
+## DRM for `cache_job_state` seconds since last update.  By default it is
+## 0 meaning no caching will be performed.
+#cache_job_state: 5,
+
+## Mapping of `drmaa_job_category` values to native specification.
+job_categories: {
+  #default: "--share",
+  exclusive: "--exclusive",
+},
+
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/drmaa.c
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/drmaa.c	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/drmaa.c	(revision 5)
@@ -0,0 +1,215 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <drmaa_utils/common.h>
+#include <drmaa_utils/compat.h>
+#include <drmaa_utils/drmaa.h>
+#include <drmaa_utils/drmaa_base.h>
+#include <drmaa_utils/iter.h>
+#include <drmaa_utils/drmaa_attrib.h>
+
+#include <slurm_drmaa/session.h>
+#include <slurm/slurm.h>
+
+static char slurmdrmaa_version[50] = "";
+
+static fsd_drmaa_session_t *
+slurmdrmaa_new_session( fsd_drmaa_singletone_t *self, const char *contact )
+{
+	return slurmdrmaa_session_new( contact );
+}
+
+static fsd_template_t *
+slurmdrmaa_new_job_template( fsd_drmaa_singletone_t *self )
+{
+	return drmaa_template_new();
+}
+
+static const char *
+slurmdrmaa_get_contact( fsd_drmaa_singletone_t *self )
+{
+	return "";
+}
+
+static void
+slurmdrmaa_get_version( fsd_drmaa_singletone_t *self,
+		unsigned *major, unsigned *minor )
+{
+	*major = 1;  *minor = 0;
+}
+
+static const char *
+slurmdrmaa_get_DRM_system( fsd_drmaa_singletone_t *self )
+{
+	if(slurmdrmaa_version[0] == '\0') /*no locks as drmaa_get_drm_system is usually called only once */
+	{
+		slurm_ctl_conf_t * conf_info_msg_ptr = NULL; 
+		if ( slurm_load_ctl_conf ((time_t) NULL, &conf_info_msg_ptr ) == -1 ) 
+		{ 
+			fsd_log_error(("slurm_load_ctl_conf error: %s",slurm_strerror(slurm_get_errno())));
+			fsd_snprintf(NULL, slurmdrmaa_version, sizeof(slurmdrmaa_version)-1,"SLURM");
+		}
+		else
+		{
+			fsd_snprintf(NULL, slurmdrmaa_version, sizeof(slurmdrmaa_version)-1,"SLURM %s", conf_info_msg_ptr->version);
+			slurm_free_ctl_conf (conf_info_msg_ptr);
+		}
+	}
+	return slurmdrmaa_version;
+}
+
+static const char *
+slurmdrmaa_get_DRMAA_implementation( fsd_drmaa_singletone_t *self )
+{
+	return PACKAGE_STRING;
+}
+
+
+fsd_iter_t *
+slurmdrmaa_get_attribute_names( fsd_drmaa_singletone_t *self )
+{
+	static const char *attribute_names[] = {
+		DRMAA_REMOTE_COMMAND,
+		DRMAA_JS_STATE,
+		DRMAA_WD,
+		DRMAA_JOB_CATEGORY,
+		DRMAA_NATIVE_SPECIFICATION,
+		DRMAA_BLOCK_EMAIL,
+		DRMAA_START_TIME,
+		DRMAA_JOB_NAME,
+		DRMAA_INPUT_PATH,
+		DRMAA_OUTPUT_PATH,
+		DRMAA_ERROR_PATH,
+		DRMAA_JOIN_FILES,
+		DRMAA_WCT_HLIMIT,
+		NULL
+	};
+	return fsd_iter_new_const( attribute_names, -1 );
+}
+
+fsd_iter_t *
+slurmdrmaa_get_vector_attribute_names( fsd_drmaa_singletone_t *self )
+{
+	static const char *attribute_names[] = {
+		DRMAA_V_ARGV,
+		DRMAA_V_ENV,
+		DRMAA_V_EMAIL,
+		NULL
+	};
+	return fsd_iter_new_const( attribute_names, -1 );
+}
+
+static int
+slurmdrmaa_wifexited(
+		int *exited, int stat,
+		char *error_diagnosis, size_t error_diag_len
+		)
+{
+	/*bool run;
+	int exit_status;
+	run = ((stat & 0xff) == 0);
+	exit_status = ((stat & 0xff00) >> 8) & 0xff;
+	*exited = run && (exit_status <= 128);*/
+	*exited = WIFEXITED(stat);
+	return DRMAA_ERRNO_SUCCESS;
+}
+
+static int
+slurmdrmaa_wexitstatus(
+		int *exit_status, int stat,
+		char *error_diagnosis, size_t error_diag_len
+		)
+{
+	/**exit_status = ((stat & 0xff00) >> 8) & 0xff;*/
+	*exit_status = WEXITSTATUS(stat);
+	return DRMAA_ERRNO_SUCCESS;
+}
+
+static int
+slurmdrmaa_wifsignaled(
+		int *signaled, int stat,
+		char *error_diagnosis, size_t error_diag_len
+		)
+{
+	*signaled = ((stat & 0xff00) >> 8) >= 128;
+	/**signaled = WIFSIGNALED(stat);*/
+	return DRMAA_ERRNO_SUCCESS;
+}
+
+static int
+slurmdrmaa_wtermsig(
+		char *signal, size_t signal_len, int stat,
+		char *error_diagnosis, size_t error_diag_len
+		)
+{
+	int sig = ((stat & 0xff00) >> 8) - 128;
+	strlcpy( signal, fsd_strsignal(sig), signal_len );
+	/*int sig = WTERMSIG(stat);
+	strlcpy( signal, fsd_strsignal(sig), signal_len );*/
+	return DRMAA_ERRNO_SUCCESS;
+}
+
+static int
+slurmdrmaa_wcoredump(
+		int *core_dumped, int stat,
+		char *error_diagnosis, size_t error_diag_len
+		)
+{
+	/**core_dumped = 0;*/
+	*core_dumped = ((stat)&0200); 
+	return DRMAA_ERRNO_SUCCESS;
+}
+
+static int
+slurmdrmaa_wifaborted(
+		int *aborted, int stat,
+		char *error_diagnosis, size_t error_diag_len
+		)
+{
+	*aborted = ((stat & 0x01) != 0);
+	return DRMAA_ERRNO_SUCCESS;
+}
+
+
+fsd_drmaa_singletone_t _fsd_drmaa_singletone = {
+	NULL,
+	FSD_MUTEX_INITIALIZER,
+
+	slurmdrmaa_new_session,
+	slurmdrmaa_new_job_template,
+
+	slurmdrmaa_get_contact,
+	slurmdrmaa_get_version,
+	slurmdrmaa_get_DRM_system,
+	slurmdrmaa_get_DRMAA_implementation,
+
+	slurmdrmaa_get_attribute_names,
+	slurmdrmaa_get_vector_attribute_names,
+
+	slurmdrmaa_wifexited,
+	slurmdrmaa_wexitstatus,
+	slurmdrmaa_wifsignaled,
+	slurmdrmaa_wtermsig,
+	slurmdrmaa_wcoredump,
+	slurmdrmaa_wifaborted
+};
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/Makefile.am
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/Makefile.am	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/Makefile.am	(revision 5)
@@ -0,0 +1,36 @@
+# $Id$
+#
+# PSNC DRMAA for LoadLeveler
+# Copyright (C) 2010 Poznan Supercomputing and Networking Center
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+
+lib_LTLIBRARIES = libdrmaa.la
+libdrmaa_la_SOURCES = \
+ drmaa.c \
+ job.c job.h \
+ session.c session.h \
+ util.c util.h
+libdrmaa_la_CPPFLAGS = @SLURM_INCLUDES@ -I$(top_srcdir)/drmaa_utils/ 
+if GCC
+libdrmaa_la_CPPFLAGS += -Wno-long-long 
+endif
+
+libdrmaa_la_LIBADD = ../drmaa_utils/drmaa_utils/libdrmaa_utils.la @SLURM_LIBS@
+libdrmaa_la_LDFLAGS = @SLURM_LDFLAGS@ -version-info @SLURM_DRMAA_VERSION_INFO@
+
+dist_sysconf_DATA = slurm_drmaa.conf.example
Index: branches/slurm-drmaa-1.0.0/slurm_drmaa/session.h
===================================================================
--- branches/slurm-drmaa-1.0.0/slurm_drmaa/session.h	(revision 5)
+++ branches/slurm-drmaa-1.0.0/slurm_drmaa/session.h	(revision 5)
@@ -0,0 +1,38 @@
+/* $Id$ */
+/*
+ * PSNC DRMAA for SLURM
+ * Copyright (C) 2010 Poznan Supercomputing and Networking Center
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SLURM_DRMAA__SESSION_H
+#define __SLURM_DRMAA__SESSION_H
+
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include <drmaa_utils/session.h>
+
+typedef struct slurmdrmaa_session_s slurmdrmaa_session_t;
+
+fsd_drmaa_session_t *slurmdrmaa_session_new( const char *contact );
+
+struct slurmdrmaa_session_s {
+	fsd_drmaa_session_t super;
+};
+
+#endif /* __SLURM_DRMAA__SESSION_H */
+
Index: branches/slurm-drmaa-1.0.0/COPYING
===================================================================
--- branches/slurm-drmaa-1.0.0/COPYING	(revision 5)
+++ branches/slurm-drmaa-1.0.0/COPYING	(revision 5)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Index: branches/slurm-drmaa-1.0.0/Makefile.am
===================================================================
--- branches/slurm-drmaa-1.0.0/Makefile.am	(revision 7)
+++ branches/slurm-drmaa-1.0.0/Makefile.am	(revision 7)
@@ -0,0 +1,27 @@
+# $Id$
+#
+# PSNC DRMAA for LoadLeveler
+# Copyright (C) 2010 Poznan Supercomputing and Networking Center
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+ACLOCAL_AMFLAGS = -I m4
+EXTRA_DIST = \
+ autoclean.sh \
+ autogen.sh \
+ m4/missing-dev-prog.sh
+
+SUBDIRS = drmaa_utils slurm_drmaa 
+
Index: branches/slurm-drmaa-1.0.0/autogen.sh
===================================================================
--- branches/slurm-drmaa-1.0.0/autogen.sh	(revision 5)
+++ branches/slurm-drmaa-1.0.0/autogen.sh	(revision 5)
@@ -0,0 +1,49 @@
+#!/bin/sh
+# $Id$
+
+run() {
+	echo "running $@ ($PWD)"
+	eval "$@"
+}
+
+check()
+{
+	printf "checking for $1... "
+	if ($1 --version < /dev/null > /dev/null 2>&1); then
+		echo "yes"
+	else
+		echo "no"
+		exit 1
+	fi
+}
+
+ACLOCAL=${ACLOCAL:=aclocal}
+AUTOHEADER=${AUTOHEADER:=autoheader}
+AUTOCONF=${AUTOCONF:=autoconf}
+LIBTOOLIZE=${LIBTOOLIZE:=libtoolize}
+AUTOMAKE=${AUTOMAKE:=automake}
+
+check $ACLOCAL
+check $AUTOHEADER
+check $AUTOCONF
+check $LIBTOOLIZE
+check $AUTOMAKE
+
+mkdir -p scripts
+
+run ${ACLOCAL} -I m4 | grep -v ^/usr/share/aclocal || exit 1
+run ${LIBTOOLIZE} --automake --copy --force || exit 1
+run ${AUTOHEADER} --warnings=all || exit 1
+run ${AUTOMAKE} --foreign --add-missing --copy --warnings=all || exit 1
+run ${AUTOCONF} --warnings=all -Wno-obsolete || exit 1
+
+if [ -n "$*" ]; then
+	args="$*"
+elif [ -f config.log ]; then
+	args=`grep '\$ *\./configure ' config.log \
+			 | sed 's:^ *\$ *\./configure ::;s:--no-create::;s:--no-recursion::' \
+			 2>/dev/null`
+fi
+
+(cd drmaa_utils && run sh autogen.sh "$@")
+run ./configure ${args}
Index: branches/slurm-drmaa-1.0.0/README
===================================================================
--- branches/slurm-drmaa-1.0.0/README	(revision 6)
+++ branches/slurm-drmaa-1.0.0/README	(revision 6)
@@ -0,0 +1,1 @@
+The manual for the DRMAA for Simple Linux Utility for Resource Management (SLURM) is available at project wiki: http://apps.man.poznan.pl/trac/slurm-drmaa/wiki
