Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Levin Zimmermann
erp5
Commits
e9abea58
Commit
e9abea58
authored
Jul 03, 2020
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ZODB Components: Migrate Products.ERP5Type.ConnectionPlugin from filesystem.
parent
5a0780e1
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
788 additions
and
8 deletions
+788
-8
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SFTPConnection.py
...plateItem/portal_components/module.erp5.SFTPConnection.py
+2
-2
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SFTPConnection.xml
...lateItem/portal_components/module.erp5.SFTPConnection.xml
+131
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SOAPConnection.py
...plateItem/portal_components/module.erp5.SOAPConnection.py
+0
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SOAPConnection.xml
...lateItem/portal_components/module.erp5.SOAPConnection.xml
+140
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SOAPWSDLConnection.py
...eItem/portal_components/module.erp5.SOAPWSDLConnection.py
+2
-2
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SOAPWSDLConnection.xml
...Item/portal_components/module.erp5.SOAPWSDLConnection.xml
+131
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SQLConnection.py
...mplateItem/portal_components/module.erp5.SQLConnection.py
+0
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SQLConnection.xml
...plateItem/portal_components/module.erp5.SQLConnection.xml
+131
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.XMLRPCConnection.py
...ateItem/portal_components/module.erp5.XMLRPCConnection.py
+0
-0
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.XMLRPCConnection.xml
...teItem/portal_components/module.erp5.XMLRPCConnection.xml
+131
-0
bt5/erp5_web_service/ToolComponentTemplateItem/portal_components/tool.erp5.WebServiceTool.py
...emplateItem/portal_components/tool.erp5.WebServiceTool.py
+1
-1
bt5/erp5_web_service/bt/template_module_component_id_list
bt5/erp5_web_service/bt/template_module_component_id_list
+5
-0
product/ERP5/Document/Document.py
product/ERP5/Document/Document.py
+1
-1
product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.TimeoutTransport.py
...ateItem/portal_components/module.erp5.TimeoutTransport.py
+2
-2
product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.TimeoutTransport.xml
...teItem/portal_components/module.erp5.TimeoutTransport.xml
+110
-0
product/ERP5/bootstrap/erp5_core/bt/template_module_component_id_list
.../bootstrap/erp5_core/bt/template_module_component_id_list
+1
-0
product/ERP5Type/ConnectionPlugin/__init__.py
product/ERP5Type/ConnectionPlugin/__init__.py
+0
-0
No files found.
product/ERP5Type/ConnectionPlugin/
SFTPConnection.py
→
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.
SFTPConnection.py
View file @
e9abea58
...
...
@@ -76,7 +76,7 @@ class SFTPConnection:
# May not be easy if name resolution is involved.
# Try to reconciliate them ?
sock
.
bind
((
self
.
bind_address
,
0
))
retry_on_signal
(
lambda
:
sock
.
connect
((
hostname
,
port
)))
retry_on_signal
(
lambda
:
sock
.
connect
((
hostname
,
port
)))
# pylint: disable=cell-var-from-loop
break
else
:
raise
SFTPError
(
'No suitable socket family found'
)
...
...
@@ -114,7 +114,7 @@ class SFTPConnection:
try
:
self
.
conn
.
putfo
(
StringIO
(
str
(
serialized_data
)),
filepath
,
confirm
=
confirm
)
except
error
,
msg
:
raise
SFTPError
(
str
(
msg
)
+
' while writing file %s on %s'
%
(
filepath
,
path
,
self
.
url
))
raise
SFTPError
(
str
(
msg
)
+
' while writing file %s on %s'
%
(
filepath
,
path
))
def
_getFile
(
self
,
filepath
):
"""Retrieve the file"""
...
...
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SFTPConnection.xml
0 → 100644
View file @
e9abea58
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Module Component"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_recorded_property_dict
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
SFTPConnection
</string>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
Products.ERP5Type.ConnectionPlugin.SFTPConnection
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
module.erp5.SFTPConnection
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Module Component
</string>
</value>
</item>
<item>
<key>
<string>
sid
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
text_content_error_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
text_content_warning_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
erp5
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
component_validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5Type/ConnectionPlugin/
SOAPConnection.py
→
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.
SOAPConnection.py
View file @
e9abea58
File moved
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SOAPConnection.xml
0 → 100644
View file @
e9abea58
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Module Component"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_recorded_property_dict
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
SOAPConnection
</string>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
Products.ERP5Type.ConnectionPlugin.SOAPConnection
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
module.erp5.SOAPConnection
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Module Component
</string>
</value>
</item>
<item>
<key>
<string>
sid
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
text_content_error_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
text_content_warning_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
erp5
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
description
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
reference
</string>
</key>
<value>
<string>
SOAPConnectionPlugin
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
component_validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
modify
</string>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
modified
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5Type/ConnectionPlugin/
SOAPWSDLConnection.py
→
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.
SOAPWSDLConnection.py
View file @
e9abea58
...
...
@@ -28,7 +28,7 @@
import
SOAPpy
from
Products.AGProjects.patches
import
SOAPpy_WSDL
as
WSDL
from
AccessControl.SecurityInfo
import
allow_class
,
allow_module
from
AccessControl.SecurityInfo
import
allow_class
import
threading
# Exception class.
...
...
@@ -40,7 +40,7 @@ class SOAPWSDLException(Exception):
__allow_access_to_unprotected_subobjects__
=
1
def
__init__
(
self
,
code
,
name
,
info
):
def
__init__
(
self
,
code
,
name
,
info
):
# pylint: disable=super-init-not-called
self
.
code
=
code
self
.
name
=
name
self
.
info
=
info
...
...
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SOAPWSDLConnection.xml
0 → 100644
View file @
e9abea58
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Module Component"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_recorded_property_dict
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
SOAPWSDLConnection
</string>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
Products.ERP5Type.ConnectionPlugin.SOAPWSDLConnection
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
module.erp5.SOAPWSDLConnection
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Module Component
</string>
</value>
</item>
<item>
<key>
<string>
sid
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
text_content_error_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
text_content_warning_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
erp5
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
component_validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5Type/ConnectionPlugin/
SQLConnection.py
→
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.
SQLConnection.py
View file @
e9abea58
File moved
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.SQLConnection.xml
0 → 100644
View file @
e9abea58
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Module Component"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_recorded_property_dict
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
SQLConnection
</string>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
Products.ERP5Type.ConnectionPlugin.SQLConnection
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
module.erp5.SQLConnection
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Module Component
</string>
</value>
</item>
<item>
<key>
<string>
sid
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
text_content_error_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
text_content_warning_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
erp5
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
component_validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5Type/ConnectionPlugin/
XMLRPCConnection.py
→
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.
XMLRPCConnection.py
View file @
e9abea58
File moved
bt5/erp5_web_service/ModuleComponentTemplateItem/portal_components/module.erp5.XMLRPCConnection.xml
0 → 100644
View file @
e9abea58
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Module Component"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_recorded_property_dict
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
XMLRPCConnection
</string>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
Products.ERP5Type.ConnectionPlugin.XMLRPCConnection
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
module.erp5.XMLRPCConnection
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Module Component
</string>
</value>
</item>
<item>
<key>
<string>
sid
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
text_content_error_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
text_content_warning_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
erp5
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
component_validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAQ=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"4"
aka=
"AAAAAAAAAAQ="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_service/ToolComponentTemplateItem/portal_components/tool.erp5.WebServiceTool.py
View file @
e9abea58
...
...
@@ -61,7 +61,7 @@ for handler_id, module_id in handler_module_dict.iteritems():
# WebServiceTool.connect .
try
:
module
=
__import__
(
'
Products.ERP5Type.ConnectionPlugin
.%s'
%
(
module_id
,
),
'
erp5.component.module
.%s'
%
(
module_id
,
),
globals
(),
{},
[
module_id
])
except
ImportError
:
LOG
(
'WebServiceTool'
,
WARNING
,
...
...
bt5/erp5_web_service/bt/template_module_component_id_list
0 → 100644
View file @
e9abea58
module.erp5.SFTPConnection
module.erp5.SOAPConnection
module.erp5.SOAPWSDLConnection
module.erp5.SQLConnection
module.erp5.XMLRPCConnection
\ No newline at end of file
product/ERP5/Document/Document.py
View file @
e9abea58
...
...
@@ -91,7 +91,6 @@ from Products.CMFCore.utils import getToolByName
from
functools
import
partial
from
xmlrpclib
import
Fault
,
ServerProxy
,
ProtocolError
from
AccessControl
import
Unauthorized
from
Products.ERP5Type.ConnectionPlugin.TimeoutTransport
import
TimeoutTransport
from
socket
import
error
as
SocketError
from
DateTime
import
DateTime
class
DocumentConversionServerProxy
():
...
...
@@ -128,6 +127,7 @@ class DocumentConversionServerProxy():
raise
ConversionError
(
'OOoDocument: cannot proceed with conversion:'
' preferred conversion server url is invalid'
)
from
erp5.component.module.TimeoutTransport
import
TimeoutTransport
transport
=
TimeoutTransport
(
timeout
=
timeout
,
scheme
=
scheme
)
self
.
_serverproxy_list
.
append
((
uri
,
ServerProxy
(
uri
,
allow_none
=
True
,
transport
=
transport
)))
...
...
product/ERP5
Type/ConnectionPlugin/
TimeoutTransport.py
→
product/ERP5
/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.
TimeoutTransport.py
View file @
e9abea58
...
...
@@ -26,7 +26,7 @@
#
##############################################################################
from
xmlrpclib
import
Fault
,
ProtocolError
from
xmlrpclib
import
ProtocolError
from
xmlrpclib
import
Transport
from
xmlrpclib
import
SafeTransport
import
socket
...
...
@@ -47,6 +47,6 @@ class TimeoutTransport(SafeTransport):
def
send_content
(
self
,
connection
,
request_body
):
try
:
return
SafeTransport
.
send_content
(
self
,
connection
,
request_body
)
except
socket
.
error
,
e
:
except
socket
.
error
:
raise
ProtocolError
(
connection
.
host
,
-
1
,
"Could not connect to server"
,
None
)
product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.TimeoutTransport.xml
0 → 100644
View file @
e9abea58
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"Module Component"
module=
"erp5.portal_type"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
default_reference
</string>
</key>
<value>
<string>
TimeoutTransport
</string>
</value>
</item>
<item>
<key>
<string>
default_source_reference
</string>
</key>
<value>
<string>
Products.ERP5Type.ConnectionPlugin.TimeoutTransport
</string>
</value>
</item>
<item>
<key>
<string>
description
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
module.erp5.TimeoutTransport
</string>
</value>
</item>
<item>
<key>
<string>
portal_type
</string>
</key>
<value>
<string>
Module Component
</string>
</value>
</item>
<item>
<key>
<string>
sid
</string>
</key>
<value>
<none/>
</value>
</item>
<item>
<key>
<string>
text_content_error_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
text_content_warning_message
</string>
</key>
<value>
<tuple/>
</value>
</item>
<item>
<key>
<string>
version
</string>
</key>
<value>
<string>
erp5
</string>
</value>
</item>
<item>
<key>
<string>
workflow_history
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"PersistentMapping"
module=
"Persistence.mapping"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
data
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
component_validation_workflow
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAM=
</string>
</persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"3"
aka=
"AAAAAAAAAAM="
>
<pickle>
<global
name=
"WorkflowHistoryList"
module=
"Products.ERP5Type.Workflow"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_log
</string>
</key>
<value>
<list>
<dictionary>
<item>
<key>
<string>
action
</string>
</key>
<value>
<string>
validate
</string>
</value>
</item>
<item>
<key>
<string>
validation_state
</string>
</key>
<value>
<string>
validated
</string>
</value>
</item>
</dictionary>
</list>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
product/ERP5/bootstrap/erp5_core/bt/template_module_component_id_list
View file @
e9abea58
...
...
@@ -5,4 +5,5 @@ module.erp5.GeneratedAmountList
module.erp5.Log
module.erp5.MovementCollectionDiff
module.erp5.MovementGroup
module.erp5.TimeoutTransport
module.erp5.WebDAVSupport
\ No newline at end of file
product/ERP5Type/ConnectionPlugin/__init__.py
deleted
100644 → 0
View file @
5a0780e1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment