Merge branch 'master' into rename_instance

master/bt5/erp5_configurator_vifib/SkinTemplateItem/portal_skins/erp5_configurator_vifib/BusinessCondiguration_additionalConfiguration.xml

@@ -58,7 +58,7 @@ portal = context.getPortalObject() \n
 \n
 ## Create new portal tool for Vifib\n
 if getattr(portal, "portal_certificate_authority", None ) is None:\n
-  portal.manage_addProduct[\'Vifib\'].manage_addTool(\'ERP5 Certificate Authority Tool\', None)\n
+  portal.manage_addProduct[\'ERP5\'].manage_addTool(\'ERP5 Certificate Authority Tool\', None)\n
   print "Created portal_certificate_authority"\n
 else:\n
   print "portal_certificate_authority already exists."\n

master/bt5/erp5_configurator_vifib/bt/revision

-19
+20
\ No newline at end of file

master/product/Vifib/__init__.py

@@ -37,8 +37,8 @@ document_classes = updateGlobals(this_module, globals(),
 object_classes = ()
 content_classes = ()
 content_constructors = ()
-from Tool import SlapTool, CertificateAuthorityTool
-portal_tools = ( SlapTool.SlapTool, CertificateAuthorityTool.CertificateAuthorityTool )
+from Tool import SlapTool
+portal_tools = ( SlapTool.SlapTool, )
 from Products.PluggableAuthService.PluggableAuthService import registerMultiPlugin
 
 import VifibMachineAuthenticationPlugin

master/product/Vifib/tests/VifibMixin.py

@@ -151,7 +151,7 @@ class testVifibMixin(ERP5TypeTestCase):
       return
 
     if not self.portal.hasObject('portal_certificate_authority'):
-      self.portal.manage_addProduct['Vifib'].manage_addTool(
+      self.portal.manage_addProduct['ERP5'].manage_addTool(
         'ERP5 Certificate Authority Tool', None)
     self.portal.portal_certificate_authority.certificate_authority_path = \
         os.environ['TEST_CA_PATH']

master/product/Vifib/www/Vifib_editCertificateAuthorityTool.zpt

-<h1 tal:replace="structure context/manage_page_header">PAGE HEADER</h1>
-<h2 tal:replace="structure here/manage_tabs"> TABS </h2>
-<h2 tal:define="form_title string:Edit ERP5 Certificate Authority Tool"
-    tal:replace="structure context/manage_form_title">FORM TITLE</h2>
-
-<p class="form-help">Please input the Certificate Authority path</p>
-
-<form action="manage_editCertificateAuthorityTool" method="POST">
-
-<table
- tal:define="certificate_authority_path request/certificate_authority_path|context/certificate_authority_path|string:; openssl_binary request/openssl_binary|context/openssl_binary|string:;">
-
-<tr>
-   <td>Absolute path to configured Certificate Authority</td>
-   <td>
-     <input type="text" name="certificate_authority_path" value=""
-            tal:attributes="value certificate_authority_path;" />
-   </td>
-</tr>
-<tr>
-   <td>Absolute path to OpenSSL binary</td>
-   <td>
-     <input type="text" name="openssl_binary" value=""
-            tal:attributes="value openssl_binary;" />
-   </td>
-</tr>
-<tr>
-   <td colspan="2"> 
-    <input type="submit" value="save"/>
-   </td>
-</tr>
-
-</table>
-
-</form>
-
-<h1 tal:replace="structure context/manage_page_footer">PAGE FOOTER</h1>

slapos/grid/slapgrid.py

@@ -465,7 +465,7 @@ class Slapgrid(object):
 
 
         if process_handler.poll() is None:
-          process_handler.kill()
+          process_handler.terminate()
           raise Slapgrid.PromiseError("The promise %r timed out" % promise)
         elif process_handler.poll() != 0:
           stderr = process_handler.communicate()[1]