diff --git a/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/AtsConfigurator.java b/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/AtsConfigurator.java index 94a1eecd..8650a2b0 100644 --- a/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/AtsConfigurator.java +++ b/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/AtsConfigurator.java @@ -47,6 +47,8 @@ public final class AtsConfigurator " ATS_JAVA_HOME - Java home.\n" + " TOMCAT_HOME - Tomcat install base directory.\n" + " HOSTNAME - Name of the host.\n" + + " IAREALMS_FILE_PATH - Path to the iaRealms file to be used by the service.\n" + + " The following properties are optional:\n" + " TOMCAT5 - Location of the tomcat5 executable.\n"; // Error codes @@ -81,13 +83,16 @@ public final class AtsConfigurator final static String TOMCAT_HOME_PROPERTY = "TOMCAT_HOME"; final static String JAVA_HOME_PROPERTY = "ATS_JAVA_HOME"; final static String HOSTNAME_PROPERTY = "HOSTNAME"; + final static String IAREALMS_FILE_PROPERTY = "IAREALMS_FILE_PATH"; + final static String TOMCAT5_PROPERTY = "TOMCAT5"; final static String[] m_requiredProperties = { INSTALL_DIR_PROPERTY, COMPUTERNAME_PROPERTY, TOMCAT_HOME_PROPERTY, JAVA_HOME_PROPERTY, - HOSTNAME_PROPERTY}; + HOSTNAME_PROPERTY, + IAREALMS_FILE_PROPERTY}; // Other constants final static String LOG_FILE_NAME = "AtsConfigurator.log"; diff --git a/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Configure.java b/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Configure.java index ccb7e363..303ca611 100644 --- a/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Configure.java +++ b/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Configure.java @@ -681,13 +681,17 @@ public class Configure String installDir = (String) m_properties.get(AtsConfigurator.INSTALL_DIR_PROPERTY); String sDirCatalinaBase = installDir + "/catalinabase"; String sDirCatalinaHome = (String) m_properties.get(AtsConfigurator.TOMCAT_HOME_PROPERTY); - String sExe = ((String) m_properties.get(AtsConfigurator.TOMCAT_HOME_PROPERTY)) + "\\bin\\tomcat5.exe"; String sFileJaasConf = installDir + "\\etc\\svc\\jaas.conf"; String sDirConfig = installDir + "/etc/svc"; String sDirJavaHome = (String) m_properties.get(AtsConfigurator.JAVA_HOME_PROPERTY); String sLogPrefix = "casa-auth-token-svc"; String sDirLogs = sDirCatalinaBase + "/logs"; + // Determine the path to the Tomcat5 executable + String sExe = (String) m_properties.get(AtsConfigurator.TOMCAT5_PROPERTY); + if (sExe == null) + sExe = ((String) m_properties.get(AtsConfigurator.TOMCAT_HOME_PROPERTY)) + "\\bin\\tomcat5.exe"; + /* * Note that in the following code we do not bother to check the return of the invokeExternalCommand * call. This is because I have found that some versions of tomcat5.exe do not always return success diff --git a/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Unconfigure.java b/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Unconfigure.java index 12fc1ab7..3bf47d2d 100644 --- a/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Unconfigure.java +++ b/CASA-auth-token/server-java/package/windows/AtsConfigurator/src/Unconfigure.java @@ -75,10 +75,14 @@ public class Unconfigure int deleteATSService() { int rc = AtsConfigurator.ERROR_NO_ERROR; - String sExe = ((String) m_properties.get(AtsConfigurator.TOMCAT_HOME_PROPERTY)) + "\\bin\\tomcat5.exe"; AtsConfigurator.log("Unconfigure.deleteATSService()- Start"); + // Determine the path to the Tomcat5 executable + String sExe = (String) m_properties.get(AtsConfigurator.TOMCAT5_PROPERTY); + if (sExe == null) + sExe = ((String) m_properties.get(AtsConfigurator.TOMCAT_HOME_PROPERTY)) + "\\bin\\tomcat5.exe"; + /* * Note that in the following code we do not bother to check the return of the invokeExternalCommand * call. This is because I have found that some versions of tomcat5.exe do not always return success