[Oval-commits] r206 - in trunk/oval-server: . oval/dsa2oval oval/dsa2oval/definition oval/dsaSync oval/server

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-08-23 16:28:40 +0000 (Thu, 23 Aug 2007)
New Revision: 206

Modified:
   trunk/oval-server/oval-server.py
   trunk/oval-server/oval/dsa2oval/convertor.py
   trunk/oval-server/oval/dsa2oval/definition/generator.py
   trunk/oval-server/oval/dsaSync/sync.py
   trunk/oval-server/oval/server/OvalHttpServer.py
Log:
Fix module imports

Modified: trunk/oval-server/oval/dsa2oval/convertor.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/convertor.py	2007-08-23 16:27:27 UTC (rev 205)
+++ trunk/oval-server/oval/dsa2oval/convertor.py	2007-08-23 16:28:40 UTC (rev 206)
@@ -2,8 +2,8 @@
 import sys
 import xml.dom.ext
 from definition import generator
-from parser import  wml
-from parser import  dsa
+from parser import wml
+from parser import dsa
 
 class dsa2ovalNotInitialized(Exception):
 	pass

Modified: trunk/oval-server/oval/dsa2oval/definition/generator.py
===================================================================
--- trunk/oval-server/oval/dsa2oval/definition/generator.py	2007-08-23 16:27:27 UTC (rev 205)
+++ trunk/oval-server/oval/dsa2oval/definition/generator.py	2007-08-23 16:28:40 UTC (rev 206)
@@ -12,7 +12,7 @@
 import datetime
 import xml.dom.ext
 import xml.dom.minidom
-from dsa2oval.definition.differ import differ
+from oval.dsa2oval.definition.differ import differ
 					
 class OvalGeneratorException (Exception):
     pass

Modified: trunk/oval-server/oval/dsaSync/sync.py
===================================================================
--- trunk/oval-server/oval/dsaSync/sync.py	2007-08-23 16:27:27 UTC (rev 205)
+++ trunk/oval-server/oval/dsaSync/sync.py	2007-08-23 16:28:40 UTC (rev 206)
@@ -3,7 +3,7 @@
 from stat import *
 import re
 import os
-from dba.dba import dba
+from oval.dba.dba import dba
  
 class DsaSync:
 	

Modified: trunk/oval-server/oval/server/OvalHttpServer.py
===================================================================
--- trunk/oval-server/oval/server/OvalHttpServer.py	2007-08-23 16:27:27 UTC (rev 205)
+++ trunk/oval-server/oval/server/OvalHttpServer.py	2007-08-23 16:28:40 UTC (rev 206)
@@ -1,14 +1,14 @@
 import SimpleHTTPServer, BaseHTTPServer
 from OpenSSL import SSL
-from dba import dba
+from oval.dba.dba import dba
 import os, sys, socket
 import logging
-from dsa2oval import convertor
+from oval.dsa2oval import convertor
 
 class HttpRequestHandler (SimpleHTTPServer.SimpleHTTPRequestHandler):
 	
 	def do_POST(self):
-		db = dba.dba ()
+		db = dba ()
 		conv = convertor.Dsa2Oval(self.server.workdir)
 		
 		self.server.logger.info ('httpServer: Process POST %s' % self.path)
@@ -32,7 +32,7 @@
 		
 	def do_GET (self):
 		self.server.logger.info ('httpServer: Process GET %s' % self.path)
-		db = dba.dba ()
+		db = dba ()
 		conv = convertor.Dsa2Oval(self.server.workdir)
 		agentIP = self.client_address[0]
 		if db.getAgentInfo(agentIP):

Modified: trunk/oval-server/oval-server.py
===================================================================
--- trunk/oval-server/oval-server.py	2007-08-23 16:27:27 UTC (rev 205)
+++ trunk/oval-server/oval-server.py	2007-08-23 16:28:40 UTC (rev 206)
@@ -1,7 +1,13 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#                                                                                                                                              
+# Written by Pavel Vinogradov
+# Licensed under the GNU General Public License version 2.
+
 from ConfigParser import SafeConfigParser
 from threading import Thread
-from dsa2oval import convertor
-from dba.dba import dba
+from oval.dsa2oval import convertor
+from oval.dba.dba import dba
 import os, logging, sys, time, getopt
 import traceback, exceptions
 
@@ -36,7 +42,7 @@
 		self.logger = logger
 		
 		if self.type == 'http':
-			from OvalServer.OvalHttpServer import OvalHttpServer, HttpRequestHandler
+			from oval.server.OvalHttpServer import OvalHttpServer, HttpRequestHandler
 			self.server = OvalHttpServer ((self.ip, self.port), HttpRequestHandler, self.workdir, self.logger)
 			self.logger.info('httpThread: Run local server on %s:%d in %s' % (self.ip,  self.port, self.workdir))
 		else:
@@ -65,15 +71,15 @@
 		self.logger = logger
 
 		if self.type == 'local':
-			from dsaSync.directory import dirSync
+			from oval.dsaSync.directory import dirSync
 			self.syncer =   dirSync(self.source, self.storage, self.logger)
 			self.logger.info('syncThread: Run local updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
 		if self.type == 'http':
-			from dsaSync.http import httpSync
+			from oval.dsaSync.http import httpSync
 			self.syncer =   httpSync(self.source, self.storage, config['server'], self.logger)
 			self.logger.info('syncThread: Run http updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
 		if self.type == 'ftp':
-			from dsaSync.ftp import ftpSync
+			from oval.dsaSync.ftp import ftpSync
 			self.syncer =   ftpSync(self.source, self.storage, config['server'], self.logger)
 			self.logger.info('syncThread: Run ftp updater %s with: %s, %s' % (self.name, self.source, self.update_interval))
 			
@@ -209,4 +215,4 @@
 		raise e
 	except Exception, e:
 		sys.stderr.write('Unhandled error during execution: %s : %s.\n' % (e.__class__, str(e)))
-		traceback.print_exc()
\ No newline at end of file
+		traceback.print_exc()