ajack 2004/03/15 08:09:43 Modified: python/gump/model server.py tracker.py Log: Should never have been binary Revision Changes Path 1.11 +127 -127 gump/python/gump/model/server.py Index: server.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/server.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- server.py 4 Mar 2004 17:26:08 -0000 1.10 +++ server.py 15 Mar 2004 16:09:43 -0000 1.11 @@ -1,128 +1,128 @@ -#!/usr/bin/env python
- -# $Header$ -# $Revision$ -# $Date$ -# -# ==================================================================== -# -# The Apache Software License, Version 1.1 -# -# Copyright (c) 2003 The Apache Software Foundation. All rights -# reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# 3. The end-user documentation included with the redistribution, if -# any, must include the following acknowlegement: -# "This product includes software developed by the -# Apache Software Foundation (http://www.apache.org/)." -# Alternately, this acknowlegement may appear in the software itself, -# if and wherever such third-party acknowlegements normally appear. -# -# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software -# Foundation" must not be used to endorse or promote products derived -# from this software without prior written permission. For written -# permission, please contact [EMAIL PROTECTED] -# -# 5. Products derived from this software may not be called "Apache" -# nor may "Apache" appear in their names without prior written -# permission of the Apache Group. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ==================================================================== -# -# This software consists of voluntary contributions made by many -# individuals on behalf of the Apache Software Foundation. For more -# information on the Apache Software Foundation, please see -# <http://www.apache.org/>. - -""" - This module contains information on -""" - -from gump.model.state import * -from gump.model.stats import * - - -from gump.model.object import NamedModelObject - -from gump.utils import getIndent - -class Server(NamedModelObject): - """A named server""" - def __init__(self,xml,workspace): - NamedModelObject.__init__(self,xml.getName(),xml,workspace) - - self.resolver=None - - def complete(self,workspace): - - if self.hasType() and self.getType() == 'python': - if self.hasUrl(): - from gump.document.resolver import Resolver - self.resolver=Resolver('bogus', self.getUrl()) - - def check(self,workspace): - pass - - def isPython(self): - return self.hasType() and 'python' == self.getType() - - def hasType(self): - return hasattr(self.xml,'type') and self.xml.type - - def getType(self): - return str(self.xml.type) - - def hasSite(self): - return hasattr(self.xml,'site') and self.xml.site - - def getSite(self): - return str(self.xml.site) - - def hasUrl(self): - return hasattr(self.xml,'url') and self.xml.url - - def getUrl(self): - return str(self.xml.url) - - def hasTitle(self): - return hasattr(self.xml,'title') and self.xml.title - - def getTitle(self): - return str(self.xml.title) - - def hasResolver(self): - if self.resolver: return 1 - return 0 - - def getResolver(self): - return self.resolver - - def dump(self, indent=0, output=sys.stdout): - output.write(getIndent(indent)+'Server : ' + self.name + '\n') - NamedModelObject.dump(self,indent+1,output) - +#!/usr/bin/env python + +# $Header$ +# $Revision$ +# $Date$ +# +# ==================================================================== +# +# The Apache Software License, Version 1.1 +# +# Copyright (c) 2003 The Apache Software Foundation. All rights +# reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# 3. The end-user documentation included with the redistribution, if +# any, must include the following acknowlegement: +# "This product includes software developed by the +# Apache Software Foundation (http://www.apache.org/)." +# Alternately, this acknowlegement may appear in the software itself, +# if and wherever such third-party acknowlegements normally appear. +# +# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software +# Foundation" must not be used to endorse or promote products derived +# from this software without prior written permission. For written +# permission, please contact [EMAIL PROTECTED] +# +# 5. Products derived from this software may not be called "Apache" +# nor may "Apache" appear in their names without prior written +# permission of the Apache Group. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR +# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ==================================================================== +# +# This software consists of voluntary contributions made by many +# individuals on behalf of the Apache Software Foundation. For more +# information on the Apache Software Foundation, please see +# <http://www.apache.org/>. + +""" + This module contains information on +""" + +from gump.model.state import * +from gump.model.stats import * + + +from gump.model.object import NamedModelObject + +from gump.utils import getIndent + +class Server(NamedModelObject): + """A named server""" + def __init__(self,xml,workspace): + NamedModelObject.__init__(self,xml.getName(),xml,workspace) + + self.resolver=None + + def complete(self,workspace): + + if self.hasType() and self.getType() == 'python': + if self.hasUrl(): + from gump.document.resolver import Resolver + self.resolver=Resolver('bogus', self.getUrl()) + + def check(self,workspace): + pass + + def isPython(self): + return self.hasType() and 'python' == self.getType() + + def hasType(self): + return hasattr(self.xml,'type') and self.xml.type + + def getType(self): + return str(self.xml.type) + + def hasSite(self): + return hasattr(self.xml,'site') and self.xml.site + + def getSite(self): + return str(self.xml.site) + + def hasUrl(self): + return hasattr(self.xml,'url') and self.xml.url + + def getUrl(self): + return str(self.xml.url) + + def hasTitle(self): + return hasattr(self.xml,'title') and self.xml.title + + def getTitle(self): + return str(self.xml.title) + + def hasResolver(self): + if self.resolver: return 1 + return 0 + + def getResolver(self): + return self.resolver + + def dump(self, indent=0, output=sys.stdout): + output.write(getIndent(indent)+'Server : ' + self.name + '\n') + NamedModelObject.dump(self,indent+1,output) + 1.2 +120 -120 gump/python/gump/model/tracker.py Index: tracker.py =================================================================== RCS file: /home/cvs/gump/python/gump/model/tracker.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tracker.py 15 Feb 2004 17:32:05 -0000 1.1 +++ tracker.py 15 Mar 2004 16:09:43 -0000 1.2 @@ -1,121 +1,121 @@ -#!/usr/bin/env python - -# $Header$ -# $Revision$ -# $Date$ -# -# ==================================================================== -# -# The Apache Software License, Version 1.1 -# -# Copyright (c) 2003 The Apache Software Foundation. All rights -# reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# 3. The end-user documentation included with the redistribution, if -# any, must include the following acknowlegement: -# "This product includes software developed by the -# Apache Software Foundation (http://www.apache.org/)." -# Alternately, this acknowlegement may appear in the software itself, -# if and wherever such third-party acknowlegements normally appear. -# -# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software -# Foundation" must not be used to endorse or promote products derived -# from this software without prior written permission. For written -# permission, please contact [EMAIL PROTECTED] -# -# 5. Products derived from this software may not be called "Apache" -# nor may "Apache" appear in their names without prior written -# permission of the Apache Group. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR -# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# ==================================================================== -# -# This software consists of voluntary contributions made by many -# individuals on behalf of the Apache Software Foundation. For more -# information on the Apache Software Foundation, please see -# <http://www.apache.org/>. - -""" - This module contains information on -""" - -from gump.model.state import * -from gump.model.stats import * - - -from gump.model.object import NamedModelObject - -from gump.utils import getIndent - -class Tracker(NamedModelObject): - """A named Tracker""" - def __init__(self,xml,workspace): - NamedModelObject.__init__(self,xml.getName(),xml,workspace) - - self.resolver=None - - def complete(self,workspace): - pass - - def check(self,workspace): - pass - - def hasType(self): - return hasattr(self.xml,'type') and self.xml.type - - def getType(self): - return str(self.xml.type) - - def hasSite(self): - return hasattr(self.xml,'site') and self.xml.site - - def getSite(self): - return str(self.xml.site) - - def hasUrl(self): - return hasattr(self.xml,'url') and self.xml.url - - def getUrl(self): - return str(self.xml.url) - - def hasTitle(self): - return hasattr(self.xml,'title') and self.xml.title - - def getTitle(self): - return str(self.xml.title) - - def hasResolver(self): - if self.resolver: return 1 - return 0 - - def getResolver(self): - return self.resolver - - def dump(self, indent=0, output=sys.stdout): - output.write(getIndent(indent)+'Tracker : ' + self.name + '\n') - NamedModelObject.dump(self,indent+1,output) - +#!/usr/bin/env python + +# $Header$ +# $Revision$ +# $Date$ +# +# ==================================================================== +# +# The Apache Software License, Version 1.1 +# +# Copyright (c) 2003 The Apache Software Foundation. All rights +# reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# +# 3. The end-user documentation included with the redistribution, if +# any, must include the following acknowlegement: +# "This product includes software developed by the +# Apache Software Foundation (http://www.apache.org/)." +# Alternately, this acknowlegement may appear in the software itself, +# if and wherever such third-party acknowlegements normally appear. +# +# 4. The names "The Jakarta Project", "Alexandria", and "Apache Software +# Foundation" must not be used to endorse or promote products derived +# from this software without prior written permission. For written +# permission, please contact [EMAIL PROTECTED] +# +# 5. Products derived from this software may not be called "Apache" +# nor may "Apache" appear in their names without prior written +# permission of the Apache Group. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR +# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ==================================================================== +# +# This software consists of voluntary contributions made by many +# individuals on behalf of the Apache Software Foundation. For more +# information on the Apache Software Foundation, please see +# <http://www.apache.org/>. + +""" + This module contains information on +""" + +from gump.model.state import * +from gump.model.stats import * + + +from gump.model.object import NamedModelObject + +from gump.utils import getIndent + +class Tracker(NamedModelObject): + """A named Tracker""" + def __init__(self,xml,workspace): + NamedModelObject.__init__(self,xml.getName(),xml,workspace) + + self.resolver=None + + def complete(self,workspace): + pass + + def check(self,workspace): + pass + + def hasType(self): + return hasattr(self.xml,'type') and self.xml.type + + def getType(self): + return str(self.xml.type) + + def hasSite(self): + return hasattr(self.xml,'site') and self.xml.site + + def getSite(self): + return str(self.xml.site) + + def hasUrl(self): + return hasattr(self.xml,'url') and self.xml.url + + def getUrl(self): + return str(self.xml.url) + + def hasTitle(self): + return hasattr(self.xml,'title') and self.xml.title + + def getTitle(self): + return str(self.xml.title) + + def hasResolver(self): + if self.resolver: return 1 + return 0 + + def getResolver(self): + return self.resolver + + def dump(self, indent=0, output=sys.stdout): + output.write(getIndent(indent)+'Tracker : ' + self.name + '\n') + NamedModelObject.dump(self,indent+1,output) + --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
