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

1 files changed, 2 insertions, 2 deletions

diff --git a/base/deploy/src/scriptlets/security_databases.py b/base/deploy/src/scriptlets/security_databases.py
index a74a4c157..9ac4784e5 100644
--- a/base/deploy/src/scriptlets/security_databases.py
+++ b/base/deploy/src/scriptlets/security_databases.py
@@ -62,7 +62,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
         util.file.modify(master['pki_secmod_database'], perms=\
             config.PKI_DEPLOYMENT_DEFAULT_SECURITY_DATABASE_PERMISSIONS)
 
-        if util.instance.tomcat_instance_subsystems() < 2:
+        if len(util.instance.tomcat_instance_subsystems()) < 2:
             # only create a self signed cert for a new instance  
             rv = util.certutil.verify_certificate_exists(
                  master['pki_database_path'],
@@ -111,7 +111,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
             util.file.delete(master['pki_secmod_database'])
             util.file.delete(master['pki_shared_password_conf'])
         elif master['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS and\
-             util.instance.tomcat_instance_subsystems() == 0:
+             len(util.instance.tomcat_instance_subsystems()) == 0:
             util.file.delete(master['pki_cert_database'])
             util.file.delete(master['pki_key_database'])
             util.file.delete(master['pki_secmod_database'])