Changeset 81
- Timestamp:
- 05/16/04 16:36:44 (5 years ago)
- Files:
-
- trunk (modified) (1 prop)
- trunk/.cvsignore (modified) (1 diff)
- trunk/Makefile (added)
- trunk/catalog.xml (added)
- trunk/jjigw (modified) (1 prop)
- trunk/jjigw.py (modified) (1 diff)
- trunk/jjigw.xml.example (modified) (1 diff)
- trunk/jjigw/.cvsignore (modified) (1 diff, 2 props)
- trunk/jjigw/config.py (modified) (2 diffs)
- trunk/spidentd.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk
- Property svn:ignore changed from
*.pyc
pyxmpp
jjigw.xml to
*.pyc
pyxmpp
jjigw.xml
*.inst
- Property svn:ignore changed from
trunk/.cvsignore
r8 r81 2 2 pyxmpp 3 3 jjigw.xml 4 *.inst trunk/jjigw
- Property svn:ignore changed from *.pyc to
*.pyc
version.py
- Property svn:ignore changed from *.pyc to
trunk/jjigw.py
r71 r81 22 22 from jjigw.config import Config 23 23 from jjigw.component import Component 24 import sys 25 import os.path 26 27 config_dir,data_dir=".","." 24 28 25 29 try: 26 config=Config("jjigw.xml") 30 try: 31 config=Config(config_dir,data_dir) 32 except: 33 print >>sys.stderr,"Couldn't load config file:",str(sys.exc_value) 34 sys.exit(1) 27 35 28 36 print "creating component..." trunk/jjigw.xml.example
r76 r81 1 1 <?xml version='1.0' encoding='utf-8'?> 2 <!DOCTYPE jjigw SYSTEM " jjigw.dtd">2 <!DOCTYPE jjigw SYSTEM "http://jjigw.jabberstudio.org/dtd/jjigw.dtd"> 3 3 <jjigw> 4 4 trunk/jjigw/.cvsignore
- Property svn:eol-style deleted
- Property svn:keywords deleted
r66 r81 1 1 *.pyc 2 version.py trunk/jjigw/config.py
r73 r81 22 22 from pyxmpp import JID 23 23 from common import JJIGWFatalError,nick8_re,nick_re,normalize 24 import os 24 25 25 26 class ConnectConfig: … … 88 89 89 90 class Config: 90 def __init__(self, filename):91 def __init__(self,config_dir,data_dir): 91 92 self.doc=None 92 parser=libxml2.createFileParserCtxt(filename) 93 self.config_dir=config_dir 94 self.data_dir=data_dir 95 os.chdir(data_dir) 96 libxml2.initializeCatalog() 97 libxml2.loadCatalog(os.path.join(data_dir,"catalog.xml")) 98 parser=libxml2.createFileParserCtxt(os.path.join(config_dir,"jjigw.xml")) 93 99 parser.validate(1) 94 100 parser.parseDocument() trunk/spidentd.py
r71 r81 4 4 5 5 import sys 6 sys.path=sys.path[1:] 7 6 8 import signal 7 9 import socket
