From c9a081037aa5bf15cf6226f06ea54ea98deba5bc Mon Sep 17 00:00:00 2001 From: Ade Lee Date: Mon, 18 Mar 2013 11:29:52 -0400 Subject: Refactor installation code to remove dependency on jython Connection is now made to the installation servlet through a python client using JSON. The code to construct the ConfgurationRequest and parse the results has been moved to pkihelper.py, and configuration.py no longer calls a separate jython process to create the Configuration object and parse the results. The jython code has therefore been removed. Also added status servlet to other java subsystems, to be tested prior to starting configuration. Trac Ticket 532 --- base/deploy/src/scriptlets/instance_layout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base/deploy/src/scriptlets/instance_layout.py') diff --git a/base/deploy/src/scriptlets/instance_layout.py b/base/deploy/src/scriptlets/instance_layout.py index 773305c13..843227a84 100644 --- a/base/deploy/src/scriptlets/instance_layout.py +++ b/base/deploy/src/scriptlets/instance_layout.py @@ -170,7 +170,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet): util.directory.delete( master['pki_instance_type_registry_path']) elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and\ - util.instance.tomcat_instance_subsystems() == 0: + len(util.instance.tomcat_instance_subsystems()) == 0: # remove Tomcat instance base util.directory.delete(master['pki_instance_path']) # remove Tomcat instance logs -- cgit