Author: tmckay
Date: 2011-07-22 20:39:38 +0000 (Fri, 22 Jul 2011)
New Revision: 4889
Added:
trunk/sage/python/sage/wallaby/
trunk/sage/python/sage/wallaby/__init__.py
Modified:
trunk/cumin/python/cumin/main.py
trunk/sage/Makefile
trunk/sage/python/sage/aviary/aviaryoperations.py
Log:
Initial wallaby stub for cumin. No functionality yet.
Modified: trunk/cumin/python/cumin/main.py
===================================================================
--- trunk/cumin/python/cumin/main.py 2011-07-22 20:11:15 UTC (rev 4888)
+++ trunk/cumin/python/cumin/main.py 2011-07-22 20:39:38 UTC (rev 4889)
@@ -23,6 +23,7 @@
from widgets import *
from sage.catalog import Catalog
from sage.qmf.qmfoperations import QmfOperations
+from sage.wallaby.wallabyoperations import WallabyOperations
from wooly import Session
from cumin.stat import PieChartPage
from cumin.widgets import AboutPage
@@ -157,7 +158,11 @@
log.info("Initializing %s", self)
# Create RPC interfaces for QMF and aviary.
- # Aviary takes precedence if added
+ # These service have overlapping functionality,
+ # so they are wrapped in a sage.Catalog object
+ # which allows both to supply operations. First
+ # service in the list takes precedence for any
+ # given op...
self.remote = Catalog()
ops = [QmfOperations("qmf", self.session)]
if self.use_aviary:
@@ -177,6 +182,9 @@
self.aviary_query_port))
self.remote.add_mechanisms(ops)
+ # Create RPC interface for Wallaby
+ self.wallaby = WallabyOperations("wallaby", self.session)
+
self.model.init()
self.session.init()
self.database.init()
Modified: trunk/sage/Makefile
===================================================================
--- trunk/sage/Makefile 2011-07-22 20:11:15 UTC (rev 4888)
+++ trunk/sage/Makefile 2011-07-22 20:39:38 UTC (rev 4889)
@@ -17,8 +17,10 @@
install python/sage/aviary/*.py python/sage/aviary/*.pyc ${lib}/aviary
install -d ${lib}/qmf
install python/sage/qmf/*.py python/sage/qmf/*.pyc ${lib}/qmf
+ install -d ${lib}/wallaby
+ install python/sage/wallaby/*.py python/sage/wallaby/*.pyc ${lib}/wallaby
install -d ${share}/rpc-defs/aviary
- install rpc-defs/aviary/*.xsd rpc-defs/aviary/*.wsdl rpc-defs/aviary/*.xml
rpc-defs/aviary/*.xml.* ${share}/rpc-defs/aviary
+ install rpc-defs/aviary/* ${share}/rpc-defs/aviary
install -d ${doc}
install LICENSE COPYING ${doc}
Modified: trunk/sage/python/sage/aviary/aviaryoperations.py
===================================================================
--- trunk/sage/python/sage/aviary/aviaryoperations.py 2011-07-22 20:11:15 UTC (rev 4888)
+++ trunk/sage/python/sage/aviary/aviaryoperations.py 2011-07-22 20:39:38 UTC (rev 4889)
@@ -44,11 +44,15 @@
for job control functions. This would be extra stuff for QMF, but helpful with
Aviary.
-Add a summary comment at the top like QMF opreations
+- Add a summary comment at the top like QMF opreations
-can we use default/timeout with suds?
+- can we use default/timeout with suds?
yes, there is at least a timeout that can be set once,
it might be possible to change the timeout per call.
+
+- Add some nice error message that indicates the connection was
+refused to the aviary service. This probably means that aviary
+is not running on that port -- more helpful than "connection refulsed"
'''
class AviaryOperations(object):
Added: trunk/sage/python/sage/wallaby/__init__.py
===================================================================
Show replies by date