gug-cvs Mailing List for Grid Underground (Page 4)
Status: Planning
Brought to you by:
szferi
Menu
▾
▴
gug-cvs — CVS commits
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(67) |
Oct
(232) |
Nov
(76) |
Dec
(36) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(100) |
Feb
(89) |
Mar
(44) |
Apr
(71) |
May
(34) |
Jun
(81) |
Jul
(43) |
Aug
(42) |
Sep
(1) |
Oct
(87) |
Nov
(11) |
Dec
(9) |
| 2007 |
Jan
(203) |
Feb
(149) |
Mar
(94) |
Apr
(70) |
May
(35) |
Jun
(27) |
Jul
(4) |
Aug
|
Sep
(18) |
Oct
|
Nov
|
Dec
|
|
From: Roczei G. <ro...@us...> - 2007-05-12 21:09:44
|
Update of /cvsroot/gug/gug/gug/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13403 Modified Files: ogsa_bes.py Log Message: state names update Index: ogsa_bes.py =================================================================== RCS file: /cvsroot/gug/gug/gug/common/ogsa_bes.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ogsa_bes.py 21 Feb 2007 17:53:15 -0000 1.6 --- ogsa_bes.py 12 May 2007 21:09:41 -0000 1.7 *************** *** 23,26 **** --- 23,27 ---- BES_OVERALL_STATE_PENDING = 16 BES_OVERALL_STATE_CANCELLED = 17 + BES_OVERALL_STATE_MIGRATION = 18 *************** *** 31,35 **** overall_states = { BES_OVERALL_STATE_UNKNOWN: 'UNKNOWN', ! BES_OVERALL_STATE_NEW: 'NEW', BES_OVERALL_STATE_STARTING: 'STARTING', BES_OVERALL_STATE_RUNNING: 'RUNNING', --- 32,36 ---- overall_states = { BES_OVERALL_STATE_UNKNOWN: 'UNKNOWN', ! BES_OVERALL_STATE_NEW: 'PENDING', BES_OVERALL_STATE_STARTING: 'STARTING', BES_OVERALL_STATE_RUNNING: 'RUNNING', *************** *** 37,50 **** BES_OVERALL_STATE_SHUTTING_DOWN: 'SHUTTING DOWN', BES_OVERALL_STATE_COMPLETED: 'COMPLETED', ! BES_OVERALL_STATE_TERMINATED: 'TERMINATED', BES_OVERALL_STATE_KILLED: 'KILLED', ! BES_OVERALL_STATE_EXCEPTION: 'EXCEPTION', BES_OVERALL_STATE_SERVICE: 'SERVICE', ! BES_OVERALL_STATE_DONE: 'DONE', BES_OVERALL_STATE_STAGED_IN: 'STAGED IN', - BES_OVERALL_STATE_EXCEPTION: 'EXCEPTION', BES_OVERALL_STATE_STAGING: 'STAGING', BES_OVERALL_STATE_PENDING : 'PENDING', ! BES_OVERALL_STATE_CANCELLED : 'CANCELLED', } --- 38,51 ---- BES_OVERALL_STATE_SHUTTING_DOWN: 'SHUTTING DOWN', BES_OVERALL_STATE_COMPLETED: 'COMPLETED', ! BES_OVERALL_STATE_TERMINATED: 'FAILED', BES_OVERALL_STATE_KILLED: 'KILLED', ! BES_OVERALL_STATE_EXCEPTION: 'FAILED', BES_OVERALL_STATE_SERVICE: 'SERVICE', ! BES_OVERALL_STATE_DONE: 'FINISHED', BES_OVERALL_STATE_STAGED_IN: 'STAGED IN', BES_OVERALL_STATE_STAGING: 'STAGING', BES_OVERALL_STATE_PENDING : 'PENDING', ! BES_OVERALL_STATE_CANCELLED : 'TERMINATED', ! BES_OVERALL_STATE_MIGRATION : 'MIGRATION' } |
|
From: Nagy Z. <zs...@us...> - 2007-05-08 13:57:38
|
Update of /cvsroot/gug/gug/gug/cli In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11215/gug/cli Modified Files: clgr.py Log Message: defaults for input, output and error files Index: clgr.py =================================================================== RCS file: /cvsroot/gug/gug/gug/cli/clgr.py,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** clgr.py 7 May 2007 13:28:37 -0000 1.51 --- clgr.py 8 May 2007 13:57:39 -0000 1.52 *************** *** 436,444 **** job['initialdir'] = os.path.join('jobdir', job.get('initialdir','')) job['executable'] = 'bin/' + job['executable'] ! job['input'] = 'input/' + job.get('input', '') ! job['output'] = 'output/' + job.get('output', '') ! job['error'] = 'output/' + job.get('error', '') jsdldoc = create_jsdl_from_desc(job, staging_data) if verbose: print 'jsdl (job=%s): ' % job['name'] --- 436,445 ---- job['initialdir'] = os.path.join('jobdir', job.get('initialdir','')) job['executable'] = 'bin/' + job['executable'] ! job['input'] = 'input/' + job.get('input', job['name'] + '.stdin') ! job['output'] = 'output/' + job.get('output', job['name'] + '.stdout') ! job['error'] = 'output/' + job.get('error', job['name'] + '.stderr') jsdldoc = create_jsdl_from_desc(job, staging_data) + if verbose: print 'jsdl (job=%s): ' % job['name'] |
|
From: Nagy Z. <zs...@us...> - 2007-05-08 13:56:28
|
Update of /cvsroot/gug/gug/gug In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10433/gug Added Files: zsi.py Log Message: gug.zsi.MyAny class instead of patching ZSI for ZSI-2.0 --- NEW FILE: zsi.py --- from ZSI import TC from ZSI import _copyright, _children, _child_elements, \ _floattypes, _stringtypes, _seqtypes, _find_attr, _find_attrNS, _find_attrNodeNS, \ _find_arraytype, _find_default_namespace, _find_href, _find_encstyle, \ _resolve_prefix, _find_xsi_attr, _find_type, \ _find_xmlns_prefix, _get_element_nsuri_name, _get_idstr, \ _Node, EvaluateException, \ _valid_encoding, ParseException from ZSI.wstools.logging import getLogger as _GetLogger from ZSI.wstools.Namespaces import SCHEMA, SOAP import types, time from ZSI.TC import Nilled, _is_xsd_or_soap_ns from gug.common import log class MyAny(TC.Any): '''When the type isn't defined in the schema, but must be specified in the incoming operation. parsemap -- a type to class mapping (updated by descendants), for parsing serialmap -- same, for (outgoing) serialization ''' logger = _GetLogger('gug.zsi.MyAny') def __init__(self, pname=None, aslist=False, minOccurs=0, **kw): TC.Any.__init__(self, pname, aslist, minOccurs, **kw) def parse(self, elt, ps): (ns,type) = self.checkname(elt, ps) if not type and self.nilled(elt, ps): return Nilled if len(_children(elt)) == 0: href = _find_href(elt) if not href: if self.minOccurs < 1: if _is_xsd_or_soap_ns(ns): parser = MyAny.parsemap.get((None,type)) if parser: return parser.parse(elt, ps) if ((ns,type) == (SOAP.ENC,'Array') or (_find_arraytype(elt) or '').endswith('[0]')): return [] if not type: return {} return None raise EvaluateException('Required Any missing', ps.Backtrace(elt)) elt = ps.FindLocalHREF(href, elt) (ns,type) = self.checktype(elt, ps) if not type and elt.namespaceURI == SOAP.ENC: ns,type = SOAP.ENC, elt.localName if not type or (ns,type) == (SOAP.ENC,'Array'): if self.aslist or _find_arraytype(elt): return [ self.__class__(**self.kwargs).parse(e, ps) for e in _child_elements(elt) ] if len(_child_elements(elt)) == 0: #raise EvaluateException("Any cannot parse untyped element", # ps.Backtrace(elt)) return self.simple_value(elt, ps) return self.parse_into_dict_or_list(elt, ps) parser = MyAny.parsemap.get((ns,type)) if not parser and _is_xsd_or_soap_ns(ns): parser = MyAny.parsemap.get((None,type)) if not parser: raise EvaluateException('''gug.zsi.MyAny can't parse element''', ps.Backtrace(elt)) return parser.parse(elt, ps) def serialize(self, elt, sw, pyobj, name=None, **kw): if hasattr(pyobj, 'typecode') and pyobj.typecode is not self: pyobj.typecode.serialize(elt, sw, pyobj, **kw) return objid = _get_idstr(pyobj) ns,n = self.get_name(name, objid) kw.setdefault('typed', self.typed) tc = type(pyobj) self.logger.debug('gug.zsi.MyAny serialize -- %s', tc) if tc in _seqtypes: if True: # self.aslist: array = elt.createAppendElement(ns, n) array.setAttributeType(SOAP.ENC, "Array") array.setAttributeNS(self.nspname, 'SOAP-ENC:arrayType', "xsd:anyType[" + str(len(pyobj)) + "]" ) for o in pyobj: #TODO maybe this should take **self.kwargs... serializer = getattr(o, 'typecode', self.__class__()) # also used by _AnyLax() serializer.serialize(array, sw, o, name='element', **kw) else: struct = elt.createAppendElement(ns, n) for o in pyobj: #TODO maybe this should take **self.kwargs... serializer = getattr(o, 'typecode', self.__class__()) # also used by _AnyLax() serializer.serialize(struct, sw, o, **kw) return kw['name'] = (ns,n) if tc == types.DictType: el = elt.createAppendElement(ns, n) parentNspname = self.nspname # temporarily clear nspname for dict elements self.nspname = None for o,m in pyobj.items(): if type(o) != types.StringType and type(o) != types.UnicodeType: raise Exception, 'Dictionary implementation requires keys to be of type string (or unicode).' %pyobj kw['name'] = o kw.setdefault('typed', True) self.serialize(el, sw, m, **kw) # restore nspname self.nspname = parentNspname return if tc == types.InstanceType: tc = pyobj.__class__ if hasattr(pyobj, 'typecode'): #serializer = pyobj.typecode.serialmap.get(tc) serializer = pyobj.typecode else: serializer = MyAny.serialmap.get(tc) if not serializer: tc = (types.ClassType, pyobj.__class__.__name__) serializer = MyAny.serialmap.get(tc) else: serializer = MyAny.serialmap.get(tc) if not serializer and isinstance(pyobj, time.struct_time): from ZSI.TCtimes import gDateTime serializer = gDateTime() if not serializer: # Last-chance; serialize instances as dictionary if pyobj is None: self.serialize_as_nil(elt.createAppendElement(ns, n)) elif type(pyobj) != types.InstanceType: raise EvaluateException('''gug.zsi.MyAny can't serialize ''' + \ repr(pyobj)) else: self.serialize(elt, sw, pyobj.__dict__, **kw) else: # Try to make the element name self-describing tag = getattr(serializer, 'tag', None) if self.pname is not None: #serializer.nspname = self.nspname #serializer.pname = self.pname if "typed" not in kw: kw['typed'] = False elif tag: if tag.find(':') == -1: tag = 'SOAP-ENC:' + tag kw['name'] = tag kw['typed'] = False serializer.unique = self.unique serializer.serialize(elt, sw, pyobj, **kw) # Reset TypeCode #serializer.nspname = None #serializer.pname = None |
|
From: Nagy Z. <zs...@us...> - 2007-05-08 13:56:26
|
Update of /cvsroot/gug/gug/gug/host/handler In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10433/gug/host/handler Modified Files: soap.py Log Message: gug.zsi.MyAny class instead of patching ZSI for ZSI-2.0 Index: soap.py =================================================================== RCS file: /cvsroot/gug/gug/gug/host/handler/soap.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** soap.py 30 Jan 2007 19:13:07 -0000 1.14 --- soap.py 8 May 2007 13:56:24 -0000 1.15 *************** *** 1,3 **** --- 1,4 ---- from ZSI import ParsedSoap, TC, SoapWriter, Fault + from gug.zsi import MyAny from gug.client.soap import ExpatReaderClass from gug.common.exception import NoSuchMethod *************** *** 77,85 **** raise NoSuchMethod, 'no such method (%s)' % method_name # parse the arguments of the method call ! args = tuple(ps.Parse(TC.Array('args',TC.Any(nillable = True), undeclared = True))) # call the method with the arguments (XXX: no keyword arguments supported!) result = method(auth, *args) # create a SOAP message ! response = str(SoapWriter().serialize(result, TC.Any(nillable = True))) except Exception, e: # if there is any exception, first write it to the log --- 78,87 ---- raise NoSuchMethod, 'no such method (%s)' % method_name # parse the arguments of the method call ! #args = tuple(ps.Parse(TC.Array('args',MyAny(nillable = True), undeclared = True))) ! args = tuple(ps.Parse(MyAny(nillable = True))) # call the method with the arguments (XXX: no keyword arguments supported!) result = method(auth, *args) # create a SOAP message ! response = str(SoapWriter().serialize(result, MyAny(nillable = True))) except Exception, e: # if there is any exception, first write it to the log |
|
From: Nagy Z. <zs...@us...> - 2007-05-08 13:56:26
|
Update of /cvsroot/gug/gug/gug/client In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10433/gug/client Modified Files: soap.py Log Message: gug.zsi.MyAny class instead of patching ZSI for ZSI-2.0 Index: soap.py =================================================================== RCS file: /cvsroot/gug/gug/gug/client/soap.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** soap.py 7 May 2007 13:27:52 -0000 1.12 --- soap.py 8 May 2007 13:56:24 -0000 1.13 *************** *** 11,18 **** from gug.common.share import import_class_from_string from gug.common.exception import NoServiceKnown, CannotAssignPort, HTTPError, UnknownServiceError ! from ZSI import TC, FaultException from ZSI.auth import AUTH from ZSI.client import Binding - #TC.Any.parsemap[(None,'string')] = TC.String(strip = False) from xml.parsers.expat import ExpatError try: --- 11,18 ---- from gug.common.share import import_class_from_string from gug.common.exception import NoServiceKnown, CannotAssignPort, HTTPError, UnknownServiceError ! from ZSI import TC, FaultException, SoapWriter ! from gug.zsi import MyAny from ZSI.auth import AUTH from ZSI.client import Binding from xml.parsers.expat import ExpatError try: *************** *** 99,103 **** retries = retries-1 try: ! return self.proxy.RPC(None, self.method, args, TC.Any(nillable = True)) except socket.error, error: if error.args[0] == 99: --- 99,104 ---- retries = retries-1 try: ! return self.proxy.RPC(None, self.method, args, \ ! MyAny(nillable = True), requesttypecode = MyAny(pname = self.method)) except socket.error, error: if error.args[0] == 99: |
|
From: Nagy Z. <zs...@us...> - 2007-05-07 13:28:38
|
Update of /cvsroot/gug/gug/gug/cli In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3105/gug/cli Modified Files: clgr.py Log Message: HTTP BaseAuth Index: clgr.py =================================================================== RCS file: /cvsroot/gug/gug/gug/cli/clgr.py,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** clgr.py 30 Apr 2007 22:01:43 -0000 1.50 --- clgr.py 7 May 2007 13:28:37 -0000 1.51 *************** *** 30,33 **** --- 30,34 ---- clientkey = clienttls.get('KeyFile',None) clientcert = clienttls.get('CertFile',None) + self.username = config.get_content('/ClientConfig/UserName', [None])[0] if clientkey and clientcert: set_tls(clientkey,clientcert) *************** *** 190,193 **** --- 191,196 ---- continue proxy = get_working_client(urls) + if self.username: + proxy._set_auth(self.username,'') host = self._ip(meta) try: *************** *** 268,274 **** else: if show_owner: print self._make_status_owner_row('...'+grid_id.split('/')[1][:6]+'...', \ ! re.findall('CN=([^/]*)',actmetadata.get('owner','Unknown'))[0], \ ! state, jobname, jc_name) else: print self._make_status_row('...'+grid_id.split('/')[1][:6]+'...', state, jobname, jc_name) --- 271,280 ---- else: if show_owner: + owner = actmetadata.get('owner','Unknown') + cn = re.findall('CN=([^/]*)',owner) + if cn: + owner = cn[0] print self._make_status_owner_row('...'+grid_id.split('/')[1][:6]+'...', \ ! owner, state, jobname, jc_name) else: print self._make_status_row('...'+grid_id.split('/')[1][:6]+'...', state, jobname, jc_name) *************** *** 390,393 **** --- 396,402 ---- for job in jobs: sched = self._scheduler() + if self.username: + print self.username + sched._set_auth(self.username,'') print 'submit',job['name'],'...' storageid = mkuid() *************** *** 487,490 **** --- 496,501 ---- continue proxy = get_client(url) + if self.username: + proxy._set_auth(self.username,'') jsdls = self._create_dict_from_jsdls(\ proxy.GetActivityJSDLDocuments(grid_ids)) *************** *** 553,556 **** --- 564,569 ---- continue proxy = get_client(url) + if self.username: + proxy._set_auth(self.username,'') if jobnames or shortids: grid_ids = [] |
|
From: Nagy Z. <zs...@us...> - 2007-05-07 13:27:52
|
Update of /cvsroot/gug/gug/gug/client In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2617/gug/client Modified Files: soap.py Log Message: HTTP BaseAUTH Index: soap.py =================================================================== RCS file: /cvsroot/gug/gug/gug/client/soap.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** soap.py 22 Feb 2007 15:22:13 -0000 1.11 --- soap.py 7 May 2007 13:27:52 -0000 1.12 *************** *** 8,14 **** --- 8,16 ---- import time import base64, pickle + from gug.common import log from gug.common.share import import_class_from_string from gug.common.exception import NoServiceKnown, CannotAssignPort, HTTPError, UnknownServiceError from ZSI import TC, FaultException + from ZSI.auth import AUTH from ZSI.client import Binding #TC.Any.parsemap[(None,'string')] = TC.String(strip = False) *************** *** 40,43 **** --- 42,46 ---- """ self._unwrap = unwrap + self._auth = (AUTH.none,) if wsdl: raise Exception, 'not implemented' *************** *** 63,66 **** --- 66,72 ---- return self._methods.keys() + def _set_auth(self, user, pwd): + self._auth = (AUTH.httpbasic, user, pwd) + def __getattr__(self, name): if name[0] == '_': *************** *** 68,79 **** if name == 'trait_names': return self._trait_names ! return self.__Method(self._url, self._transdict, name, self._unwrap, self._methods) class __Method: ! def __init__(self, url, transd, method, unwrap, methods): self.url, self.transd, self.method, self.unwrap = \ url, transd, method, unwrap self.__name__ = self.method ! self.proxy = Binding(url = url, transdict = transd, readerclass = ExpatReaderClass) if methods: try: --- 74,87 ---- if name == 'trait_names': return self._trait_names ! return self.__Method(self._url, self._transdict, name, \ ! self._unwrap, self._auth, self._methods) class __Method: ! def __init__(self, url, transd, method, unwrap, auth, methods): self.url, self.transd, self.method, self.unwrap = \ url, transd, method, unwrap self.__name__ = self.method ! self.proxy = Binding(url = url, transdict = transd, \ ! readerclass = ExpatReaderClass, auth = auth) if methods: try: *************** *** 101,104 **** --- 109,113 ---- raise except TypeError: + log.error() # if SOAP message can be parsed, then the error messages are inside the message # else: |
|
From: Nagy Z. <zs...@us...> - 2007-05-07 13:27:27
|
Update of /cvsroot/gug/gug/gug/service/exec In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2579/gug/service/exec Modified Files: exec.py Log Message: defaults for directory_structure and job_migration Index: exec.py =================================================================== RCS file: /cvsroot/gug/gug/gug/service/exec/exec.py,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** exec.py 23 Apr 2007 00:04:26 -0000 1.53 --- exec.py 7 May 2007 13:27:26 -0000 1.54 *************** *** 282,285 **** --- 282,289 ---- 'environmnet' environment for the job """ + if not desc.has_key('directory_structure'): + desc['directory_structure'] = True + if not desc.has_key('job_migration'): + desc['job_migration'] = 0 if self._queue_full(): raise NotAcceptingNewActivities, "Exec: %s" % self.id |
|
From: Nagy Z. <zs...@us...> - 2007-05-07 13:26:55
|
Update of /cvsroot/gug/gug/gug/service/sched In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2201/gug/service/sched Modified Files: sched.py Log Message: bugfix Index: sched.py =================================================================== RCS file: /cvsroot/gug/gug/gug/service/sched/sched.py,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** sched.py 30 Apr 2007 20:24:25 -0000 1.41 --- sched.py 7 May 2007 13:26:53 -0000 1.42 *************** *** 123,126 **** --- 123,127 ---- def _check_auth(self, auth): + print auth if not self.allow_anonymous: #if auth == None: *************** *** 164,168 **** if id['owner'] == None: return False ! return owner.find(id['owner']) > -1 def _cleanup(self): --- 165,169 ---- if id['owner'] == None: return False ! return owner == id['owner'] def _cleanup(self): |
|
From: Roczei G. <ro...@us...> - 2007-04-30 22:12:58
|
Update of /cvsroot/gug/gug/gug/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4708 Modified Files: jsdl_parser.py Log Message: bugfix Index: jsdl_parser.py =================================================================== RCS file: /cvsroot/gug/gug/gug/common/jsdl_parser.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** jsdl_parser.py 30 Apr 2007 22:02:58 -0000 1.13 --- jsdl_parser.py 30 Apr 2007 22:12:55 -0000 1.14 *************** *** 107,111 **** <jsdl:Application> <jsdl:ApplicationName>%s</jsdl:ApplicationName> ! <jsdl-hpcpa:BasicHPCProfileApplication> <jsdl-hpcpa:Executable>%s</jsdl-hpcpa:Executable>""" \ % (desc['name'], desc['executable']) --- 107,111 ---- <jsdl:Application> <jsdl:ApplicationName>%s</jsdl:ApplicationName> ! <jsdl-hpcpa:BasicHPCApplication> <jsdl-hpcpa:Executable>%s</jsdl-hpcpa:Executable>""" \ % (desc['name'], desc['executable']) *************** *** 133,137 **** jsdldoc += "<jsdl-hpcpa:Environment name=\"%s\">%s</jsdl-hpcpa:Environment>" % (pair[0].strip(), pair[1].strip()) jsdldoc +="""<jsdl-hpcpa:UserName>%s</jsdl-hpcpa:UserName> ! </jsdl-hpcpa:BasicHPCProfileApplication>""" % desc.get('username', 'gug') if desc.has_key('universe') and desc['universe'].upper() not in applicationtype_list: --- 133,137 ---- jsdldoc += "<jsdl-hpcpa:Environment name=\"%s\">%s</jsdl-hpcpa:Environment>" % (pair[0].strip(), pair[1].strip()) jsdldoc +="""<jsdl-hpcpa:UserName>%s</jsdl-hpcpa:UserName> ! </jsdl-hpcpa:BasicHPCApplication>""" % desc.get('username', 'gug') if desc.has_key('universe') and desc['universe'].upper() not in applicationtype_list: |
|
From: Roczei G. <ro...@us...> - 2007-04-30 22:03:49
|
Update of /cvsroot/gug/gug/gug/service/cm In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1149 Modified Files: cm.py Log Message: directory structure correction Index: cm.py =================================================================== RCS file: /cvsroot/gug/gug/gug/service/cm/cm.py,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** cm.py 20 Apr 2007 20:33:45 -0000 1.37 --- cm.py 30 Apr 2007 22:03:38 -0000 1.38 *************** *** 544,548 **** out = {} try: ! out = create_desc_from_jsdl(jsdl_str, directory_structure) print out #out['walltimelimit'] = 1209600 # 2 weeks --- 544,548 ---- out = {} try: ! out = create_desc_from_jsdl(jsdl_str) print out #out['walltimelimit'] = 1209600 # 2 weeks |
|
From: Roczei G. <ro...@us...> - 2007-04-30 22:02:58
|
Update of /cvsroot/gug/gug/gug/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv777 Modified Files: jsdl_parser.py Log Message: directory structure correction Index: jsdl_parser.py =================================================================== RCS file: /cvsroot/gug/gug/gug/common/jsdl_parser.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** jsdl_parser.py 30 Apr 2007 20:22:16 -0000 1.12 --- jsdl_parser.py 30 Apr 2007 22:02:58 -0000 1.13 *************** *** 36,40 **** print "%s" % SupportedFeatures[item] ! applicationtype_list = ['Compiler', 'BatchCompiler', 'Batch', 'Binary', 'PVM', 'MPI'] applicationtype_list = [ str(a).upper() for a in applicationtype_list] --- 36,40 ---- print "%s" % SupportedFeatures[item] ! applicationtype_list = ['Compiler', 'BatchCompiler', 'Batch', 'Binary', 'PVM', 'MPI', 'seq'] applicationtype_list = [ str(a).upper() for a in applicationtype_list] *************** *** 69,73 **** raise UnsupportedFeatureFault, "Connection error: %s" % host ! def create_jsdl_from_desc(desc, staging_data = None, directory_structure = True): """ --- 69,73 ---- raise UnsupportedFeatureFault, "Connection error: %s" % host ! def create_jsdl_from_desc(desc, staging_data = None): """ *************** *** 104,113 **** """ % (desc['name'], desc.get('description','No description.'), desc.get('jobproject','gug')) - if directory_structure: - desc['executable'] = 'bin/' + desc['executable'] - desc['input'] = 'input/' + desc.get('input', 'stdin.txt') - desc['output'] = 'output/' + desc.get('output', 'stdout.txt') - desc['error'] = 'output/' + desc.get('error', 'stderr.txt') - jsdldoc += """ <jsdl:Application> --- 104,107 ---- *************** *** 249,253 **** ! def create_desc_from_jsdl(jsdl_str, directory_structure = True): """ Standards: --- 243,247 ---- ! def create_desc_from_jsdl(jsdl_str): """ Standards: |
|
From: Roczei G. <ro...@us...> - 2007-04-30 22:02:29
|
Update of /cvsroot/gug/gug/gug/cli In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv751 Modified Files: cm.py Log Message: directory structure correction Index: cm.py =================================================================== RCS file: /cvsroot/gug/gug/gug/cli/cm.py,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** cm.py 22 Apr 2007 20:54:10 -0000 1.21 --- cm.py 30 Apr 2007 22:02:27 -0000 1.22 *************** *** 317,321 **** if verbose: print 'desc: ', desc ! jsdl = create_jsdl_from_desc(desc, None, False) if verbose: print 'jsdl: ', jsdl --- 317,321 ---- if verbose: print 'desc: ', desc ! jsdl = create_jsdl_from_desc(desc, None) if verbose: print 'jsdl: ', jsdl |
|
From: Roczei G. <ro...@us...> - 2007-04-30 22:01:45
|
Update of /cvsroot/gug/gug/gug/cli In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv369 Modified Files: clgr.py Log Message: directory structure correction Index: clgr.py =================================================================== RCS file: /cvsroot/gug/gug/gug/cli/clgr.py,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** clgr.py 30 Apr 2007 20:20:42 -0000 1.49 --- clgr.py 30 Apr 2007 22:01:43 -0000 1.50 *************** *** 426,429 **** --- 426,434 ---- {'FileName' : 'jobdir/output', 'Target' : 'file://' + storagedir}] job['initialdir'] = os.path.join('jobdir', job.get('initialdir','')) + job['executable'] = 'bin/' + job['executable'] + job['input'] = 'input/' + job.get('input', '') + job['output'] = 'output/' + job.get('output', '') + job['error'] = 'output/' + job.get('error', '') + jsdldoc = create_jsdl_from_desc(job, staging_data) if verbose: |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:34:45
|
Update of /cvsroot/gug/gug/gug/xsd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30145 Modified Files: jsdl-hpcpa.xsd Log Message: bugfix Index: jsdl-hpcpa.xsd =================================================================== RCS file: /cvsroot/gug/gug/gug/xsd/jsdl-hpcpa.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jsdl-hpcpa.xsd 13 Mar 2007 13:07:58 -0000 1.2 --- jsdl-hpcpa.xsd 30 Apr 2007 20:34:42 -0000 1.3 *************** *** 78,82 **** </xsd:complexType> <!--========================================================================--> ! <xsd:complexType name="BasicHPCProfileApplication_Type"> <xsd:sequence> <xsd:element ref="jsdl-hpcpa:Executable" minOccurs="0"/> --- 78,82 ---- </xsd:complexType> <!--========================================================================--> ! <xsd:complexType name="BasicHPCApplication_Type"> <xsd:sequence> <xsd:element ref="jsdl-hpcpa:Executable" minOccurs="0"/> *************** *** 93,97 **** </xsd:complexType> <!--========================================================================--> ! <xsd:element name="BasicHPCProfileApplication" type="jsdl-hpcpa:BasicHPCProfileApplication_Type"/> <xsd:element name="Executable" type="jsdl-hpcpa:FileName_Type"/> <xsd:element name="Argument" type="jsdl-hpcpa:Argument_Type"/> --- 93,97 ---- </xsd:complexType> <!--========================================================================--> ! <xsd:element name="BasicHPCApplication" type="jsdl-hpcpa:BasicHPCApplication_Type"/> <xsd:element name="Executable" type="jsdl-hpcpa:FileName_Type"/> <xsd:element name="Argument" type="jsdl-hpcpa:Argument_Type"/> |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:33:55
|
Update of /cvsroot/gug/gug/gug/xsd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29771 Modified Files: jsdl10-hpc.xsd Log Message: bugfix Index: jsdl10-hpc.xsd =================================================================== RCS file: /cvsroot/gug/gug/gug/xsd/jsdl10-hpc.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jsdl10-hpc.xsd 30 Apr 2007 20:24:55 -0000 1.2 --- jsdl10-hpc.xsd 30 Apr 2007 20:33:55 -0000 1.3 *************** *** 199,203 **** <xsd:element ref="jsdl:ApplicationVersion" minOccurs="0"/> <xsd:element ref="jsdl:Description" minOccurs="0"/> ! <xsd:element ref="jsdl-hpcpa:BasicHPCProfileApplication" minOccurs="0"/> <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> --- 199,203 ---- <xsd:element ref="jsdl:ApplicationVersion" minOccurs="0"/> <xsd:element ref="jsdl:Description" minOccurs="0"/> ! <xsd:element ref="jsdl-hpcpa:BasicHPCApplication" minOccurs="0"/> <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:25:23
|
Update of /cvsroot/gug/gug/gug/xsd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26617/gug/xsd Modified Files: jsdl10-posix.xsd Log Message: jsdl namespace bugfix Index: jsdl10-posix.xsd =================================================================== RCS file: /cvsroot/gug/gug/gug/xsd/jsdl10-posix.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jsdl10-posix.xsd 13 Mar 2007 13:10:28 -0000 1.1 --- jsdl10-posix.xsd 30 Apr 2007 20:25:20 -0000 1.2 *************** *** 13,17 **** --> ! <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.ogf.org/jsdl/2005/11/jsdl" xmlns:jsdl="http://schemas.ogf.org/jsdl/2005/11/jsdl" targetNamespace="http://schemas.ogf.org/jsdl/2005/11/jsdl" elementFormDefault="qualified" xmlns:jsdl-posix="http://schemas.ggf.org/jsdl/2005/11/jsdl-posix"> <xsd:include namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl-posix" schemaLocation="jsdl-posix.xsd"/> --- 13,17 ---- --> ! <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" targetNamespace="http://schemas.ggf.org/jsdl/2005/11/jsdl" elementFormDefault="qualified" xmlns:jsdl-posix="http://schemas.ggf.org/jsdl/2005/11/jsdl-posix"> <xsd:include namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl-posix" schemaLocation="jsdl-posix.xsd"/> |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:24:56
|
Update of /cvsroot/gug/gug/gug/xsd In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26236/gug/xsd Modified Files: jsdl10-hpc.xsd Log Message: jsdl namespace bugfix Index: jsdl10-hpc.xsd =================================================================== RCS file: /cvsroot/gug/gug/gug/xsd/jsdl10-hpc.xsd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jsdl10-hpc.xsd 13 Mar 2007 13:10:28 -0000 1.1 --- jsdl10-hpc.xsd 30 Apr 2007 20:24:55 -0000 1.2 *************** *** 13,17 **** --> ! <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.ogf.org/jsdl/2005/11/jsdl" xmlns:jsdl="http://schemas.ogf.org/jsdl/2005/11/jsdl" targetNamespace="http://schemas.ogf.org/jsdl/2005/11/jsdl" elementFormDefault="qualified" xmlns:jsdl-hpcpa="http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa"> <xsd:include namespace="http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa" schemaLocation="jsdl-hpcpa.xsd"/> --- 13,17 ---- --> ! <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" targetNamespace="http://schemas.ggf.org/jsdl/2005/11/jsdl" elementFormDefault="qualified" xmlns:jsdl-hpcpa="http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa"> <xsd:include namespace="http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa" schemaLocation="jsdl-hpcpa.xsd"/> |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:24:28
|
Update of /cvsroot/gug/gug/gug/service/sched In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26220/gug/service/sched Modified Files: sched.py Log Message: jsdl namespace bugfix Index: sched.py =================================================================== RCS file: /cvsroot/gug/gug/gug/service/sched/sched.py,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** sched.py 3 Apr 2007 16:51:13 -0000 1.40 --- sched.py 30 Apr 2007 20:24:25 -0000 1.41 *************** *** 178,182 **** xml = SimpleXML(memory = jsdl_doc) ! nss = {'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl"} jobname = xml.get_content('//jsdl:JobName', nss = nss)[0] id = { --- 178,182 ---- xml = SimpleXML(memory = jsdl_doc) ! nss = {'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl"} jobname = xml.get_content('//jsdl:JobName', nss = nss)[0] id = { |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:24:05
|
Update of /cvsroot/gug/gug/gug/service/jc/lrms In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25851/gug/service/jc/lrms Modified Files: cm.py Log Message: jsdl namespace bugfix Index: cm.py =================================================================== RCS file: /cvsroot/gug/gug/gug/service/jc/lrms/cm.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** cm.py 2 Apr 2007 13:12:28 -0000 1.16 --- cm.py 30 Apr 2007 20:24:01 -0000 1.17 *************** *** 53,57 **** raise ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-gug' : "http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug",\ --- 53,57 ---- raise ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-gug' : "http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug",\ |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:23:49
|
Update of /cvsroot/gug/gug/gug/service/jc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25833/gug/service/jc Modified Files: jc.py Log Message: jsdl namespace bugfix Index: jc.py =================================================================== RCS file: /cvsroot/gug/gug/gug/service/jc/jc.py,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** jc.py 15 Mar 2007 09:40:52 -0000 1.62 --- jc.py 30 Apr 2007 20:23:36 -0000 1.63 *************** *** 571,575 **** xml = SimpleXML(memory = jsdl_doc) ! nss = {'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl"} jobname = xml.get_content('//jsdl:JobName', nss = nss)[0] id = { 'grid_id' : grid_id, --- 571,575 ---- xml = SimpleXML(memory = jsdl_doc) ! nss = {'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl"} jobname = xml.get_content('//jsdl:JobName', nss = nss)[0] id = { 'grid_id' : grid_id, *************** *** 597,601 **** return {} #path= '/jsdl:JobDefinition/jsdl:JobDescription/jsdl:DataStaging' ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-hpcpa' : 'http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa',\ --- 597,601 ---- return {} #path= '/jsdl:JobDefinition/jsdl:JobDescription/jsdl:DataStaging' ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-hpcpa' : 'http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa',\ |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:23:35
|
Update of /cvsroot/gug/gug/gug/gui/usergui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25455/gug/gui/usergui Modified Files: usergui.py Log Message: jsdl namespace bugfix Index: usergui.py =================================================================== RCS file: /cvsroot/gug/gug/gug/gui/usergui/usergui.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** usergui.py 14 Mar 2007 13:54:08 -0000 1.8 --- usergui.py 30 Apr 2007 20:22:57 -0000 1.9 *************** *** 292,297 **** def createjsdl(self): jsdlhead = """<?xml version="1.0" encoding="UTF-8"?> ! <jsdl:JobDefinition xmlns="http://schemas.ogf.org/jsdl/2005/11/jsdl" ! xmlns:jsdl="http://schemas.ogf.org/jsdl/2005/11/jsdl" xmlns:jsdl-posix="http://schemas.ggf.org/jsdl/2005/06/jsdl-posix" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" --- 292,297 ---- def createjsdl(self): jsdlhead = """<?xml version="1.0" encoding="UTF-8"?> ! <jsdl:JobDefinition xmlns="http://schemas.ggf.org/jsdl/2005/11/jsdl" ! xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:jsdl-posix="http://schemas.ggf.org/jsdl/2005/06/jsdl-posix" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:23:26
|
Update of /cvsroot/gug/gug/gug/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25414/gug/common Modified Files: jsdl_parser.py Log Message: jsdl namespace bugfix Index: jsdl_parser.py =================================================================== RCS file: /cvsroot/gug/gug/gug/common/jsdl_parser.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** jsdl_parser.py 22 Apr 2007 20:54:49 -0000 1.11 --- jsdl_parser.py 30 Apr 2007 20:22:16 -0000 1.12 *************** *** 74,79 **** Standards: ! HPC 1.0 Basic Profile, namespace: http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa ! JSDL 1.0, namespace: http://schemas.ogf.org/jsdl/2005/11/jsdl GUG Profile, namespace: http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug --- 74,79 ---- Standards: ! HPC Basic Profile 1.0, namespace: http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa ! JSDL 1.0, namespace: http://schemas.ggf.org/jsdl/2005/11/jsdl GUG Profile, namespace: http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug *************** *** 89,97 **** try: jsdldoc = """<?xml version="1.0" encoding="UTF-8"?> ! <jsdl:JobDefinition xmlns="http://schemas.ogf.org/jsdl/2005/11/jsdl" ! xmlns:jsdl="http://schemas.ogf.org/jsdl/2005/11/jsdl" xmlns:jsdl-gug="http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug" xmlns:jsdl-hpcpa="http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa" ! targetNamespace="http://schemas.ogf.org/jsdl/2005/11/jsdl"> <jsdl:JobDescription>""" --- 89,97 ---- try: jsdldoc = """<?xml version="1.0" encoding="UTF-8"?> ! <jsdl:JobDefinition xmlns="http://schemas.ggf.org/jsdl/2005/11/jsdl" ! xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:jsdl-gug="http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug" xmlns:jsdl-hpcpa="http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa" ! targetNamespace="http://schemas.ggf.org/jsdl/2005/11/jsdl"> <jsdl:JobDescription>""" *************** *** 253,258 **** Standards: ! HPC 1.0 Basic Profile, namespace: http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa ! JSDL 1.0, namespace: http://schemas.ogf.org/jsdl/2005/11/jsdl POSIX Profile, namespace: http://schemas.ggf.org/jsdl/2005/11/jsdl-posix GUG Profile, namespace: http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug --- 253,258 ---- Standards: ! HPC Basic Profile 1.0, namespace: http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa ! JSDL 1.0, namespace: http://schemas.ggf.org/jsdl/2005/11/jsdl POSIX Profile, namespace: http://schemas.ggf.org/jsdl/2005/11/jsdl-posix GUG Profile, namespace: http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug *************** *** 263,267 **** jsdl = SimpleXML(memory= str(jsdl_str)) ! nss = { 'jsdl' : 'http://schemas.ogf.org/jsdl/2005/11/jsdl', \ 'jsdl-posix' : 'http://schemas.ggf.org/jsdl/2005/11/jsdl-posix', \ 'jsdl-gug' : 'http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug', \ --- 263,267 ---- jsdl = SimpleXML(memory= str(jsdl_str)) ! nss = { 'jsdl' : 'http://schemas.ggf.org/jsdl/2005/11/jsdl', \ 'jsdl-posix' : 'http://schemas.ggf.org/jsdl/2005/11/jsdl-posix', \ 'jsdl-gug' : 'http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug', \ |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:21:52
|
Update of /cvsroot/gug/gug/gug/common In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25063/gug/common Modified Files: jsdl.py Log Message: jsdl namespace bugfix Index: jsdl.py =================================================================== RCS file: /cvsroot/gug/gug/gug/common/jsdl.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** jsdl.py 14 Mar 2007 14:58:48 -0000 1.9 --- jsdl.py 30 Apr 2007 20:21:51 -0000 1.10 *************** *** 14,18 **** return False, '' ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa", \ --- 14,18 ---- return False, '' ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa", \ *************** *** 37,41 **** return False, '' ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix",\ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa"} --- 37,41 ---- return False, '' ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix",\ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa"} *************** *** 71,75 **** return False, '' ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix",\ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa",\ --- 71,75 ---- return False, '' ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix",\ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa",\ *************** *** 106,110 **** return False, '' ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-gug' : "http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug" } --- 106,110 ---- return False, '' ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-gug' : "http://gug.grid.niif.hu/jsdl/2005/11/jsdl-gug" } *************** *** 132,136 **** return False, '' ! nss = { 'jsdl' : "http://schemas.ogf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa", \ --- 132,136 ---- return False, '' ! nss = { 'jsdl' : "http://schemas.ggf.org/jsdl/2005/11/jsdl", \ 'jsdl-posix' : "http://schemas.ggf.org/jsdl/2005/06/jsdl-posix", \ 'jsdl-hpcpa' : "http://schemas.ogf.org/jsdl/2006/07/jsdl-hpcpa", \ |
|
From: Roczei G. <ro...@us...> - 2007-04-30 20:21:18
|
Update of /cvsroot/gug/gug/gug/cli In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25008/gug/cli Modified Files: job.py Log Message: jsdl namespace bugfix Index: job.py =================================================================== RCS file: /cvsroot/gug/gug/gug/cli/job.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** job.py 14 Mar 2007 14:01:26 -0000 1.13 --- job.py 30 Apr 2007 20:21:18 -0000 1.14 *************** *** 208,213 **** jsdl = """<?xml version="1.0" encoding="UTF-8"?> ! <jsdl:JobDefinition xmlns="http://schemas.ogf.org/jsdl/2005/11/jsdl" ! xmlns:jsdl="http://schemas.ogf.org/jsdl/2005/11/jsdl" xmlns:jsdl-posix="http://schemas.ggf.org/jsdl/2005/06/jsdl-posix" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" --- 208,213 ---- jsdl = """<?xml version="1.0" encoding="UTF-8"?> ! <jsdl:JobDefinition xmlns="http://schemas.ggf.org/jsdl/2005/11/jsdl" ! xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl" xmlns:jsdl-posix="http://schemas.ggf.org/jsdl/2005/06/jsdl-posix" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
