[Erp5-report] r37606 gabriel - in /erp5/trunk/utils/cloudooo: cloudooo/cloudooo.py setup.py

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Aug  6 16:28:26 2010
New Revision: 37606

URL: http://svn.erp5.org?rev=37606&view=rev
Log:
sorry I changed the commits. this changes is to r37605 message. The message to commit r37605 is: 'add specific properties to specific filters. This filters is to fix erp5 compatibility'

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
    erp5/trunk/utils/cloudooo/setup.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py?rev=37606&r1=37605&r2=37606&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] Fri Aug  6 16:28:26 2010
@@ -90,9 +90,6 @@ def application(global_config, **local_c
   document_url = path.join(path.dirname(__file__),                                                                                     
                               "tests/data/%s" % document_name)
 
-  cloudooo_path = path.abspath(path.dirname(__file__))
-  unoconverter_bin_path = path.join(cloudooo_path, "bin", "unoconverter.py")
-  unomimemapper_bin_path = path.join(cloudooo_path, "bin", "unomimemapper.py")
   # Loading Configuration to start OOo Instance and control it
   openoffice.loadSettings(application_hostname, 
                           openoffice_port,
@@ -101,9 +98,9 @@ def application(global_config, **local_c
                           local_config.get('office_bin_path'), 
                           local_config.get('uno_path'),
                           document_url=document_url,
-                          unoconverter_bin=unoconverter_bin_path,
+                          unoconverter_bin=local_config.get('unoconverter_bin'),
                           python_path=local_config.get('python_path'),
-                          unomimemapper_bin=unomimemapper_bin_path)
+                          unomimemapper_bin=local_config.get('unomimemapper_bin'))
   openoffice.start()
 
   monitor.load(local_config)
@@ -115,14 +112,14 @@ def application(global_config, **local_c
   openoffice.acquire()
   mimemapper.loadFilterList(application_hostname,
                             openoffice_port,
-                            unomimemapper_bin=unomimemapper_bin_path,
+                            unomimemapper_bin=local_config.get('unomimemapper_bin'),
                             python_path=local_config.get('python_path'))
   openoffice.release()
 
   from manager import Manager
   timeout_response = int(local_config.get('timeout_response'))
   kw = dict(timeout=timeout_response,
-        unoconverter_bin=unoconverter_bin_path,
+        unoconverter_bin=local_config.get('unoconverter_bin'),
         python_path=local_config.get('python_path'))
   cloudooo_manager = Manager(cloudooo_path_tmp_dir, **kw)
   return WSGIXMLRPCApplication(instance=cloudooo_manager)

Modified: erp5/trunk/utils/cloudooo/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/setup.py?rev=37606&r1=37605&r2=37606&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/setup.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/setup.py [utf8] Fri Aug  6 16:28:26 2010
@@ -35,8 +35,10 @@ setup(name='cloudooo',
           'psutil',
       ],
       entry_points="""
-      # -*- Entry points: -*-
       [paste.app_factory]
       main = cloudooo.cloudooo:application
+      [console_scripts]
+      unoconverter.py = cloudooo.bin.unoconverter:main
+      unomimemapper.py = cloudooo.bin.unomimemapper:main
       """,
       )