[Fedora-directory-commits] fedora-idm-console/win Console.wxs, 1.2, 1.3 Makefile, 1.2, 1.3
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console/win
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24937/win
Modified Files:
Console.wxs Makefile
Log Message:
Resolves: bug 476095
Description: upgrade components for rhds 8.1
Fix Description: Updated fedora-idm-console to version 1.1.2
Updated windows console to use the new wix version 2 (3 is currently still in beta) from wix.sourceforge.net
Updated windows console to use new NSPR, NSS, JSS
Updated windows console package to be able to upgrade an existing installation
Updated Makefile to use the Windows bitsadmin program (provided in the XP or Server support package) to download components from the component filer
Index: Console.wxs
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/Console.wxs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Console.wxs 4 Sep 2007 21:30:54 -0000 1.2
+++ Console.wxs 3 Feb 2009 16:19:07 -0000 1.3
@@ -1,198 +1,234 @@
-<?xml version='1.0' encoding='windows-1252'?>
-<!-- BEGIN COPYRIGHT BLOCK
- This Program is free software; you can redistribute it and/or modify it under
- the terms of the GNU General Public License as published by the Free Software
- Foundation; version 2 of the License.
-
- This Program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with
- this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- Place, Suite 330, Boston, MA 02111-1307 USA.
-
- In addition, as a special exception, Red Hat, Inc. gives You the additional
- right to link the code of this Program with code not covered under the GNU
- General Public License ("Non-GPL Code") and to distribute linked combinations
- including the two, subject to the limitations in this paragraph. Non-GPL Code
- permitted under this exception must only link to the code of this Program
- through those well defined interfaces identified in the file named EXCEPTION
- found in the source code files (the "Approved Interfaces"). The files of
- Non-GPL Code may instantiate templates or use macros or inline functions from
- the Approved Interfaces without causing the resulting work to be covered by
- the GNU General Public License. Only Red Hat, Inc. may make changes or
- additions to the list of Approved Interfaces. You must obey the GNU General
- Public License in all respects for all of the Program code and other code used
- in conjunction with the Program except the Non-GPL Code covered by this
- exception. If you modify this file, you may extend this exception to your
- version of the file, but you are not obligated to do so. If you do not wish to
- provide this exception without modification, you must delete this exception
- statement from your version and license this file solely under the GPL without
- exception.
-
-
- Copyright (C) 2007 Red Hat, Inc.
- All rights reserved.
- END COPYRIGHT BLOCK -->
-<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
- <Product Name='Fedora Identity Management Console' Id='5B5D4E30-55E2-49c1-84B3-10C1CE56907F'
- Language='1033' Codepage='1252' UpgradeCode='7EA828C0-C219-438d-9BB3-3418DC900D60'
- Version='1.1.0' Manufacturer='Fedora Project'>
-
- <Package Id='????????-????-????-????-????????????' Keywords='Installer'
- Description="Fedora Identity Management Console Installer"
- Manufacturer='Fedora Project'
- InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
-
- <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
- <Property Id='DiskPrompt' Value="Console Installation [1]" />
-
- <Directory Id='TARGETDIR' Name='SourceDir'>
-
- <Directory Id='ProgramFilesFolder' Name='PFiles'>
-
- <Directory Id='INSTALLDIR' Name='FIDMCON' LongName='Fedora Identity Management Console'>
-
- <Component Id='NSPRLibrary' Guid='DE133754-3C99-49e7-8A71-0375AB348CDD'>
- <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRpldsLibrary' Guid='7DCDBD30-DC5B-4c89-BD94-EE55E1D9D082'>
- <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSPRplcLibrary' Guid='4E707871-BA8E-41e2-982E-E3E79E85A599'>
- <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSLibrary' Guid='3196F339-901E-42c4-AAD3-704775DCF5F4'>
- <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsslLibrary' Guid='004E7F81-77E8-4681-810B-E97EC9BE49F2'>
- <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsoftoknLibrary' Guid='B20D5FB4-B985-4c44-B4AA-8657C74B8061'>
- <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSsmimeLibrary' Guid='84BD3153-5E80-4556-9B6C-C67B13B3BEA9'>
- <File Id='NSSSMIME' LongName='smime3.dll' Name='smime3.dll' DiskId='1' src='smime3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSSfreeblLibrary' Guid='69D9F77F-27EA-4820-B931-07538AFC75FD'>
- <File Id='NSSFREEBL' LongName='freebl3.dll' Name='freebl3.dll' DiskId='1' src='freebl3.dll' Vital='yes' />
- </Component>
-
- <Component Id='NSScertutil' Guid='7741A56D-3E96-4823-AC0F-0B81A696651F'>
- <File Id='NSSCERTUTIL' LongName='certutil.exe' Name='certutil.exe' DiskId='1' src='certutil.exe' Vital='yes' />
- </Component>
-
- <Component Id='NSSpk12util' Guid='F10ABF8A-8C10-49f6-8150-45616EA4C360'>
- <File Id='NSSPK12UTIL' LongName='pk12util.exe' Name='pk12util.exe' DiskId='1' src='pk12util.exe' Vital='yes' />
- </Component>
-
- <Component Id='JSSLibrary' Guid='844240DD-3EE8-444e-BA48-5C114648096B'>
- <File Id='JSSLIB' LongName='jss4.dll' Name='jss4.dll' DiskId='1' src='jss4.dll' Vital='yes' />
- </Component>
-
- <Component Id='JSSJar' Guid='064A960B-4D7E-45cc-895B-19DE1D9AEF77'>
- <File Id='JSSJAR' LongName='jss4.jar' Name='jss4.jar' DiskId='1' src='jss4.jar' Vital='yes' />
- </Component>
-
- <Component Id='LDAPJar' Guid='E6D5B3AE-11F5-427f-85D3-D7A6A6A0A55D'>
- <File Id='LDAPJAR' LongName='ldapjdk.jar' Name='ldapjdk.jar' DiskId='1' src='ldapjdk.jar' Vital='yes' />
- </Component>
-
- <Component Id='IDMBaseJar' Guid='F45C344F-A3C2-4ffd-9CC6-22D36AA5E69E'>
- <File Id='IDMBASEJAR' LongName='idm-console-base.jar' Name='idmbase.jar' DiskId='1' src='idm-console-base.jar' Vital='yes' />
- </Component>
-
- <Component Id='IDMMCCJar' Guid='1DB26BB6-56AF-4e7e-BD55-8F1364B7A55B'>
- <File Id='IDMMCCJAR' LongName='idm-console-mcc.jar' Name='idmmcc.jar' DiskId='1' src='idm-console-mcc.jar' Vital='yes' />
- </Component>
-
- <Component Id='IDMMCCENJar' Guid='71FF3A08-C895-4648-A8CC-08F0CD2AD4D6'>
- <File Id='IDMMCCENJAR' LongName='idm-console-mcc_en.jar' Name='idmmccen.jar' DiskId='1' src='idm-console-mcc_en.jar' Vital='yes' />
- </Component>
-
- <Component Id='IDMNMCLFJar' Guid='2F118B1B-3413-4740-A99A-1B22E79AB232'>
- <File Id='IDMNMCLFJAR' LongName='idm-console-nmclf.jar' Name='idmnmclf.jar' DiskId='1' src='idm-console-nmclf.jar' Vital='yes' />
- </Component>
-
- <Component Id='IDMNMCLFENJar' Guid='EB4F2170-BFDC-4c5f-8A12-9812CAADB740'>
- <File Id='IDMNMCLFENJAR' LongName='idm-console-nmclf_en.jar' Name='idmnmcen.jar' DiskId='1' src='idm-console-nmclf_en.jar' Vital='yes' />
- </Component>
-
- <Component Id='FedoraConsoleJar' Guid='BE426443-1A07-406e-97FA-103D518BE233'>
- <File Id='FEDORACONSOLEJAR' LongName='fedora-idm-console_en.jar' Name='fconen.jar' DiskId='1' src='fedora-idm-console_en.jar' Vital='yes' />
- </Component>
-
- <Component Id='FedoraConsoleBat' Guid='00DEC033-5D77-49a2-9478-FA67E8D4EFEA'>
- <File Id='FEDORACONSOLEBAT' LongName='fedora-idm-console.bat' Name='fdracon.bat' DiskId='1' src='fedora-idm-console.bat' Vital='yes' >
- <Shortcut Id="startmenuFedoraConsole" Directory="ProgramMenuDir" Name="FIDMCON"
- LongName="Fedora IDM Console" WorkingDirectory='INSTALLDIR'
- Icon="FedoraLogo.ico" IconIndex="0" />
- <Shortcut Id="desktopFedoraConsole" Directory="DesktopFolder" Name="FIDMCON"
- LongName="Fedora IDM Console" WorkingDirectory='INSTALLDIR'
- Icon="FedoraLogo.ico" IconIndex="0" />
- </File>
- </Component>
-
- <Component Id='License.rtf' Guid='D40977B8-BB2B-4796-B855-3503AF5FF881'>
- <File Id='LICENSERTF' LongName='License.rtf' Name='License.rtf' DiskId='1' src='License.rtf' Vital='yes' />
- </Component>
-
- </Directory>
-
- </Directory>
-
- <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
- <Directory Id="ProgramMenuDir" Name='FIDMCON' LongName="Fedora Identity Management Console" />
- </Directory>
-
- <Directory Id="DesktopFolder" Name="Desktop" />
-
- </Directory>
-
- <Feature Id='Complete' Title='Fedora Identity Management Console' Description='The complete package.'
- TypicalDefault='install' Display='expand' Level='1'
- ConfigurableDirectory='INSTALLDIR'>
- <Feature Id='MainProgram' Title='Program' Description='The main executable.'
- TypicalDefault='install' Level='1'>
- <ComponentRef Id='NSPRLibrary' />
- <ComponentRef Id='NSPRpldsLibrary' />
- <ComponentRef Id='NSPRplcLibrary' />
- <ComponentRef Id='NSSLibrary' />
- <ComponentRef Id='NSSsslLibrary' />
- <ComponentRef Id='NSSsoftoknLibrary' />
- <ComponentRef Id='NSSsmimeLibrary' />
- <ComponentRef Id='NSSfreeblLibrary' />
- <ComponentRef Id='NSScertutil' />
- <ComponentRef Id='NSSpk12util' />
- <ComponentRef Id='JSSLibrary' />
- <ComponentRef Id='JSSJar' />
- <ComponentRef Id='LDAPJar' />
- <ComponentRef Id='IDMBaseJar' />
- <ComponentRef Id='IDMMCCJar' />
- <ComponentRef Id='IDMMCCENJar' />
- <ComponentRef Id='IDMNMCLFJar' />
- <ComponentRef Id='IDMNMCLFENJar' />
- <ComponentRef Id='FedoraConsoleJar' />
- <ComponentRef Id='FedoraConsoleBat' />
- <ComponentRef Id='License.rtf' />
- </Feature>
- </Feature>
-
- <Property Id="INSTALLLEVEL">3</Property>
-
- <UIRef Id="WixUI_Mondo" />
- <UIRef Id="WixUI_ErrorProgressText" />
-
- <Icon Id="FedoraLogo.ico" SourceFile="FedoraLogo.ico" />
-
- </Product>
-
-</Wix>
+<?xml version='1.0' encoding='windows-1252'?>
+<!-- BEGIN COPYRIGHT BLOCK
+ This Program is free software; you can redistribute it and/or modify it under
+ the terms of the GNU General Public License as published by the Free Software
+ Foundation; version 2 of the License.
+
+ This Program is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+ Place, Suite 330, Boston, MA 02111-1307 USA.
+
+ In addition, as a special exception, Red Hat, Inc. gives You the additional
+ right to link the code of this Program with code not covered under the GNU
+ General Public License ("Non-GPL Code") and to distribute linked combinations
+ including the two, subject to the limitations in this paragraph. Non-GPL Code
+ permitted under this exception must only link to the code of this Program
+ through those well defined interfaces identified in the file named EXCEPTION
+ found in the source code files (the "Approved Interfaces"). The files of
+ Non-GPL Code may instantiate templates or use macros or inline functions from
+ the Approved Interfaces without causing the resulting work to be covered by
+ the GNU General Public License. Only Red Hat, Inc. may make changes or
+ additions to the list of Approved Interfaces. You must obey the GNU General
+ Public License in all respects for all of the Program code and other code used
+ in conjunction with the Program except the Non-GPL Code covered by this
+ exception. If you modify this file, you may extend this exception to your
+ version of the file, but you are not obligated to do so. If you do not wish to
+ provide this exception without modification, you must delete this exception
+ statement from your version and license this file solely under the GPL without
+ exception.
+
+
+ Copyright (C) 2007 Red Hat, Inc.
+ All rights reserved.
+ END COPYRIGHT BLOCK -->
+<Wix xmlns='http://schemas.microsoft.com/wix/2003/01/wi'>
+ <Product Name='Fedora Identity Management Console' Id='36C8F6DB-6C1B-416e-83E4-31A0688EBD3F'
+ Language='1033' Codepage='1252' UpgradeCode='7EA828C0-C219-438d-9BB3-3418DC900D60'
+ Version='1.1.2' Manufacturer='Fedora Project'>
+
+ <Package Id='????????-????-????-????-????????????' Keywords='Installer'
+ Description="Fedora Identity Management Console Installer"
+ Manufacturer='Fedora Project'
+ InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
+
+ <Upgrade Id='7EA828C0-C219-438d-9BB3-3418DC900D60'>
+ <UpgradeVersion OnlyDetect='no' Property='PATCHFOUND'
+ IncludeMinimum='yes' Minimum='1.1.0' Maximum='1.1.1' IncludeMaximum='yes' />
+ <UpgradeVersion OnlyDetect='yes' Property='NEWERFOUND'
+ Minimum='1.1.2' IncludeMinimum='no' />
+ </Upgrade>
+
+ <Media Id='1' Cabinet='Sample.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
+ <Property Id='DiskPrompt' Value="Console Installation [1]" />
+
+ <CustomAction Id='AlreadyUpdated' Error='[ProductName] [ProductVersion] is already installed.' />
+ <CustomAction Id='NoDowngrade' Error='A later version of [ProductName] is already installed.' />
+
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+
+ <Directory Id='ProgramFilesFolder' Name='PFiles'>
+
+ <Directory Id='INSTALLDIR' Name='FIDMCON' LongName='Fedora Identity Management Console'>
+
+ <Component Id='NSPRLibrary' Guid='DE133754-3C99-49e7-8A71-0375AB348CDD'>
+ <File Id='NSPR' LongName='libnspr4.dll' Name='libnspr4.dll' DiskId='1' src='libnspr4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRpldsLibrary' Guid='7DCDBD30-DC5B-4c89-BD94-EE55E1D9D082'>
+ <File Id='NSPRPLDS' LongName='libplds4.dll' Name='libplds4.dll' DiskId='1' src='libplds4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSPRplcLibrary' Guid='4E707871-BA8E-41e2-982E-E3E79E85A599'>
+ <File Id='NSPRPLC' LongName='libplc4.dll' Name='libplc4.dll' DiskId='1' src='libplc4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSLibrary' Guid='3196F339-901E-42c4-AAD3-704775DCF5F4'>
+ <File Id='NSS' LongName='nss3.dll' Name='nss3.dll' DiskId='1' src='nss3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsslLibrary' Guid='004E7F81-77E8-4681-810B-E97EC9BE49F2'>
+ <File Id='NSSSSL' LongName='ssl3.dll' Name='ssl3.dll' DiskId='1' src='ssl3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsoftoknLibrary' Guid='B20D5FB4-B985-4c44-B4AA-8657C74B8061'>
+ <File Id='NSSSOFTTOKN' LongName='softokn3.dll' Name='softokn3.dll' DiskId='1' src='softokn3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsmimeLibrary' Guid='84BD3153-5E80-4556-9B6C-C67B13B3BEA9'>
+ <File Id='NSSSMIME' LongName='smime3.dll' Name='smime3.dll' DiskId='1' src='smime3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSfreeblLibrary' Guid='69D9F77F-27EA-4820-B931-07538AFC75FD'>
+ <File Id='NSSFREEBL' LongName='freebl3.dll' Name='freebl3.dll' DiskId='1' src='freebl3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSutilLibrary' Guid='FCFD9F8C-E567-46eb-90C3-A9322E862A2C'>
+ <File Id='NSSUTIL' LongName='nssutil3.dll' Name='nssutil3.dll' DiskId='1' src='nssutil3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSsqliteLibrary' Guid='4A8645BA-7A78-44f5-8073-7F2BE8C13622'>
+ <File Id='NSSSQLITE' LongName='sqlite3.dll' Name='sqlite3.dll' DiskId='1' src='sqlite3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSdbmLibrary' Guid='7BDF98E8-D1D5-4b06-AB69-1688EE7A6872'>
+ <File Id='NSSDBM' LongName='nssdbm3.dll' Name='nssdbm3.dll' DiskId='1' src='nssdbm3.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSrootcertsLibrary' Guid='B3350485-7CDD-4311-99F6-479DA1FA92A1'>
+ <File Id='NSSROOTCERTS' LongName='nssckbi.dll' Name='nssckbi.dll' DiskId='1' src='nssckbi.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='NSScertutil' Guid='7741A56D-3E96-4823-AC0F-0B81A696651F'>
+ <File Id='NSSCERTUTIL' LongName='certutil.exe' Name='certutil.exe' DiskId='1' src='certutil.exe' Vital='yes' />
+ </Component>
+
+ <Component Id='NSSpk12util' Guid='F10ABF8A-8C10-49f6-8150-45616EA4C360'>
+ <File Id='NSSPK12UTIL' LongName='pk12util.exe' Name='pk12util.exe' DiskId='1' src='pk12util.exe' Vital='yes' />
+ </Component>
+
+ <Component Id='JSSLibrary' Guid='844240DD-3EE8-444e-BA48-5C114648096B'>
+ <File Id='JSSLIB' LongName='jss4.dll' Name='jss4.dll' DiskId='1' src='jss4.dll' Vital='yes' />
+ </Component>
+
+ <Component Id='JSSJar' Guid='064A960B-4D7E-45cc-895B-19DE1D9AEF77'>
+ <File Id='JSSJAR' LongName='jss4.jar' Name='jss4.jar' DiskId='1' src='jss4.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='LDAPJar' Guid='E6D5B3AE-11F5-427f-85D3-D7A6A6A0A55D'>
+ <File Id='LDAPJAR' LongName='ldapjdk.jar' Name='ldapjdk.jar' DiskId='1' src='ldapjdk.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='IDMBaseJar' Guid='F45C344F-A3C2-4ffd-9CC6-22D36AA5E69E'>
+ <File Id='IDMBASEJAR' LongName='idm-console-base.jar' Name='idmbase.jar' DiskId='1' src='idm-console-base.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='IDMMCCJar' Guid='1DB26BB6-56AF-4e7e-BD55-8F1364B7A55B'>
+ <File Id='IDMMCCJAR' LongName='idm-console-mcc.jar' Name='idmmcc.jar' DiskId='1' src='idm-console-mcc.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='IDMMCCENJar' Guid='71FF3A08-C895-4648-A8CC-08F0CD2AD4D6'>
+ <File Id='IDMMCCENJAR' LongName='idm-console-mcc_en.jar' Name='idmmccen.jar' DiskId='1' src='idm-console-mcc_en.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='IDMNMCLFJar' Guid='2F118B1B-3413-4740-A99A-1B22E79AB232'>
+ <File Id='IDMNMCLFJAR' LongName='idm-console-nmclf.jar' Name='idmnmclf.jar' DiskId='1' src='idm-console-nmclf.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='IDMNMCLFENJar' Guid='EB4F2170-BFDC-4c5f-8A12-9812CAADB740'>
+ <File Id='IDMNMCLFENJAR' LongName='idm-console-nmclf_en.jar' Name='idmnmcen.jar' DiskId='1' src='idm-console-nmclf_en.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='FedoraConsoleJar' Guid='BE426443-1A07-406e-97FA-103D518BE233'>
+ <File Id='FEDORACONSOLEJAR' LongName='fedora-idm-console_en.jar' Name='fconen.jar' DiskId='1' src='fedora-idm-console_en.jar' Vital='yes' />
+ </Component>
+
+ <Component Id='FedoraConsoleBat' Guid='00DEC033-5D77-49a2-9478-FA67E8D4EFEA'>
+ <File Id='FEDORACONSOLEBAT' LongName='fedora-idm-console.bat' Name='fdracon.bat' DiskId='1' src='fedora-idm-console.bat' Vital='yes' >
+ <Shortcut Id="startmenuFedoraConsole" Directory="ProgramMenuDir" Name="FIDMCON"
+ LongName="Fedora IDM Console" WorkingDirectory='INSTALLDIR'
+ Icon="FedoraLogo.ico" IconIndex="0" />
+ <Shortcut Id="desktopFedoraConsole" Directory="DesktopFolder" Name="FIDMCON"
+ LongName="Fedora IDM Console" WorkingDirectory='INSTALLDIR'
+ Icon="FedoraLogo.ico" IconIndex="0" />
+ </File>
+ </Component>
+
+ <Component Id='License.rtf' Guid='D40977B8-BB2B-4796-B855-3503AF5FF881'>
+ <File Id='LICENSERTF' LongName='License.rtf' Name='License.rtf' DiskId='1' src='License.rtf' Vital='yes' />
+ </Component>
+
+ </Directory>
+
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
+ <Directory Id="ProgramMenuDir" Name='FIDMCON' LongName="Fedora Identity Management Console" />
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop" />
+
+ </Directory>
+
+ <Feature Id='Complete' Title='Fedora Identity Management Console' Description='The complete package.'
+ TypicalDefault='install' Display='expand' Level='1'
+ ConfigurableDirectory='INSTALLDIR'>
+ <Feature Id='MainProgram' Title='Program' Description='The main executable.'
+ TypicalDefault='install' Level='1'>
+ <ComponentRef Id='NSPRLibrary' />
+ <ComponentRef Id='NSPRpldsLibrary' />
+ <ComponentRef Id='NSPRplcLibrary' />
+ <ComponentRef Id='NSSLibrary' />
+ <ComponentRef Id='NSSsslLibrary' />
+ <ComponentRef Id='NSSsoftoknLibrary' />
+ <ComponentRef Id='NSSsmimeLibrary' />
+ <ComponentRef Id='NSSfreeblLibrary' />
+ <ComponentRef Id='NSSutilLibrary' />
+ <ComponentRef Id='NSSsqliteLibrary' />
+ <ComponentRef Id='NSSdbmLibrary' />
+ <ComponentRef Id='NSSrootcertsLibrary' />
+ <ComponentRef Id='NSScertutil' />
+ <ComponentRef Id='NSSpk12util' />
+ <ComponentRef Id='JSSLibrary' />
+ <ComponentRef Id='JSSJar' />
+ <ComponentRef Id='LDAPJar' />
+ <ComponentRef Id='IDMBaseJar' />
+ <ComponentRef Id='IDMMCCJar' />
+ <ComponentRef Id='IDMMCCENJar' />
+ <ComponentRef Id='IDMNMCLFJar' />
+ <ComponentRef Id='IDMNMCLFENJar' />
+ <ComponentRef Id='FedoraConsoleJar' />
+ <ComponentRef Id='FedoraConsoleBat' />
+ <ComponentRef Id='License.rtf' />
+ </Feature>
+ </Feature>
+
+ <Property Id="INSTALLLEVEL">3</Property>
+
+ <UIRef Id="WixUI_Mondo" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+
+ <InstallExecuteSequence>
+<!-- <Custom Action='AlreadyUpdated' After='FindRelatedProducts'>PATCHFOUND</Custom> -->
+ <Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom>
+ <RemoveExistingProducts After='InstallFinalize' />
+ </InstallExecuteSequence>
+
+ <Icon Id="FedoraLogo.ico" SourceFile="FedoraLogo.ico" />
+
+ </Product>
+
+</Wix>
Index: Makefile
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile 4 Sep 2007 21:30:54 -0000 1.2
+++ Makefile 3 Feb 2009 16:19:07 -0000 1.3
@@ -1,101 +1,171 @@
-#
-# BEGIN COPYRIGHT BLOCK
-# This Program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 2 of the License.
-#
-# This Program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA.
-#
-# In addition, as a special exception, Red Hat, Inc. gives You the additional
-# right to link the code of this Program with code not covered under the GNU
-# General Public License ("Non-GPL Code") and to distribute linked combinations
-# including the two, subject to the limitations in this paragraph. Non-GPL Code
-# permitted under this exception must only link to the code of this Program
-# through those well defined interfaces identified in the file named EXCEPTION
-# found in the source code files (the "Approved Interfaces"). The files of
-# Non-GPL Code may instantiate templates or use macros or inline functions from
-# the Approved Interfaces without causing the resulting work to be covered by
-# the GNU General Public License. Only Red Hat, Inc. may make changes or
-# additions to the list of Approved Interfaces. You must obey the GNU General
-# Public License in all respects for all of the Program code and other code used
-# in conjunction with the Program except the Non-GPL Code covered by this
-# exception. If you modify this file, you may extend this exception to your
-# version of the file, but you are not obligated to do so. If you do not wish to
-# provide this exception without modification, you must delete this exception
-# statement from your version and license this file solely under the GPL without
-# exception.
-#
-#
-# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
-# Copyright (C) 2005 Red Hat, Inc.
-# All rights reserved.
-# END COPYRIGHT BLOCK
-#
-# Packaging nmake Makefile for Console.msi
-
-PKGNAME=Console
-PKGDIR=.
-WXSDIR=.
-
-#BASEDIR=E:\cygwin\home\rich
-# where to find nspr dlls
-NSPRLIBDIR=$(BASEDIR)\nspr-4.6.7
-# where to find nss dlls
-NSSLIBDIR=$(BASEDIR)\nss-3.11.7
-# where to find nss exes
-NSSBINDIR=$(BASEDIR)\nss-3.11.7
-# where to find jss jar and dll
-JSSDIR=$(BASEDIR)\jss-4.2.4
-# where to find the ldapjdk.jar
-LDAPDIR=$(BASEDIR)\console
-#LDAPDIR=$(BASEDIR)\ldapjdk-4.18
-# where to find the idm-console-framework jars
-IDMDIR=$(BASEDIR)\console
-# where to find the fedora-idm-console jar and other files
-FEDORACONSOLEDIR=.
-
-WIXDIR=$(BASEDIR)\wix
-CANDLE=$(WIXDIR)\candle
-LIGHT=$(WIXDIR)\light
-
-ALL : $(PKGNAME).msi
-
-LAYOUT :
- copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR)
- copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR)
- copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR)
- copy /Y $(NSSBINDIR)\pk12util.exe $(PKGDIR)
- copy /Y $(JSSDIR)\jss4.jar $(PKGDIR)
- copy /Y $(JSSDIR)\jss4.dll $(PKGDIR)
- copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR)
- copy /Y $(IDMDIR)\*.jar $(PKGDIR)
- copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR)
-# directory should already contain the bat file, icon, and bitmaps
-# copy /Y $(FEDORACONSOLEDIR)\*.bat $(PKGDIR)
-# copy /Y $(FEDORACONSOLEDIR)\*.ico $(PKGDIR)
-
-$(PKGNAME).msi : LAYOUT
- cd "$(PKGDIR)"
- $(CANDLE) "$(WXSDIR)\$(PKGNAME).wxs"
- $(LIGHT) -out $(PKGNAME).msi $(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl
-
-clean:
- del /F /Q $(PKGNAME).wixobj $(PKGNAME).msi
-
-help:
- @echo You must define the following paths:
- @echo NSPRLIBDIR - directory containing the NSPR dlls
- @echo NSSLIBDIR - directory containing the NSS dlls
- @echo NSSBINDIR - directory containing certutil.exe and pk12util.exe
- @echo JSSDIR - directory containing jss4.jar and jss4.dll
- @echo LDAPDIR - directory containing ldapjdk.jar
- @echo IDMDIR - directory containing the IDM Console Framework jar files
- @echo FEDORACONSOLEDIR - directory containing the Fedora console jar file
- @echo WIXDIR - directory containing the WiX candle.exe, light.exe, and library files
- @echo Type 'nmake NSPRLIBDIR=... NSSLIBDIR=... etc.' to build the Console.msi package
+#
+# BEGIN COPYRIGHT BLOCK
+# This Program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 2 of the License.
+#
+# This Program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA 02111-1307 USA.
+#
+# In addition, as a special exception, Red Hat, Inc. gives You the additional
+# right to link the code of this Program with code not covered under the GNU
+# General Public License ("Non-GPL Code") and to distribute linked combinations
+# including the two, subject to the limitations in this paragraph. Non-GPL Code
+# permitted under this exception must only link to the code of this Program
+# through those well defined interfaces identified in the file named EXCEPTION
+# found in the source code files (the "Approved Interfaces"). The files of
+# Non-GPL Code may instantiate templates or use macros or inline functions from
+# the Approved Interfaces without causing the resulting work to be covered by
+# the GNU General Public License. Only Red Hat, Inc. may make changes or
+# additions to the list of Approved Interfaces. You must obey the GNU General
+# Public License in all respects for all of the Program code and other code used
+# in conjunction with the Program except the Non-GPL Code covered by this
+# exception. If you modify this file, you may extend this exception to your
+# version of the file, but you are not obligated to do so. If you do not wish to
+# provide this exception without modification, you must delete this exception
+# statement from your version and license this file solely under the GPL without
+# exception.
+#
+#
+# Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
+# Copyright (C) 2005 Red Hat, Inc.
+# All rights reserved.
+# END COPYRIGHT BLOCK
+#
+# Packaging nmake Makefile for Console.msi
+
+PKGNAME=Console
+BRAND_PKGNAME=Fedora$(PKGNAME)
+PKGDIR=.
+WXSDIR=.
+
+# could also use wget or curl
+DOWNLOAD="c:\program files\support tools\bitsadmin" /wrap /transfer consolebuild /download /priority normal
+SBC=http://tsunami.dsdev.sjc.redhat.com/share/builds/components
+SBV=http://tsunami.dsdev.sjc.redhat.com/share/builds/verification
+
+NSPRVER=4.7.3
+NSSVER=3_12_2
+LDAPJDKVER=4.18
+LDAPJDKVERDIR=4.18/20070817.1
+JSSVER=4_2_5
+JSSVERDIR=JSS_$(JSSVER)_RTM/20090122.1
+IDMVER=1.1
+IDMVERDIR=$(IDMVER)/20090122.1
+PLAT=WINNT5.0_OPT.OBJ
+
+PKGDIR="$(BASEDIR)\fedora-idm-console\win\build.$(PLAT)"
+
+#BASEDIR=E:\cygwin\home\rich
+# where to find nspr dlls
+NSPRLIBDIR="$(BASEDIR)\nspr-4.7.3\lib"
+# where to find nss dlls
+NSSLIBDIR="$(BASEDIR)\nss-3.12.2\lib"
+# where to find nss exes
+NSSBINDIR="$(BASEDIR)\nss-3.12.2\bin"
+# where to find jss jar and dll
+JSSDIR="$(BASEDIR)\jss-4.2.5"
+# where to find the ldapjdk.jar
+LDAPDIR="$(BASEDIR)\console"
+#LDAPDIR=$(BASEDIR)\ldapjdk-4.18
+# where to find the idm-console-framework jars
+IDMDIR="$(BASEDIR)\console"
+# where to find the fedora-idm-console jar and other files
+FEDORACONSOLEDIR=.
+
+WIXDIR="$(BASEDIR)\wix"
+CANDLE=$(WIXDIR)\candle
+LIGHT=$(WIXDIR)\light
+
+ALL : $(BRAND_PKGNAME).msi
+
+$(PKGDIR) :
+ mkdir $@
+ mkdir $@\Bitmaps
+
+LAYOUT : $(PKGDIR)
+# copy /Y $(NSPRLIBDIR)\*.dll $(PKGDIR)
+# copy /Y $(NSSLIBDIR)\*.dll $(PKGDIR)
+# copy /Y $(NSSBINDIR)\certutil.exe $(PKGDIR)
+# copy /Y $(NSSBINDIR)\pk12util.exe $(PKGDIR)
+# copy /Y $(JSSDIR)\jss4.jar $(PKGDIR)
+# copy /Y $(JSSDIR)\jss4.dll $(PKGDIR)
+# copy /Y $(LDAPDIR)\ldapjdk.jar $(PKGDIR)
+# copy /Y $(IDMDIR)\*.jar $(PKGDIR)
+ copy /Y $(FEDORACONSOLEDIR)\*.jar $(PKGDIR)
+# directory should already contain the bat file, icon, and bitmaps
+ copy /Y $(FEDORACONSOLEDIR)\*.bat $(PKGDIR)
+ copy /Y $(FEDORACONSOLEDIR)\*.ico $(PKGDIR)
+ copy /Y $(FEDORACONSOLEDIR)\Bitmaps\* $(PKGDIR)\Bitmaps\*
+ copy /Y $(FEDORACONSOLEDIR)\License.rtf $(PKGDIR)
+
+DOWNLOAD : $(PKGDIR)
+# NSPR
+ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libnspr4.dll $(PKGDIR)/libnspr4.dll
+ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libplc4.dll $(PKGDIR)/libplc4.dll
+ $(DOWNLOAD) $(SBC)/nspr/v$(NSPRVER)/$(PLAT)/lib/libplds4.dll $(PKGDIR)/libplds4.dll
+# NSS
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nss3.dll $(PKGDIR)/nss3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/ssl3.dll $(PKGDIR)/ssl3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/smime3.dll $(PKGDIR)/smime3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssutil3.dll $(PKGDIR)/nssutil3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/freebl3.dll $(PKGDIR)/freebl3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/softokn3.dll $(PKGDIR)/softokn3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/sqlite3.dll $(PKGDIR)/sqlite3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssdbm3.dll $(PKGDIR)/nssdbm3.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/lib/nssckbi.dll $(PKGDIR)/nssckbi.dll
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/certutil.exe $(PKGDIR)/certutil.exe
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/pk12util.exe $(PKGDIR)/pk12util.exe
+ $(DOWNLOAD) $(SBC)/nss/NSS_$(NSSVER)_RTM/$(PLAT)/bin/certutil.exe $(PKGDIR)/certutil.exe
+# JSS
+ $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/$(PLAT)/lib/jss4.dll $(PKGDIR)/jss4.dll
+ $(DOWNLOAD) $(SBV)/jss/$(JSSVERDIR)/jss4.jar $(PKGDIR)/jss4.jar
+# LDAPJDK
+ $(DOWNLOAD) $(SBV)/ldapjdk/$(LDAPJDKVERDIR)/ldapjdk.jar $(PKGDIR)/ldapjdk.jar
+# IDM
+ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-base.jar $(PKGDIR)/idm-console-base.jar
+ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-mcc.jar $(PKGDIR)/idm-console-mcc.jar
+ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-mcc_en.jar $(PKGDIR)/idm-console-mcc_en.jar
+ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-nmclf.jar $(PKGDIR)/idm-console-nmclf.jar
+ $(DOWNLOAD) $(SBV)/idm-console-framework/$(IDMVERDIR)/idm-console-nmclf_en.jar $(PKGDIR)/idm-console-nmclf_en.jar
+
+#$(PKGNAME).msi : LAYOUT DOWNLOAD
+$(PKGNAME).msi :
+ cd $(PKGDIR)
+ cd
+ dir ..\$(PKGNAME).wxs
+ $(CANDLE) ..\$(PKGNAME).wxs
+ $(LIGHT) -out $(PKGNAME).msi $(PKGNAME).wixobj $(WIXDIR)\wixui.wixlib -loc $(WIXDIR)\WixUI_en-us.wxl
+
+$(BRAND_PKGNAME).msi: $(PKGNAME).msi
+ cd $(PKGDIR)
+ del /F /Q $(BRAND_PKGNAME).msi
+ rename $(PKGNAME).msi $(BRAND_PKGNAME).msi
+
+clean:
+ del /F /Q $(PKGDIR)
+
+help:
+ @echo You must define the following paths:
+ @echo BASEDIR - the directory containing all of the other components' directories
+ @echo e.g. nmake BASEDIR="c:\Documents and Settings\userid"
+ @echo Use
+ @echo nmake BASEDIR=foo download
+ @echo to download the components from the default filer
+ @echo the download target will create $(PKGDIR) and place the files in there
+ @echo You will have to download the branded console jar file manually
+ @echo Or you may download them separately and specify individual directories:
+ @echo NSPRLIBDIR - directory containing the NSPR dlls
+ @echo NSSLIBDIR - directory containing the NSS dlls
+ @echo NSSBINDIR - directory containing certutil.exe and pk12util.exe
+ @echo JSSDIR - directory containing jss4.jar and jss4.dll
+ @echo LDAPDIR - directory containing ldapjdk.jar
+ @echo IDMDIR - directory containing the IDM Console Framework jar files
+ @echo FEDORACONSOLEDIR - directory containing the Fedora console jar file
+ @echo WIXDIR - directory containing the WiX candle.exe, light.exe, and library files
+ @echo Type 'nmake NSPRLIBDIR=... NSSLIBDIR=... etc.' to build the Console.msi package
15 years, 2 months
- 1
- 0
[Fedora-directory-commits] fedora-idm-console build.properties, 1.2, 1.3
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24937
Modified Files:
build.properties
Log Message:
Resolves: bug 476095
Description: upgrade components for rhds 8.1
Fix Description: Updated fedora-idm-console to version 1.1.2
Updated windows console to use the new wix version 2 (3 is currently still in beta) from wix.sourceforge.net
Updated windows console to use new NSPR, NSS, JSS
Updated windows console package to be able to upgrade an existing installation
Updated Makefile to use the Windows bitsadmin program (provided in the XP or Server support package) to download components from the component filer
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/build.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.properties 14 Jan 2008 19:33:08 -0000 1.2
+++ build.properties 3 Feb 2009 16:19:07 -0000 1.3
@@ -23,7 +23,7 @@
console.root=.
console.version=11
-console.dotversion=1.1.1
+console.dotversion=1.1.2
console.dotgenversion=1.1
theme.core=fedora-idm-console
15 years, 2 months
- 1
- 0
[Fedora-directory-commits] fedora-idm-console/win fedora-idm-console.bat, 1.2, 1.3
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/fedora-idm-console/win
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13996/fedora-idm-console/win
Modified Files:
fedora-idm-console.bat
Log Message:
Reviewed by: nkinder (Thanks!)
Fix Description: Just use "java -version" to test for the presence of java
Platforms tested: Windows 2003 server
Flag Day: no
Doc impact: no
Index: fedora-idm-console.bat
===================================================================
RCS file: /cvs/dirsec/fedora-idm-console/win/fedora-idm-console.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-idm-console.bat 14 Dec 2007 21:43:23 -0000 1.2
+++ fedora-idm-console.bat 3 Feb 2009 00:36:45 -0000 1.3
@@ -23,7 +23,7 @@
if not "%JAVA%foo"=="foo" goto launch
-where java > nul 2>&1 || goto findjre
+java -version > nul 2>&1 || goto findjre
set JAVA=java
goto launch
15 years, 2 months
- 1
- 0
[Fedora-directory-commits] ldapserver/ldap/servers/slapd/test-plugins testdbinterop.c, 1.5, 1.6 testdbinterop.h, 1.5, 1.6
by Noriko Hosoi
Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27029
Modified Files:
testdbinterop.c testdbinterop.h
Log Message:
Resolves: #483366
Summary: test plugin (datainterop): eliminate BDB dependency from testdbinterop
Index: testdbinterop.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdbinterop.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdbinterop.c 10 Nov 2006 23:45:50 -0000 1.5
+++ testdbinterop.c 2 Feb 2009 19:19:52 -0000 1.6
@@ -40,21 +40,21 @@
# include <config.h>
#endif
-
#include <sys/types.h>
#include <stdio.h>
-#include "db.h"
#include "testdbinterop.h"
#include "slapi-plugin.h"
-#define DATABASE "access.db"
-static int number_of_keys=100;
-static int key_buffer_size = 8000;
-
#define DB_PLUGIN_NAME "nullsuffix-preop"
static PRLock *db_lock=NULL;
+#ifdef USE_BDB
+#include "db.h"
+#define DATABASE "access.db"
+static int number_of_keys=100;
+static int key_buffer_size = 8000;
+
#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4100
#define DB_OPEN(db, txnid, file, database, type, flags, mode) \
(db)->open((db), (txnid), (file), (database), (type), (flags), (mode))
@@ -143,3 +143,70 @@
PR_Unlock(db_lock);
}
+#else /* USE_BDB */
+#include <string.h>
+
+#define DATABASE "/tmp/testdbinterop.db"
+#define DATABASE_BACK "/tmp/testdbinterop.db.bak"
+
+void
+db_put_dn(char *data_dn)
+{
+ int ret;
+ char *db_path = DATABASE;
+ char *db_path_bak = DATABASE_BACK;
+ PRFileInfo info;
+ PRFileDesc *prfd;
+ PRInt32 data_sz;
+ char *data_dnp = NULL;
+
+ if(db_lock == NULL){
+ db_lock = PR_NewLock();
+ }
+ PR_Lock(db_lock);
+ /* if db_path is a directory, rename it */
+ ret = PR_GetFileInfo(db_path, &info);
+ if (PR_SUCCESS == ret) {
+ if (PR_FILE_DIRECTORY == info.type) { /* directory */
+ ret = PR_GetFileInfo(db_path_bak, &info);
+ if (PR_SUCCESS == ret) {
+ if (PR_FILE_DIRECTORY != info.type) { /* not a directory */
+ PR_Delete(db_path_bak);
+ }
+ }
+ PR_Rename(db_path, db_path_bak);
+ }
+ }
+
+ /* open a file */
+ if ((prfd = PR_Open(db_path, PR_RDWR | PR_CREATE_FILE | PR_APPEND, 0600)) == NULL ) {
+ slapi_log_error(SLAPI_LOG_FATAL, DB_PLUGIN_NAME,
+ "db: Could not open file \"%s\" for read/write; %d (%s)\n",
+ db_path, PR_GetError(), slapd_pr_strerror(PR_GetError()));
+ return;
+ }
+
+ data_dnp = slapi_ch_smprintf("%s\n", data_dn);
+ data_sz = (PRInt32)strlen(data_dnp);
+
+ ret = PR_Write(prfd, data_dnp, data_sz);
+ if (ret == data_sz) {
+ slapi_log_error(SLAPI_LOG_PLUGIN, DB_PLUGIN_NAME,
+ "db: %s: key stored.\n", data_dn);
+ ret = 0;
+ } else {
+ slapi_log_error(SLAPI_LOG_FATAL, DB_PLUGIN_NAME,
+ "db: Failed to store key \"%s\"; %d (%s)\n",
+ data_dn, PR_GetError(), slapd_pr_strerror(PR_GetError()));
+ ret = 1;
+ }
+ if(ret) {
+ slapi_log_error(SLAPI_LOG_FATAL, DB_PLUGIN_NAME,
+ "db: Error detected in db_put_dn \n");
+ }
+ slapi_ch_free_string(&data_dnp);
+ PR_Close(prfd);
+ PR_Unlock(db_lock);
+ return;
+}
+#endif
Index: testdbinterop.h
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/test-plugins/testdbinterop.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- testdbinterop.h 10 Nov 2006 23:45:50 -0000 1.5
+++ testdbinterop.h 2 Feb 2009 19:19:52 -0000 1.6
@@ -54,6 +54,5 @@
#include "nspr.h"
-void create_db();
void db_put_dn(char *data);
15 years, 2 months
- 1
- 0