[Erp5-report] r37963 gabriel - in /erp5/trunk/utils/cloudooo: ./ cloudooo/
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Aug 24 03:48:19 CEST 2010
Author: gabriel
Date: Tue Aug 24 03:48:16 2010
New Revision: 37963
URL: http://svn.erp5.org?rev=37963&view=rev
Log:
rename REAME to REAME.txt. Add CHANGES.txt. Remove all attributes not used in cloudooo.py
Added:
erp5/trunk/utils/cloudooo/cloudooo/CHANGES.txt (with props)
erp5/trunk/utils/cloudooo/cloudooo/README.txt
- copied unchanged from r37961, erp5/trunk/utils/cloudooo/cloudooo/README
Removed:
erp5/trunk/utils/cloudooo/cloudooo/README
Modified:
erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
erp5/trunk/utils/cloudooo/setup.py
Added: erp5/trunk/utils/cloudooo/cloudooo/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/CHANGES.txt?rev=37963&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/CHANGES.txt (added)
+++ erp5/trunk/utils/cloudooo/cloudooo/CHANGES.txt [utf8] Tue Aug 24 03:48:16 2010
@@ -0,0 +1,5 @@
+1.0.8
+=====
+
+ - Remove entry points, treat those as ordinary files.
+ - Search all script files using pkg_resources.
Propchange: erp5/trunk/utils/cloudooo/cloudooo/CHANGES.txt
------------------------------------------------------------------------------
svn:eol-style = native
Removed: erp5/trunk/utils/cloudooo/cloudooo/README
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/README?rev=37962&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/README [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/README (removed)
@@ -1,110 +0,0 @@
-Install Cloudooo
-================
-
- $ python2.6 setup.py install
-
- Warning: you must have installed setuptools>=0.6c11 in this python.
-
-Install Dependencies in Mandriva
-================================
-
- $ urpmi xvfb # System Dependencies
-
-Install OpenOffice.org
-======================
-
- Was used for testing the package's official openoffice.org. Follow these steps to install:
-
- Download Package from the official site
- ---------------------------------------
-
- x86_32
- ----
- $ wget http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_LinuxIntel_install_wJRE_en-US.tar.gz
-
- x86_64
- ------
- $ wget http://download.services.openoffice.org/files/stable/3.2.0/OOo_3.2.0_LinuxX86-64_install_wJRE_en-US.tar.gz
-
- Unpack the tar.gz and Install
- -----------------------------
- $ tar zxvf OOo_3.2.0_LinuxX86-64_install_wJRE_en-US.tar.gz
- $ cd OOO320_m12_native_packed-1_en-US.9483/RPMS
- $ rpm -i *.rpm # install all packages together
-
- The instalation is in /opt
-
-Create Configuration File
-=========================
-
- The configuration file is used to start the application using paster.
- $ cp ./cloudooo/samples/cloudooo.conf . # Copy to current folder
-
- The next step is define some attributes in cloudooo.conf:
-
- - uno_path - full path to UNO library;
- - soffice_bin_path - full path to soffice.bin;
-
-Run Application
-===============
-
- $ paster serve ./cloudooo.conf
-
- or run as a daemon:
-
- $ paster serve ./cloudoo.conf --daemon
-
-
-Stop Application
-===============
-
- $ kill -1 PASTER_PID
-
- Warning: always use SIGHUP because only with this signal all processes are
-stopped correctly.
-
-Cloudooo Description
-=====================
-
-- XMLRPC + WSGI will be one bridge for easy access OpenOffice.org. This will implement one XMLRPC server into WSGI (Paster).
-
-- PyUno is used to connect to OpenOffice.org stated with open socket. The features will be handled all by pyuno.
-
-- Xvfb is used to run Openoffice.org. This is controlled by Daemon(cloudooo).
-
-- Only a process will have access to OpenOffice.org by time.
-
-- All clients receive the same object(proxy) when connects with XMLRPC Server.
-
-Xvfb and OpenOffice
-
- - configure and start Xvfb;
- - Use a single Xvfb;
- - the xvfb will be started with the XMLRPC Server;
- - When start the Daemon(cloudooo), it configures Xvfb, next opens the openoffice(with pyuno) and start XMLRPC Server;
- - control Xvfb;
- - start openoffice;
- - Pyuno start the openoffice processes and the communication is through sockets;
- - Openoffice processes run in brackground and in virtual display;
- - control openoffice;
- - The socket can't lose the connection, if this occurs should kill the process and submit again the file;
-
-XMLRPC Server - XMLRPC + WSGI
------------------------------
-
- - Send document to openoffice and return the document converted with metadata;
- - XMLRPC receives a file and connects to a openoffice by pyuno;
- - The pyuno opens a new openoffice, write, add metadata and returns the document edited or converted to xmlrpc and it return the document to the user;
- - When finalize the use of openoffice, should make sure that it was finalized;
- - Export to another format;
- - Invite document and return metadata only;
- - Edit metadata of the document;
- - Problems and possible solution
- - OpenOffice is stalled;
- - finalize the process, start openoffice and submit the document again(without restart the cloudooo);
- - Openoffice is crashed;
- - finalize the process, verify if all the process was killed, start openoffice and submit the document again(without restart the cloudooo)
- - OpenOffice received the document and stalled;
- - if openoffice isn't responding, kill the process and start
- - The document that was sent is corrupt;
- - write in log the error and verify that the process aren't in memory
Modified: erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py?rev=37963&r1=37962&r2=37963&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] Tue Aug 24 03:48:16 2010
@@ -75,16 +75,6 @@ def application(global_config, **local_c
cloudooo_path_tmp_dir = path.join(path_dir_run_cloudooo, 'tmp')
if not path.exists(cloudooo_path_tmp_dir):
mkdir(cloudooo_path_tmp_dir)
- # it extracts the path of cloudooo scripts from pkg_resources
- cloudooo_resources = pkg_resources.get_distribution('cloudooo')
- console_scripts = cloudooo_resources.get_entry_map()['console_scripts']
- unomimemapper_bin = path.join(path.dirname(executable),
- console_scripts["unomimemapper"].name)
- unoconverter_bin = path.join(path.dirname(executable),
- console_scripts["unoconverter"].name)
- openoffice_tester_bin = path.join(path.dirname(executable),
- console_scripts["openoffice_tester"].name)
-
# The Xvfb will run in the same local of the OpenOffice
application_hostname = local_config.get('application_hostname')
openoffice_port = int(local_config.get('openoffice_port'))
@@ -103,11 +93,7 @@ def application(global_config, **local_c
path_dir_run_cloudooo,
local_config.get('virtual_display_id'),
local_config.get('office_bin_path'),
- local_config.get('uno_path'),
- unoconverter_bin=unoconverter_bin,
- python_path=executable,
- unomimemapper_bin=unomimemapper_bin,
- openoffice_tester_bin=openoffice_tester_bin)
+ local_config.get('uno_path'))
openoffice.start()
monitor.load(local_config)
@@ -118,15 +104,11 @@ def application(global_config, **local_c
# Load all filters
openoffice.acquire()
mimemapper.loadFilterList(application_hostname,
- openoffice_port,
- unomimemapper_bin=unomimemapper_bin,
- python_path=executable)
+ openoffice_port)
openoffice.release()
from manager import Manager
timeout_response = int(local_config.get('timeout_response'))
- kw = dict(timeout=timeout_response,
- unoconverter_bin=unoconverter_bin,
- python_path=executable)
+ kw = dict(timeout=timeout_response)
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=37963&r1=37962&r2=37963&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/setup.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/setup.py [utf8] Tue Aug 24 03:48:16 2010
@@ -1,11 +1,16 @@
from setuptools import setup, find_packages
+from os import path
-version = '1.0.7'
+version = '1.0.8'
+folder_path = path.abspath(path.dirname(__file__)) + "/cloudooo"
+
+long_description = "%s\n%s" % (open(path.join(folder_path, "README.txt")).read(),
+ open(path.join(folder_path, "CHANGES.txt")).read())
setup(name='cloudooo',
version=version,
description="XML-RPC openoffice document convertion server",
- long_description=open("./cloudooo/README").read(),
+ long_description=long_description,
classifiers=["Topic :: System :: Networking",
"Topic :: System :: Operating System Kernels :: Linux",
"Topic :: Internet :: WWW/HTTP :: WSGI",
More information about the Erp5-report
mailing list