[REM] netrpc: KILL EVERYBODY

bzr revid: vmt@openerp.com-20130221121825-dvpacxajwztslukj

diff --git a/debian/control b/debian/control
index d598023..d4cf0c3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,6 @@ Description: OpenERP Enterprise Resource Management
  features are accounting (analytic and financial), stock management, sales and
  purchases management, tasks automation, marketing campaigns, help desk, POS,
  etc. Technical features include a distributed server, flexible workflows, an
- object database, a dynamic GUI, customizable reports, and NET-RPC and XML-RPC
- interfaces.
+ object database, a dynamic GUI, customizable reports, and an XML-RPC
+ interface.
 

diff --git a/doc/01_getting_started.rst b/doc/01_getting_started.rst
index 175c78c..341d96d 100644 (file)
--- a/doc/01_getting_started.rst
+++ b/doc/01_getting_started.rst
@@ -103,9 +103,6 @@ General Options
   --logfile=LOGFILE                   file where the server log will be stored
   -n INTERFACE, --interface=INTERFACE specify the TCP IP address
   -p PORT, --port=PORT                specify the TCP port
-  --net_interface=NETINTERFACE        specify the TCP IP address for netrpc
-  --net_port=NETPORT                  specify the TCP port for netrpc
-  --no-netrpc                         disable netrpc
   --no-xmlrpc                         disable xmlrpc
   -i INIT, --init=INIT                init a module (use "all" for all modules)
   --without-demo=WITHOUT_DEMO         load demo data for a module (use "all" for all modules)

diff --git a/doc/changelog.rst b/doc/changelog.rst
index a80e8dc..c85bf64 100644 (file)
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,6 +6,7 @@ Changelog
 `trunk`
 -------
 
+- Removed support for the ``NET-RPC`` protocol.
 - Added the :ref:`Long polling <longpolling-worker>` worker type.
 - Added :ref:`orm-workflows` to the ORM.
 - Added :ref:`routing-decorators` to the RPC and WSGI stack.

diff --git a/install/openerp-server.1 b/install/openerp-server.1
index 58ac6f3..6529e73 100644 (file)
--- a/install/openerp-server.1
+++ b/install/openerp-server.1
@@ -80,17 +80,6 @@ specify the certificate file for the SSL connection
 \fB\-\-pkey\-file\fR=\fISECURE_PKEY_FILE\fR
 specify the private key file for the SSL connection
 .IP
-NET\-RPC Configuration:
-.TP
-\fB\-\-netrpc\-interface\fR=\fINETRPC_INTERFACE\fR
-specify the TCP IP address for the NETRPC protocol
-.TP
-\fB\-\-netrpc\-port\fR=\fINETRPC_PORT\fR
-specify the TCP port for the NETRPC protocol
-.TP
-\fB\-\-no\-netrpc\fR
-disable the NETRPC protocol
-.IP
 Static HTTP service:
 .TP
 \fB\-\-static\-http\-enable\fR

diff --git a/openerp/PKG-INFO b/openerp/PKG-INFO
index 1d94869..fba4a85 100644 (file)
--- a/openerp/PKG-INFO
+++ b/openerp/PKG-INFO
@@ -13,6 +13,6 @@ Description: OpenERP is a complete ERP and CRM. The main features are accounting
         and financial), stock management, sales and purchases management, tasks
         automation, marketing campaigns, help desk, POS, etc. Technical features include
         a distributed server, flexible workflows, an object database, a dynamic GUI,
-        customizable reports, and NET-RPC and XML-RPC interfaces.
+        customizable reports, and an XML-RPC interface.
 Keywords: ERP, Accounting, Stock, CRM, Enterprise, Logistics, Management, Sales, Purchases
 Platform: Linux, Win32

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index a5e33ff..a533fa9 100644 (file)
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -205,8 +205,8 @@ def log(logger, level, prefix, msg, depth=None):
 def dispatch_rpc(service_name, method, params):
     """ Handle a RPC call.
 
-    This is pure Python code, the actual marshalling (from/to XML-RPC or
-    NET-RPC) is done in a upper layer.
+    This is pure Python code, the actual marshalling (from/to XML-RPC) is done
+    in a upper layer.
     """
     try:
         rpc_request = logging.getLogger(__name__ + '.rpc.request')

diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index 8fa65f9..7a7190c 100644 (file)
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -142,17 +142,6 @@ class configmanager(object):
                          help="specify the private key file for the SSL connection")
         parser.add_option_group(group)
 
-        # NET-RPC
-        group = optparse.OptionGroup(parser, "NET-RPC Configuration")
-        group.add_option("--netrpc-interface", dest="netrpc_interface", my_default='',
-                         help="specify the TCP IP address for the NETRPC protocol")
-        group.add_option("--netrpc-port", dest="netrpc_port", my_default=8070,
-                         help="specify the TCP port for the NETRPC protocol", type="int")
-        # Needed a few day for runbot and saas
-        group.add_option("--no-netrpc", dest="netrpc", action="store_false", my_default=False, help="disable the NETRPC protocol")
-        group.add_option("--netrpc", dest="netrpc", action="store_true", my_default=False, help="enable the NETRPC protocol")
-        parser.add_option_group(group)
-
         # WEB
         # TODO move to web addons after MetaOption merge
         group = optparse.OptionGroup(parser, "Web interface Configuration")
@@ -383,8 +372,8 @@ class configmanager(object):
                 'db_name', 'db_user', 'db_password', 'db_host',
                 'db_port', 'db_template', 'logfile', 'pidfile', 'smtp_port',
                 'email_from', 'smtp_server', 'smtp_user', 'smtp_password',
-                'netrpc_interface', 'netrpc_port', 'db_maxconn', 'import_partial', 'addons_path',
-                'netrpc', 'xmlrpc', 'syslog', 'without_demo', 'timezone',
+                'db_maxconn', 'import_partial', 'addons_path',
+                'xmlrpc', 'syslog', 'without_demo', 'timezone',
                 'xmlrpcs_interface', 'xmlrpcs_port', 'xmlrpcs',
                 'static_http_enable', 'static_http_document_root', 'static_http_url_prefix',
                 'secure_cert_file', 'secure_pkey_file', 'dbfilter', 'log_handler', 'log_level'
@@ -407,7 +396,7 @@ class configmanager(object):
         keys = [
             'language', 'translate_out', 'translate_in', 'overwrite_existing_translations',
             'debug_mode', 'smtp_ssl', 'load_language',
-            'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog',
+            'stop_after_init', 'logrotate', 'without_demo', 'xmlrpc', 'syslog',
             'list_db', 'xmlrpcs', 'proxy_mode',
             'test_file', 'test_enable', 'test_commit', 'test_report_directory',
             'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent',

diff --git a/scripts/run_all_with_tests.sh b/scripts/run_all_with_tests.sh
index 877a590..0248f28 100755 (executable)
--- a/scripts/run_all_with_tests.sh
+++ b/scripts/run_all_with_tests.sh
@@ -12,6 +12,5 @@ rm openerp-server.log
     --stop-after-init \
     --no-xmlrpc \
     --no-xmlrpcs \
-    --no-netrpc \
     --test-enable \
     --logfile=openerp-server.log