From 81eaece05bf3b5adf54adc4ad0f43980aa8c889e Mon Sep 17 00:00:00 2001 From: Juan Carlos Luciani Date: Mon, 4 Jun 2007 16:21:10 +0000 Subject: [PATCH] Updated the CASA_Auth_Token_Svc Windows Install to also install a casa_crypto.properties file for the use of consumers of the Jaas module. --- .../windows/casa_crypto.properties | 0 .../AtsConfigurator/src/Configure.java | 11 ++- .../server-java_msi/server-java_msi.vdproj | 80 ++++++++++++------- 3 files changed, 60 insertions(+), 31 deletions(-) rename CASA-auth-token/server-java/Svc/{ => templates}/windows/casa_crypto.properties (100%) diff --git a/CASA-auth-token/server-java/Svc/windows/casa_crypto.properties b/CASA-auth-token/server-java/Svc/templates/windows/casa_crypto.properties similarity index 100% rename from CASA-auth-token/server-java/Svc/windows/casa_crypto.properties rename to CASA-auth-token/server-java/Svc/templates/windows/casa_crypto.properties 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 e47362a0..b9ff0115 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 @@ -425,12 +425,15 @@ public class Configure if (AtsConfigurator.ERROR_NO_ERROR == (rc = createFileFromTemplate(new File(installDir + "\\etc\\svc\\templates\\jaas.conf"), new File(installDir + "\\etc\\svc\\jaas.conf"), false, false))) - if (AtsConfigurator.ERROR_NO_ERROR == (rc = createFileFromTemplate(new File(installDir + "\\etc\\svc\\templates\\casa_crypto.properties"), + if (AtsConfigurator.ERROR_NO_ERROR == (rc = createFileFromTemplate(new File(installDir + "\\etc\\svc\\templates\\svc_casa_crypto.properties"), new File(installDir + "\\etc\\svc\\casa_crypto.properties"), false, true))) - rc = createFileFromTemplate(new File(installDir + "\\etc\\svc\\templates\\log4j.properties"), - new File(installDir + "\\etc\\svc\\log4j.properties"), - true, false); + if (AtsConfigurator.ERROR_NO_ERROR == (rc = createFileFromTemplate(new File(installDir + "\\etc\\svc\\templates\\client_casa_crypto.properties"), + new File(installDir + "\\etc\\keys\\client\\casa_crypto.properties"), + false, true))) + rc = createFileFromTemplate(new File(installDir + "\\etc\\svc\\templates\\log4j.properties"), + new File(installDir + "\\etc\\svc\\log4j.properties"), + true, false); AtsConfigurator.log("Configure.setupRelocatableFiles()- End, rc= ", rc); 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 be7f510e..9b823e51 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 @@ -33,6 +33,12 @@ } "Entry" { + "MsmKey" = "8:_0F961F0324F646B68CFDE891DB379A4C" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_1BAF79282CEA4AC38841EAE3919040F6" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -135,6 +141,12 @@ } "Entry" { + "MsmKey" = "8:_9DC9E508D5A648FCB5100D76F958B673" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B29E25690B014C0B846CFC4698D08846" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -159,12 +171,6 @@ } "Entry" { - "MsmKey" = "8:_D945234C1C494DDCAB2C8537CE4D1C1C" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E00CC04C64B2411796A9318A7713874A" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -359,6 +365,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F961F0324F646B68CFDE891DB379A4C" + { + "SourcePath" = "8:..\\..\\..\\Svc\\templates\\windows\\casa_crypto.properties" + "TargetName" = "8:svc_casa_crypto.properties" + "Tag" = "8:" + "Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1BAF79282CEA4AC38841EAE3919040F6" { "SourcePath" = "8:..\\..\\..\\lib\\java\\AtsConfigurator.jar" @@ -699,6 +725,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9DC9E508D5A648FCB5100D76F958B673" + { + "SourcePath" = "8:..\\..\\..\\Jaas\\windows\\casa_crypto.properties" + "TargetName" = "8:client_casa_crypto.properties" + "Tag" = "8:" + "Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B29E25690B014C0B846CFC4698D08846" { "SourcePath" = "8:..\\..\\..\\Svc\\tomcat5\\conf\\catalina.properties" @@ -779,26 +825,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D945234C1C494DDCAB2C8537CE4D1C1C" - { - "SourcePath" = "8:..\\..\\..\\Svc\\windows\\casa_crypto.properties" - "TargetName" = "8:casa_crypto.properties" - "Tag" = "8:" - "Folder" = "8:_DB2EB303AA7A4FA0874CCF7DE23125AB" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E00CC04C64B2411796A9318A7713874A" { "SourcePath" = "8:..\\..\\..\\Svc\\external\\xmlsec\\xml-security-1_4_0\\libs\\commons-logging.jar" @@ -1299,7 +1325,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:CasaAuthTokenSvc" "ProductCode" = "8:{612DE811-B264-4AD8-A604-F39BB12C2794}" - "PackageCode" = "8:{F09E6A3D-9390-4298-AD25-D741434E8039}" + "PackageCode" = "8:{04AFFCE7-6B44-4368-A840-E741C6224EF7}" "UpgradeCode" = "8:{C1AC5463-D9A1-46F2-BFFD-109DFDE54684}" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:FALSE"