Author: dmeyer
Date: Sun Feb 11 10:23:02 2007
New Revision: 9207
Modified:
trunk/ui/setup.py
trunk/ui/src/config.py
Log:
import xmlconfig from correct module
Modified: trunk/ui/setup.py
==============================================================================
--- trunk/ui/setup.py (original)
+++ trunk/ui/setup.py Sun Feb 11 10:23:02 2007
@@ -48,7 +48,7 @@
# import freevo distribution utils
from freevo.distribution import setup, VERSION
-import freevo.conf
+from freevo.xmlconfig import xmlconfig
data_files = []
# add some files to Docs
@@ -69,7 +69,7 @@
max(*[os.stat(x)[stat.ST_MTIME] for x in cxml_files ]):
if not os.path.isdir('build'):
os.mkdir('build')
- freevo.conf.xmlconfig('build/config.cxml', cxml_files)
+ xmlconfig('build/config.cxml', cxml_files)
data_files.append(('share/freevo/config', [ 'build/config.cxml' ]))
Modified: trunk/ui/src/config.py
==============================================================================
--- trunk/ui/src/config.py (original)
+++ trunk/ui/src/config.py Sun Feb 11 10:23:02 2007
@@ -37,6 +37,7 @@
import kaa.popcorn
import freevo.conf
+from freevo.xmlconfig import xmlconfig
# freevo imports
from freevo.ui import plugin
@@ -48,7 +49,7 @@
pycfgfile = freevo.conf.datafile('freevo_config.py')
cfgdir = os.path.join(freevo.conf.SHAREDIR, 'config')
cfgsource = [ os.path.join(cfgdir, f) for f in os.listdir(cfgdir) ]
-freevo.conf.xmlconfig(pycfgfile, cfgsource)
+xmlconfig(pycfgfile, cfgsource)
execfile(pycfgfile)
# add external stuff
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
