From 72a6a0003cdfe089474864c5a0e20b1c530e0b68 Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Mon, 5 Mar 2007 16:41:54 +0000 Subject: [PATCH] Finished fixing problems related to log4j.properties on Windows. --- .../InitConfigFile/InitConfigFile.java | 890 +++++++++--------- .../MungeCryptoPropertiesFilePath.java | 530 +++++------ .../server-java_msi/server-java_msi.vdproj | 5 +- 3 files changed, 723 insertions(+), 702 deletions(-) diff --git a/CASA-auth-token/server-java/package/windows/InitConfigFile/InitConfigFile.java b/CASA-auth-token/server-java/package/windows/InitConfigFile/InitConfigFile.java index 4e76aa7d..6590cbad 100644 --- a/CASA-auth-token/server-java/package/windows/InitConfigFile/InitConfigFile.java +++ b/CASA-auth-token/server-java/package/windows/InitConfigFile/InitConfigFile.java @@ -18,7 +18,7 @@ * To contact Novell about this file by physical or electronic mail, * you may find current contact information at www.novell.com. * - * Author: Juan Carlos Luciani + * Author: Greg Richardson * ***********************************************************************/ @@ -30,488 +30,512 @@ import java.util.*; */ public class InitConfigFile { - final static int ERROR_NO_ERROR = 0; - final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; - final static int ERROR_MISSING_TEMPLATE = -3; - final static int ERROR_MISSING_TEMPLATE_FILE = -8; - final static int ERROR_OUTPUT_PROPERTY_MISSING = -9; - final static int ERROR_OUTPUT_COPY_FAILED = -12; - final static int ERROR_IO_EXCEPTION = -13; - final static int ERROR_MISSING_PROPERTIES = -15; - final static int ERROR_UNABLE_TO_READ_PROPERTIES = -16; - final static int ERROR_PROPERTIES_FILE_IS_EMPTY = -17; - final static int ERROR_MISSING_INSTALL_DIR = -18; - final static int ERROR_INSTALL_DIR_NOT_A_DIR = -19; - final static int ERROR_BAD_INSTALL_DIR_PARAM = -20; - final static int ERROR_BAD_PROPERTY_FILE_PARAM = -21; - final static int ERROR_MISSING_PROPERTIES_FILE = -22; - final static int ERROR_MISSING_INSTALL_DIR_PARAM = -23; - final static int ERROR_MISSING_PROPERTY_FILE_PARAM = -24; - final static int ERROR_BAD_TEMPLATE_FILE_PARAM = -25; - final static int ERROR_BAD_OUTPUT_FILE_PARAM = -26; - final static int ERROR_MISSING_TEMPLATE_FILE_PARAM = -27; - final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -28; - final static int ERROR_BAD_PROPERTY_PARAM = -29; - final static int ERROR_UNABLE_TO_OPEN_TEMPLATE = -30; - final static int ERROR_FILEWRITER_CREATE_FAILED = -31; + final static int ERROR_NO_ERROR = 0; + final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; + final static int ERROR_MISSING_TEMPLATE = -3; + final static int ERROR_MISSING_TEMPLATE_FILE = -8; + final static int ERROR_OUTPUT_PROPERTY_MISSING = -9; + final static int ERROR_OUTPUT_COPY_FAILED = -12; + final static int ERROR_IO_EXCEPTION = -13; + final static int ERROR_MISSING_PROPERTIES = -15; + final static int ERROR_UNABLE_TO_READ_PROPERTIES = -16; + final static int ERROR_PROPERTIES_FILE_IS_EMPTY = -17; + final static int ERROR_MISSING_INSTALL_DIR = -18; + final static int ERROR_INSTALL_DIR_NOT_A_DIR = -19; + final static int ERROR_BAD_INSTALL_DIR_PARAM = -20; + final static int ERROR_BAD_PROPERTY_FILE_PARAM = -21; + final static int ERROR_MISSING_PROPERTIES_FILE = -22; + final static int ERROR_MISSING_INSTALL_DIR_PARAM = -23; + final static int ERROR_MISSING_PROPERTY_FILE_PARAM = -24; + final static int ERROR_BAD_TEMPLATE_FILE_PARAM = -25; + final static int ERROR_BAD_OUTPUT_FILE_PARAM = -26; + final static int ERROR_MISSING_TEMPLATE_FILE_PARAM = -27; + final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -28; + final static int ERROR_BAD_PROPERTY_PARAM = -29; + final static int ERROR_UNABLE_TO_OPEN_TEMPLATE = -30; + final static int ERROR_FILEWRITER_CREATE_FAILED = -31; - final static String TEMPLATE_FILE_PARAM = "template="; - final static String OUTPUT_FILE_PARAM = "output="; - final static String INSTALL_DIR_PARAM = "ATS_INSTALL_DIR="; - final static String INSTALL_DIR_PROPERTY = "ATS_INSTALL_DIR"; - final static String PROPERTY_FILE_PARAM = "propertyfile="; + final static String TEMPLATE_FILE_PARAM = "template="; + final static String OUTPUT_FILE_PARAM = "output="; + final static String INSTALL_DIR_PARAM = "ATS_INSTALL_DIR="; + final static String INSTALL_DIR_PROPERTY = "ATS_INSTALL_DIR"; + final static String PROPERTY_FILE_PARAM = "propertyfile="; + final static String ESCAPE_PATH_CHARS = "escape_path_chars="; - Properties properties; - File fileProperties; - FileInputStream fisProperties; - File fileTemplate; - File fileOutput; - File file; - //FileWriter fw; - RandomAccessFile raf; - String[] rgsSearchFor; - String[] rgsReplaceWith; - String sInstallDir; - String sTemplate; - String sOutput; - int rc; + Properties properties; + File fileProperties; + FileInputStream fisProperties; + File fileTemplate; + File fileOutput; + File file; + //FileWriter fw; + RandomAccessFile raf; + String[] rgsSearchFor; + String[] rgsReplaceWith; + String sInstallDir; + String sTemplate; + String sOutput; + int rc; + boolean escapePathCharsInReplaceString = false; - public static void main(String[] args) - { - InitConfigFile p = new InitConfigFile(args); - System.exit(p.rc); - } + public static void main(String[] args) + { + InitConfigFile p = new InitConfigFile(args); + System.exit(p.rc); + } - InitConfigFile(String[] args) - { - rc = ERROR_NO_ERROR; + InitConfigFile(String[] args) + { + rc = ERROR_NO_ERROR; - properties = new Properties(); - fileProperties = null; - fisProperties = null; - fileTemplate = null; - fileOutput = null; + properties = new Properties(); + fileProperties = null; + fisProperties = null; + fileTemplate = null; + fileOutput = null; - try - { - file = new File("c:\\test.log"); - //fw = new FileWriter(file); + try + { + file = new File("c:\\test.log"); + //fw = new FileWriter(file); - raf = new RandomAccessFile(file, "rw"); - raf.seek(raf.length()); + raf = new RandomAccessFile(file, "rw"); + raf.seek(raf.length()); - // Process the arguments - if (ERROR_NO_ERROR == (rc = processArgs(args))) - { - // Process the properties - if (ERROR_NO_ERROR == (rc = processProperties())) - { - rc = createOutputFile(); - } - } + // Process the arguments + if (ERROR_NO_ERROR == (rc = processArgs(args))) + { + // Process the properties + if (ERROR_NO_ERROR == (rc = processProperties())) + { + rc = createOutputFile(); + } + } - } - catch (IOException e) - { - rc = ERROR_IO_EXCEPTION; - } - finally - { - try - { - log(rc, " " + sOutput + "\n\n\n"); - raf.close(); - } - catch (Exception e1) - { - } - } - } + } + catch (IOException e) + { + rc = ERROR_IO_EXCEPTION; + } + finally + { + try + { + log(rc, " " + sOutput + "\n\n\n"); + raf.close(); + } + catch (Exception e1) + { + } + } + } - int processArgs(String[] argsOld) - { - String sProperties; - File fileInstallDir = null; - int iEquals; - String sKey; - String sValue; - int iOld; - int i; - String args[] = new String[argsOld.length]; - int iNew; + int processArgs(String[] argsOld) + { + String sProperties; + File fileInstallDir = null; + int iEquals; + String sKey; + String sValue; + int iOld; + int i; + String args[] = new String[argsOld.length]; + int iNew; - log("Original arg count " + argsOld.length); - for (i = 0; i < argsOld.length; i++) - { - log("Arg " + i + " = " + argsOld[i] + "\r\n"); - } + log("Original arg count " + argsOld.length); + for (i = 0; i < argsOld.length; i++) + { + log("Arg " + i + " = " + argsOld[i] + "\r\n"); + } - // Validate the number of parameters - if (argsOld.length < 2) - { - return ERROR_INVALID_NUMBER_OF_PARAMS; - } + // Validate the number of parameters + if (argsOld.length < 2) + { + return ERROR_INVALID_NUMBER_OF_PARAMS; + } - iNew = -1; - for (iOld = 0; iOld < argsOld.length; iOld++) - { - if (0 <= argsOld[iOld].indexOf("=")) - { - iNew++; - args[iNew] = argsOld[iOld]; - for (i = iOld + 1; i < argsOld.length && (-1 == argsOld[i].indexOf("=")); i++) - { - args[iNew] += " " + argsOld[i]; - } - } - } + iNew = -1; + for (iOld = 0; iOld < argsOld.length; iOld++) + { + if (0 <= argsOld[iOld].indexOf("=")) + { + iNew++; + args[iNew] = argsOld[iOld]; + for (i = iOld + 1; i < argsOld.length && (-1 == argsOld[i].indexOf("=")); i++) + { + args[iNew] += " " + argsOld[i]; + } + } + } - log("New arg count " + args.length); - for (i = 0; i < args.length; i++) - { - if (null == args[i]) - { - continue; - } + log("New arg count " + args.length); + for (i = 0; i < args.length; i++) + { + if (null == args[i]) + { + continue; + } - log("arg[" + i + "] = " +args[i]); + log("arg[" + i + "] = " +args[i]); - // is this the install dir param? - if (args[i].startsWith(INSTALL_DIR_PARAM)) - { - // Make sure it is more the the param tag - if (args[i].length() <= INSTALL_DIR_PARAM.length()) - { - return ERROR_BAD_INSTALL_DIR_PARAM; - } + // is this the install dir param? + if (args[i].startsWith(INSTALL_DIR_PARAM)) + { + // Make sure it is more the the param tag + if (args[i].length() <= INSTALL_DIR_PARAM.length()) + { + return ERROR_BAD_INSTALL_DIR_PARAM; + } - sInstallDir = args[i].substring(INSTALL_DIR_PARAM.length()).trim(); - fileInstallDir = new File(sInstallDir); + sInstallDir = args[i].substring(INSTALL_DIR_PARAM.length()).trim(); + fileInstallDir = new File(sInstallDir); - // Make sure the install dir can be found - if (!fileInstallDir.exists()) - { - return ERROR_MISSING_INSTALL_DIR; - } + // Make sure the install dir can be found + if (!fileInstallDir.exists()) + { + return ERROR_MISSING_INSTALL_DIR; + } - // Make sure the install dir is a directory - if (!fileInstallDir.isDirectory()) - { - return ERROR_INSTALL_DIR_NOT_A_DIR; - } + // Make sure the install dir is a directory + if (!fileInstallDir.isDirectory()) + { + return ERROR_INSTALL_DIR_NOT_A_DIR; + } - log("Adding property (key = " + INSTALL_DIR_PROPERTY + " - value = " + sInstallDir); - properties.setProperty(INSTALL_DIR_PROPERTY, sInstallDir); - } + log("Adding property (key = " + INSTALL_DIR_PROPERTY + " - value = " + sInstallDir); + properties.setProperty(INSTALL_DIR_PROPERTY, sInstallDir); + } - // is this the properties file param? - else if (args[i].startsWith(PROPERTY_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= PROPERTY_FILE_PARAM.length()) - { - return ERROR_BAD_PROPERTY_FILE_PARAM; - } + // is this the properties file param? + else if (args[i].startsWith(PROPERTY_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= PROPERTY_FILE_PARAM.length()) + { + return ERROR_BAD_PROPERTY_FILE_PARAM; + } - sProperties = args[i].substring(PROPERTY_FILE_PARAM.length()).trim(); - fileProperties = new File(sProperties); + sProperties = args[i].substring(PROPERTY_FILE_PARAM.length()).trim(); + fileProperties = new File(sProperties); - // Make sure the properties file can be found - if (!fileProperties.exists()) - { - return ERROR_MISSING_PROPERTIES_FILE; - } + // Make sure the properties file can be found + if (!fileProperties.exists()) + { + return ERROR_MISSING_PROPERTIES_FILE; + } - // Read the properties - try - { - fisProperties = new FileInputStream(fileProperties); - properties.load(fisProperties); - } - catch (IOException ioe) - { - return ERROR_UNABLE_TO_READ_PROPERTIES; - } - } + // Read the properties + try + { + fisProperties = new FileInputStream(fileProperties); + properties.load(fisProperties); + } + catch (IOException ioe) + { + return ERROR_UNABLE_TO_READ_PROPERTIES; + } + } - else if (args[i].startsWith(TEMPLATE_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= TEMPLATE_FILE_PARAM.length()) - { - return ERROR_BAD_TEMPLATE_FILE_PARAM; - } + else if (args[i].startsWith(TEMPLATE_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= TEMPLATE_FILE_PARAM.length()) + { + return ERROR_BAD_TEMPLATE_FILE_PARAM; + } - sTemplate = args[i].substring(TEMPLATE_FILE_PARAM.length()).trim(); - fileTemplate = new File(sTemplate); + sTemplate = args[i].substring(TEMPLATE_FILE_PARAM.length()).trim(); + fileTemplate = new File(sTemplate); - // Make sure the template file can be found - if (!fileTemplate.exists()) - { - log(ERROR_MISSING_TEMPLATE_FILE, sTemplate); - return ERROR_MISSING_TEMPLATE_FILE; - } - } + // Make sure the template file can be found + if (!fileTemplate.exists()) + { + log(ERROR_MISSING_TEMPLATE_FILE, sTemplate); + return ERROR_MISSING_TEMPLATE_FILE; + } + } - else if (args[i].startsWith(OUTPUT_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= OUTPUT_FILE_PARAM.length()) - { - return ERROR_BAD_OUTPUT_FILE_PARAM; - } + else if (args[i].startsWith(OUTPUT_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= OUTPUT_FILE_PARAM.length()) + { + return ERROR_BAD_OUTPUT_FILE_PARAM; + } - sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); - fileOutput = new File(sOutput); - } + sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); + fileOutput = new File(sOutput); + } - // Handle additional parameters - else - { - if (-1 == (iEquals = args[i].indexOf("=")) || - 0 == iEquals || - args[i].length() == iEquals) - { - return ERROR_BAD_PROPERTY_PARAM; - } - sKey = args[i].substring(0, iEquals); - sValue = args[i].substring(iEquals + 1); - log("Adding property (key = " + sKey + " - value = " + sValue); - properties.setProperty(sKey, sValue); - } - } + else if (args[i].startsWith(ESCAPE_PATH_CHARS)) + { + // Make sure it is more than the param tag + if (args[i].length() <= OUTPUT_FILE_PARAM.length()) + { + return ERROR_BAD_OUTPUT_FILE_PARAM; + } - // Make sure we got an install dir - if (null == fileInstallDir) - { - return ERROR_MISSING_INSTALL_DIR_PARAM; - } + String value = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); + if (value.equalsIgnoreCase("true")) + { + escapePathCharsInReplaceString = true; + } + } - // Make sure we got a template file - if (null == fileTemplate) - { - return ERROR_MISSING_TEMPLATE_FILE_PARAM; - } + // Handle additional parameters + else + { + if (-1 == (iEquals = args[i].indexOf("=")) || + 0 == iEquals || + args[i].length() == iEquals) + { + return ERROR_BAD_PROPERTY_PARAM; + } + sKey = args[i].substring(0, iEquals); + sValue = args[i].substring(iEquals + 1); + log("Adding property (key = " + sKey + " - value = " + sValue); + properties.setProperty(sKey, sValue); + } + } - // Make sure we got an output file - if (null == fileOutput) - { - return ERROR_MISSING_OUTPUT_FILE_PARAM; - } + // Make sure we got an install dir + if (null == fileInstallDir) + { + return ERROR_MISSING_INSTALL_DIR_PARAM; + } - // Note: the properties file parameter is optional + // Make sure we got a template file + if (null == fileTemplate) + { + return ERROR_MISSING_TEMPLATE_FILE_PARAM; + } - return ERROR_NO_ERROR; - } + // Make sure we got an output file + if (null == fileOutput) + { + return ERROR_MISSING_OUTPUT_FILE_PARAM; + } - int processProperties() - { - try - { - Enumeration e; - String sKey; - String sValue; - int i = 0; + // Note: the properties file parameter is optional - e = properties.propertyNames(); + return ERROR_NO_ERROR; + } - rgsSearchFor = new String[properties.size()]; - rgsReplaceWith = new String[properties.size()]; + int processProperties() + { + try + { + Enumeration e; + String sKey; + String sValue; + int i = 0; - log("property count = " + properties.size()); - while (e.hasMoreElements()) - { - sKey = (String)e.nextElement(); - sValue = (String)properties.get(sKey); + e = properties.propertyNames(); - log("Property key = " + sKey + " Value = " + sValue); + rgsSearchFor = new String[properties.size()]; + rgsReplaceWith = new String[properties.size()]; - rgsSearchFor[i] = sKey; - rgsReplaceWith[i] = sValue; - i++; - } - } - catch (Exception ex1) - { - return -111; - } + log("property count = " + properties.size()); + while (e.hasMoreElements()) + { + sKey = (String)e.nextElement(); + sValue = (String)properties.get(sKey); - return ERROR_NO_ERROR; - } + log("Property key = " + sKey + " Value = " + sValue); - int createOutputFile() - { - LineNumberReader lnr = null; - FileWriter fwOutput = null; - String sLineTemplate; - String sLineOutput; - int iSearchFor; - int i; + rgsSearchFor[i] = sKey; + if (escapePathCharsInReplaceString) + { + rgsReplaceWith[i] = sValue.replace("\\", "\\\\"); + } + else + { + rgsReplaceWith[i] = sValue; + } + i++; + } + } + catch (Exception ex1) + { + return -111; + } - try - { - // Open the files - lnr = new LineNumberReader(new FileReader(fileTemplate)); - } - catch (Exception e) - { - return ERROR_UNABLE_TO_OPEN_TEMPLATE; - } + return ERROR_NO_ERROR; + } - try - { - fwOutput = new FileWriter(fileOutput); - } - catch (Exception e) - { - return ERROR_FILEWRITER_CREATE_FAILED; - } - try - { - // For each line of text in the template file... - while (null != (sLineTemplate = lnr.readLine())) - { - sLineOutput = sLineTemplate; - log("<-- " + sLineOutput); + int createOutputFile() + { + LineNumberReader lnr = null; + FileWriter fwOutput = null; + String sLineTemplate; + String sLineOutput; + int iSearchFor; + int i; - // For each term to be replaced... - for (i = 0; i < rgsSearchFor.length; i++) - { - log("searching for " + rgsSearchFor[i]); - // Replace all instances of the term on the line - while (-1 != (iSearchFor = sLineOutput.indexOf(rgsSearchFor[i]))) - { - log("replacing " + rgsSearchFor[i] + " at position " + iSearchFor + " with " + rgsReplaceWith[i]); - sLineOutput = sLineOutput.substring(0, iSearchFor) + rgsReplaceWith[i] + - sLineOutput.substring(iSearchFor + rgsSearchFor[i].length()); - } - } - try - { - fwOutput.write(sLineOutput + "\r\n"); - log("--> " + sLineOutput); - } - catch (Exception e) - { - return -42; - } - } + try + { + // Open the files + lnr = new LineNumberReader(new FileReader(fileTemplate)); + } + catch (Exception e) + { + return ERROR_UNABLE_TO_OPEN_TEMPLATE; + } - // Clean up - fwOutput.flush(); - fwOutput.close(); - lnr.close(); - } - catch (Exception e) - { - return ERROR_OUTPUT_COPY_FAILED; - } - return ERROR_NO_ERROR; - } + try + { + fwOutput = new FileWriter(fileOutput); + } + catch (Exception e) + { + return ERROR_FILEWRITER_CREATE_FAILED; + } + try + { + // For each line of text in the template file... + while (null != (sLineTemplate = lnr.readLine())) + { + sLineOutput = sLineTemplate; + log("<-- " + sLineOutput); - void log(int err) - { - log(err, null); - } + // For each term to be replaced... + for (i = 0; i < rgsSearchFor.length; i++) + { + log("searching for " + rgsSearchFor[i]); + // Replace all instances of the term on the line + while (-1 != (iSearchFor = sLineOutput.indexOf(rgsSearchFor[i]))) + { + log("replacing " + rgsSearchFor[i] + " at position " + iSearchFor + " with " + rgsReplaceWith[i]); + sLineOutput = sLineOutput.substring(0, iSearchFor) + rgsReplaceWith[i] + + sLineOutput.substring(iSearchFor + rgsSearchFor[i].length()); + } + } + try + { + fwOutput.write(sLineOutput + "\r\n"); + log("--> " + sLineOutput); + } + catch (Exception e) + { + return -42; + } + } - void log(int err, String s) - { - String sMessage = ""; + // Clean up + fwOutput.flush(); + fwOutput.close(); + lnr.close(); + } + catch (Exception e) + { + return ERROR_OUTPUT_COPY_FAILED; + } + return ERROR_NO_ERROR; + } - switch (err) - { - case ERROR_NO_ERROR: - sMessage = "No error"; - break; - case ERROR_INVALID_NUMBER_OF_PARAMS: - sMessage = "Invalid number of parameters: 4 expected"; - break; - case ERROR_MISSING_TEMPLATE: - sMessage = "Template file not found"; - break; - case ERROR_OUTPUT_PROPERTY_MISSING: - sMessage = "Output file parameter missing"; - break; - case ERROR_OUTPUT_COPY_FAILED: - sMessage = "Unable to create output file"; - break; - case ERROR_IO_EXCEPTION: - sMessage = "IOException"; - break; - case ERROR_MISSING_PROPERTIES: - sMessage = "Properties file not found"; - break; - case ERROR_MISSING_TEMPLATE_FILE: - sMessage = "Missing template file"; - break; - case ERROR_PROPERTIES_FILE_IS_EMPTY: - sMessage = "Properties file is empty"; - break; - case ERROR_MISSING_INSTALL_DIR: - sMessage = "Missing install dir"; - break; - case ERROR_INSTALL_DIR_NOT_A_DIR: - sMessage = "Install directory is not a directory"; - break; - case ERROR_BAD_INSTALL_DIR_PARAM: - sMessage = "Bad install directory parameter"; - break; - case ERROR_BAD_PROPERTY_FILE_PARAM: - sMessage = "Bad property file parameter"; - break; - case ERROR_MISSING_PROPERTIES_FILE: - sMessage = "Missing properties file"; - break; - case ERROR_MISSING_INSTALL_DIR_PARAM: - sMessage = "Missing install directory parameter"; - break; - case ERROR_MISSING_PROPERTY_FILE_PARAM: - sMessage = "Missing property file parameter"; - break; - case ERROR_BAD_TEMPLATE_FILE_PARAM: - sMessage = "Bad template file parameter"; - break; - case ERROR_BAD_OUTPUT_FILE_PARAM: - sMessage = "Bad output file parameter"; - break; - case ERROR_MISSING_TEMPLATE_FILE_PARAM: - sMessage = "Missing template file parameter"; - break; - case ERROR_MISSING_OUTPUT_FILE_PARAM: - sMessage = "Missing output file parameter"; - break; - case ERROR_BAD_PROPERTY_PARAM: - sMessage = "Bad property parameter"; - break; - case ERROR_UNABLE_TO_READ_PROPERTIES: - sMessage = "Unable to read properties file"; - break; - case ERROR_UNABLE_TO_OPEN_TEMPLATE: - sMessage = "Unable to open template"; - break; - case ERROR_FILEWRITER_CREATE_FAILED: - sMessage = "FileWriter create failed"; - break; - default: - sMessage = "Unknown error: " + err; - break; - } + void log(int err) + { + log(err, null); + } - if (null != s) - { - sMessage = sMessage + s; - } - log(sMessage); - } + void log(int err, String s) + { + String sMessage = ""; - void log(String s) - { - try - { - raf.writeUTF(this.getClass().getName() + ": " + s + "\r\n"); - } - catch (IOException ioe) - { - } - } + switch (err) + { + case ERROR_NO_ERROR: + sMessage = "No error"; + break; + case ERROR_INVALID_NUMBER_OF_PARAMS: + sMessage = "Invalid number of parameters: 4 expected"; + break; + case ERROR_MISSING_TEMPLATE: + sMessage = "Template file not found"; + break; + case ERROR_OUTPUT_PROPERTY_MISSING: + sMessage = "Output file parameter missing"; + break; + case ERROR_OUTPUT_COPY_FAILED: + sMessage = "Unable to create output file"; + break; + case ERROR_IO_EXCEPTION: + sMessage = "IOException"; + break; + case ERROR_MISSING_PROPERTIES: + sMessage = "Properties file not found"; + break; + case ERROR_MISSING_TEMPLATE_FILE: + sMessage = "Missing template file"; + break; + case ERROR_PROPERTIES_FILE_IS_EMPTY: + sMessage = "Properties file is empty"; + break; + case ERROR_MISSING_INSTALL_DIR: + sMessage = "Missing install dir"; + break; + case ERROR_INSTALL_DIR_NOT_A_DIR: + sMessage = "Install directory is not a directory"; + break; + case ERROR_BAD_INSTALL_DIR_PARAM: + sMessage = "Bad install directory parameter"; + break; + case ERROR_BAD_PROPERTY_FILE_PARAM: + sMessage = "Bad property file parameter"; + break; + case ERROR_MISSING_PROPERTIES_FILE: + sMessage = "Missing properties file"; + break; + case ERROR_MISSING_INSTALL_DIR_PARAM: + sMessage = "Missing install directory parameter"; + break; + case ERROR_MISSING_PROPERTY_FILE_PARAM: + sMessage = "Missing property file parameter"; + break; + case ERROR_BAD_TEMPLATE_FILE_PARAM: + sMessage = "Bad template file parameter"; + break; + case ERROR_BAD_OUTPUT_FILE_PARAM: + sMessage = "Bad output file parameter"; + break; + case ERROR_MISSING_TEMPLATE_FILE_PARAM: + sMessage = "Missing template file parameter"; + break; + case ERROR_MISSING_OUTPUT_FILE_PARAM: + sMessage = "Missing output file parameter"; + break; + case ERROR_BAD_PROPERTY_PARAM: + sMessage = "Bad property parameter"; + break; + case ERROR_UNABLE_TO_READ_PROPERTIES: + sMessage = "Unable to read properties file"; + break; + case ERROR_UNABLE_TO_OPEN_TEMPLATE: + sMessage = "Unable to open template"; + break; + case ERROR_FILEWRITER_CREATE_FAILED: + sMessage = "FileWriter create failed"; + break; + default: + sMessage = "Unknown error: " + err; + break; + } + + if (null != s) + { + sMessage = sMessage + s; + } + log(sMessage); + } + + void log(String s) + { + try + { + raf.writeUTF(this.getClass().getName() + ": " + s + "\r\n"); + } + catch (IOException ioe) + { + } + } } diff --git a/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/MungeCryptoPropertiesFilePath.java b/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/MungeCryptoPropertiesFilePath.java index 7b418e1e..b42cfd9b 100644 --- a/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/MungeCryptoPropertiesFilePath.java +++ b/CASA-auth-token/server-java/package/windows/MungeCryptoPropertiesFilePath/MungeCryptoPropertiesFilePath.java @@ -18,7 +18,7 @@ * To contact Novell about this file by physical or electronic mail, * you may find current contact information at www.novell.com. * - * Author: Juan Carlos Luciani + * Author: Greg Richardson * ***********************************************************************/ @@ -30,311 +30,311 @@ import java.util.*; */ public class MungeCryptoPropertiesFilePath { - final static int ERROR_NO_ERROR = 0; - final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; - final static int ERROR_MISSING_INPUT_FILE = -2; - final static int ERROR_OUTPUT_COPY_FAILED = -3; - final static int ERROR_IO_EXCEPTION = -4; - final static int ERROR_BAD_INPUT_FILE_PARAM = -5; - final static int ERROR_BAD_OUTPUT_FILE_PARAM = -6; - final static int ERROR_MISSING_INPUT_FILE_PARAM = -7; - final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -8; - final static int ERROR_CANNOT_READ_FILE = -9; - final static int ERROR_CANNOT_CREATE_FILE = -10; + final static int ERROR_NO_ERROR = 0; + final static int ERROR_INVALID_NUMBER_OF_PARAMS = -1; + final static int ERROR_MISSING_INPUT_FILE = -2; + final static int ERROR_OUTPUT_COPY_FAILED = -3; + final static int ERROR_IO_EXCEPTION = -4; + final static int ERROR_BAD_INPUT_FILE_PARAM = -5; + final static int ERROR_BAD_OUTPUT_FILE_PARAM = -6; + final static int ERROR_MISSING_INPUT_FILE_PARAM = -7; + final static int ERROR_MISSING_OUTPUT_FILE_PARAM = -8; + final static int ERROR_CANNOT_READ_FILE = -9; + final static int ERROR_CANNOT_CREATE_FILE = -10; - final static String INPUT_FILE_PARAM = "input="; - final static String OUTPUT_FILE_PARAM = "output="; - final static String FILE_KEY = "org.apache.ws.security.crypto.merlin.file="; + final static String INPUT_FILE_PARAM = "input="; + final static String OUTPUT_FILE_PARAM = "output="; + final static String FILE_KEY = "org.apache.ws.security.crypto.merlin.file="; - File fileInput; - File fileOutput; - File file; - FileWriter fw; - String sInput; - String sOutput; - int rc; + File fileInput; + File fileOutput; + File file; + FileWriter fw; + String sInput; + String sOutput; + int rc; - public static void main(String[] args) - { - MungeCryptoPropertiesFilePath p = new MungeCryptoPropertiesFilePath(args); - System.exit(p.rc); - } + public static void main(String[] args) + { + MungeCryptoPropertiesFilePath p = new MungeCryptoPropertiesFilePath(args); + System.exit(p.rc); + } - MungeCryptoPropertiesFilePath(String[] args) - { - rc = ERROR_NO_ERROR; + MungeCryptoPropertiesFilePath(String[] args) + { + rc = ERROR_NO_ERROR; - fileInput = null; - fileOutput = null; + fileInput = null; + fileOutput = null; - try - { - file = new File("c:\\test5.log"); - fw = new FileWriter(file); + try + { + file = new File("c:\\test5.log"); + fw = new FileWriter(file); - log("Here we go: " + args.length); - for (int i = 0; i < args.length; i++) - { - log("Arg " + i + " = " + args[i]); - } + log("Here we go: " + args.length); + for (int i = 0; i < args.length; i++) + { + log("Arg " + i + " = " + args[i]); + } - // Process the arguments - if (ERROR_NO_ERROR == (rc = processArgs(args))) - { - // Process the file - rc = createOutputFile(); - } + // Process the arguments + if (ERROR_NO_ERROR == (rc = processArgs(args))) + { + // Process the file + rc = createOutputFile(); + } - } - catch (IOException e) - { - rc = ERROR_IO_EXCEPTION; - } - finally - { - try - { - log(rc); - fw.flush(); - fw.close(); - } - catch (Exception e1) - { - } - } - } + } + catch (IOException e) + { + rc = ERROR_IO_EXCEPTION; + } + finally + { + try + { + log(rc); + fw.flush(); + fw.close(); + } + catch (Exception e1) + { + } + } + } - int processArgs(String[] argsOld) - { - int iOld; - int i; - String args[] = new String[argsOld.length]; - int iNew; + int processArgs(String[] argsOld) + { + int iOld; + int i; + String args[] = new String[argsOld.length]; + int iNew; - log("Original arg count " + argsOld.length); - for (i = 0; i < argsOld.length; i++) - { - log("Arg " + i + " = " + argsOld[i] + "\r\n"); - } + log("Original arg count " + argsOld.length); + for (i = 0; i < argsOld.length; i++) + { + log("Arg " + i + " = " + argsOld[i] + "\r\n"); + } - // Validate the number of parameters - if (argsOld.length < 2) - { - return ERROR_INVALID_NUMBER_OF_PARAMS; - } + // Validate the number of parameters + if (argsOld.length < 2) + { + return ERROR_INVALID_NUMBER_OF_PARAMS; + } - iNew = -1; - for (iOld = 0; iOld < argsOld.length; iOld++) - { - if (0 <= argsOld[iOld].indexOf("=")) - { - iNew++; - args[iNew] = argsOld[iOld]; - for (i = iOld + 1; i < argsOld.length && (-1 == argsOld[i].indexOf("=")); i++) - { - args[iNew] += " " + argsOld[i]; - } - } - } + iNew = -1; + for (iOld = 0; iOld < argsOld.length; iOld++) + { + if (0 <= argsOld[iOld].indexOf("=")) + { + iNew++; + args[iNew] = argsOld[iOld]; + for (i = iOld + 1; i < argsOld.length && (-1 == argsOld[i].indexOf("=")); i++) + { + args[iNew] += " " + argsOld[i]; + } + } + } - log("New arg count " + args.length); - for (i = 0; i < args.length; i++) - { - log("Arg " + i + " = " + args[i] + "\r\n"); - } + log("New arg count " + args.length); + for (i = 0; i < args.length; i++) + { + log("Arg " + i + " = " + args[i] + "\r\n"); + } - for (i = 0; i <= iNew; i++) - { - log("arg[" + i + "] = " +args[i]); + for (i = 0; i <= iNew; i++) + { + log("arg[" + i + "] = " +args[i]); - if (args[i].startsWith(INPUT_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= INPUT_FILE_PARAM.length()) - { - return ERROR_BAD_INPUT_FILE_PARAM; - } + if (args[i].startsWith(INPUT_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= INPUT_FILE_PARAM.length()) + { + return ERROR_BAD_INPUT_FILE_PARAM; + } - sInput = args[i].substring(INPUT_FILE_PARAM.length()).trim(); - fileInput = new File(sInput); + sInput = args[i].substring(INPUT_FILE_PARAM.length()).trim(); + fileInput = new File(sInput); - // Make sure the input file can be found - if (!fileInput.exists()) - { - log(ERROR_MISSING_INPUT_FILE, sInput); - return ERROR_MISSING_INPUT_FILE; - } - } + // Make sure the input file can be found + if (!fileInput.exists()) + { + log(ERROR_MISSING_INPUT_FILE, sInput); + return ERROR_MISSING_INPUT_FILE; + } + } - else if (args[i].startsWith(OUTPUT_FILE_PARAM)) - { - // Make sure it is more than the param tag - if (args[i].length() <= OUTPUT_FILE_PARAM.length()) - { - return ERROR_BAD_OUTPUT_FILE_PARAM; - } + else if (args[i].startsWith(OUTPUT_FILE_PARAM)) + { + // Make sure it is more than the param tag + if (args[i].length() <= OUTPUT_FILE_PARAM.length()) + { + return ERROR_BAD_OUTPUT_FILE_PARAM; + } - sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); - fileOutput = new File(sOutput); - } - } + sOutput = args[i].substring(OUTPUT_FILE_PARAM.length()).trim(); + fileOutput = new File(sOutput); + } + } - // Make sure we got an input file - if (null == fileInput) - { - return ERROR_MISSING_INPUT_FILE_PARAM; - } + // Make sure we got an input file + if (null == fileInput) + { + return ERROR_MISSING_INPUT_FILE_PARAM; + } - // Make sure we got an output file - if (null == fileOutput) - { - return ERROR_MISSING_OUTPUT_FILE_PARAM; - } + // Make sure we got an output file + if (null == fileOutput) + { + return ERROR_MISSING_OUTPUT_FILE_PARAM; + } - return ERROR_NO_ERROR; - } + return ERROR_NO_ERROR; + } - int createOutputFile() - { - LineNumberReader lnr = null; - FileWriter fwOutput = null; - String sLineTemplate; - String sLineOutput; - int iSearchFor; + int createOutputFile() + { + LineNumberReader lnr = null; + FileWriter fwOutput = null; + String sLineTemplate; + String sLineOutput; + int iSearchFor; - try - { - // Open the file - lnr = new LineNumberReader(new FileReader(fileInput)); - } - catch (Exception e) - { - return ERROR_CANNOT_READ_FILE; - } + try + { + // Open the file + lnr = new LineNumberReader(new FileReader(fileInput)); + } + catch (Exception e) + { + return ERROR_CANNOT_READ_FILE; + } - try - { - fwOutput = new FileWriter(fileOutput); - } - catch (Exception e) - { - return ERROR_CANNOT_CREATE_FILE; - } - try - { - // For each line of text in the template file... - while (null != (sLineTemplate = lnr.readLine())) - { - sLineOutput = sLineTemplate; - log("<-- " + sLineOutput); + try + { + fwOutput = new FileWriter(fileOutput); + } + catch (Exception e) + { + return ERROR_CANNOT_CREATE_FILE; + } + try + { + // For each line of text in the template file... + while (null != (sLineTemplate = lnr.readLine())) + { + sLineOutput = sLineTemplate; + log("<-- " + sLineOutput); - if (sLineOutput.trim().startsWith(FILE_KEY)) - { - // Replace all instances of the line separator on the line - while (-1 != (iSearchFor = sLineOutput.indexOf("\\"))) - { - log("replacing \\ at position " + iSearchFor + " with //"); - sLineOutput = sLineOutput.substring(0, iSearchFor) + "//" + - sLineOutput.substring(iSearchFor + 1); - } - } - try - { - fwOutput.write(sLineOutput + "\r\n"); - log("--> " + sLineOutput); - } - catch (Exception e) - { - return -42; - } - } + if (sLineOutput.trim().startsWith(FILE_KEY)) + { + // Replace all instances of the line separator on the line + while (-1 != (iSearchFor = sLineOutput.indexOf("\\"))) + { + log("replacing \\ at position " + iSearchFor + " with //"); + sLineOutput = sLineOutput.substring(0, iSearchFor) + "//" + + sLineOutput.substring(iSearchFor + 1); + } + } + try + { + fwOutput.write(sLineOutput + "\r\n"); + log("--> " + sLineOutput); + } + catch (Exception e) + { + return -42; + } + } - // Clean up - fwOutput.flush(); - fwOutput.close(); - lnr.close(); - } - catch (Exception e) - { - return ERROR_OUTPUT_COPY_FAILED; - } - return ERROR_NO_ERROR; - } + // Clean up + fwOutput.flush(); + fwOutput.close(); + lnr.close(); + } + catch (Exception e) + { + return ERROR_OUTPUT_COPY_FAILED; + } + return ERROR_NO_ERROR; + } - void log(int err) - { - log(err, null); - } + void log(int err) + { + log(err, null); + } - void log(int err, String s) - { - String sMessage = ""; + void log(int err, String s) + { + String sMessage = ""; - switch (err) - { - case ERROR_NO_ERROR: - sMessage = "No error"; - break; - case ERROR_INVALID_NUMBER_OF_PARAMS: - sMessage = "Invalid number of parameters: 2 expected"; - break; + switch (err) + { + case ERROR_NO_ERROR: + sMessage = "No error"; + break; + case ERROR_INVALID_NUMBER_OF_PARAMS: + sMessage = "Invalid number of parameters: 2 expected"; + break; - case ERROR_MISSING_INPUT_FILE: - sMessage = "Missing input file"; - break; + case ERROR_MISSING_INPUT_FILE: + sMessage = "Missing input file"; + break; - case ERROR_OUTPUT_COPY_FAILED: - sMessage = "Unable to create output file"; - break; + case ERROR_OUTPUT_COPY_FAILED: + sMessage = "Unable to create output file"; + break; - case ERROR_IO_EXCEPTION: - sMessage = "IOException"; - break; + case ERROR_IO_EXCEPTION: + sMessage = "IOException"; + break; - case ERROR_BAD_INPUT_FILE_PARAM: - sMessage = "Invalid input file parameter"; - break; + case ERROR_BAD_INPUT_FILE_PARAM: + sMessage = "Invalid input file parameter"; + break; - case ERROR_BAD_OUTPUT_FILE_PARAM: - sMessage = "Invalid output file parameter"; - break; + case ERROR_BAD_OUTPUT_FILE_PARAM: + sMessage = "Invalid output file parameter"; + break; - case ERROR_MISSING_INPUT_FILE_PARAM: - sMessage = "Missing input file parameter"; - break; + case ERROR_MISSING_INPUT_FILE_PARAM: + sMessage = "Missing input file parameter"; + break; - case ERROR_MISSING_OUTPUT_FILE_PARAM: - sMessage = "Missing output file parameter"; - break; + case ERROR_MISSING_OUTPUT_FILE_PARAM: + sMessage = "Missing output file parameter"; + break; - case ERROR_CANNOT_READ_FILE: - sMessage = "Cannot read file"; - break; + case ERROR_CANNOT_READ_FILE: + sMessage = "Cannot read file"; + break; - case ERROR_CANNOT_CREATE_FILE: - sMessage = "Cannot create file"; - break; + case ERROR_CANNOT_CREATE_FILE: + sMessage = "Cannot create file"; + break; - default: - sMessage = "Unknown error: " + err; - break; - } + default: + sMessage = "Unknown error: " + err; + break; + } - if (null != s) - { - sMessage = sMessage + s; - } - log(sMessage); - } + if (null != s) + { + sMessage = sMessage + s; + } + log(sMessage); + } - void log(String s) - { - try - { - fw.write(this.getClass().getName() + ": " + s + "\r\n"); - } - catch (IOException ioe) - { - } - } + void log(String s) + { + try + { + fw.write(this.getClass().getName() + ": " + s + "\r\n"); + } + catch (IOException ioe) + { + } + } } diff --git a/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj b/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj index 5deeb0d1..ad4da80b 100644 --- a/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj +++ b/CASA-auth-token/server-java/package/windows/server-java_msi/server-java_msi.vdproj @@ -473,7 +473,7 @@ "Object" = "8:_32E2D317FBCD4B25904D5402E547B8A8" "FileType" = "3:2" "InstallAction" = "3:1" - "Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin InitConfigFile ATS_INSTALL_DIR=[TARGETDIR] propertyfile=[PROPERTYFILE] template=[TARGETDIR]ats\\etc\\svc\\templates\\log4j.properties output=[TARGETDIR]ats\\etc\\log4j.properties" + "Arguments" = "8:[ATS_JAVA_EXE] -cp [TARGETDIR]ats\\bin InitConfigFile ATS_INSTALL_DIR=[TARGETDIR] escape_path_chars=true propertyfile=[PROPERTYFILE] template=[TARGETDIR]ats\\etc\\svc\\templates\\log4j.properties output=[TARGETDIR]ats\\etc\\log4j.properties" "EntryPoint" = "8:" "Sequence" = "3:17" "Identifier" = "8:_EB425F32_F807_4C36_AC86_B75AEEEC7D29" @@ -2787,8 +2787,5 @@ "ProjectOutput" { } - "VJSharpPlugin" - { - } } }