Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[57918] firebird/trunk
|
From: <ale...@us...> - 2013-04-08 16:28:09
|
Revision: 57918
http://sourceforge.net/p/firebird/code/57918
Author: alexpeshkoff
Date: 2013-04-08 16:28:05 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
Renamed aliases.conf to databases.conf as suggested by Dmitry
Modified Paths:
--------------
firebird/trunk/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
firebird/trunk/builds/install/arch-specific/darwin/install-script
firebird/trunk/builds/install/arch-specific/darwin/preupgrade-script
firebird/trunk/builds/install/arch-specific/freebsd/install.sh.in
firebird/trunk/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in
firebird/trunk/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
firebird/trunk/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in
firebird/trunk/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
firebird/trunk/builds/install/arch-specific/netbsd/install.sh.in
firebird/trunk/builds/install/arch-specific/solaris/CS/prototype.in
firebird/trunk/builds/install/arch-specific/solaris/SS/prototype.in
firebird/trunk/builds/install/arch-specific/win32/BuildExecutableInstall.bat
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
firebird/trunk/builds/install/arch-specific/win32/installation_scripted.txt
firebird/trunk/builds/install/misc/createAliasDB.sh.in
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/builds/posix/postfix.darwin
firebird/trunk/configure.ac
firebird/trunk/doc/README.raw_devices
firebird/trunk/doc/install_windows_manually.txt
firebird/trunk/src/common/db_alias.cpp
firebird/trunk/src/yvalve/PluginManager.cpp
Added Paths:
-----------
firebird/trunk/builds/install/misc/databases.conf.in
Removed Paths:
-------------
firebird/trunk/builds/install/misc/aliases.conf.in
Modified: firebird/trunk/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/aix/classic/makeInstallImage.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -209,7 +209,7 @@
# Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
- cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/
+ cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/
# Create links from @libdir@ to install area.
Modified: firebird/trunk/builds/install/arch-specific/darwin/install-script
===================================================================
--- firebird/trunk/builds/install/arch-specific/darwin/install-script 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/darwin/install-script 2013-04-08 16:28:05 UTC (rev 57918)
@@ -240,10 +240,10 @@
rm -f /tmp/fb-security-database-update2.fdb
fi
-#Install the saved aliases.conf, if any
-echo "Install the saved aliases.conf file"
-if test -f /tmp/fb-aliases.conf; then
- mv -f /tmp/fb-aliases.conf "$FB_RES/English.lproj/var/aliases.conf"
+#Install the saved databases.conf, if any
+echo "Install the saved databases.conf file"
+if test -f /tmp/fb-databases.conf; then
+ mv -f /tmp/fb-databases.conf "$FB_RES/English.lproj/var/databases.conf"
fi
#Install the saved UDF libraries, if any
Modified: firebird/trunk/builds/install/arch-specific/darwin/preupgrade-script
===================================================================
--- firebird/trunk/builds/install/arch-specific/darwin/preupgrade-script 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/darwin/preupgrade-script 2013-04-08 16:28:05 UTC (rev 57918)
@@ -18,8 +18,8 @@
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb" /tmp/fb-security-database-update2.fdb
fi
-if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then
- mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf" /tmp/fb-aliases.conf
+if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/databases.conf"; then
+ mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/databases.conf" /tmp/fb-databases.conf
fi
for i in /Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF/*;do
Modified: firebird/trunk/builds/install/arch-specific/freebsd/install.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/freebsd/install.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/freebsd/install.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -301,7 +301,7 @@
#conf
cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@
- cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@
+ cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@
chown root:wheel ${TargetDir}@FB_CONFDIR@/*.conf
Modified: firebird/trunk/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/hpux/classic/firebirdCS.psf.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -27,7 +27,7 @@
tag main
file -u 0660 -g firebird -o firebird buildroot@prefix@/security2.fdb @prefix@/security2.fdb
file -u 0644 -g firebird -o firebird buildroot@prefix@/firebird.conf @prefix@/firebird.conf
-file -u 0644 -g firebird -o firebird buildroot@prefix@/aliases.conf @prefix@/aliases.conf
+file -u 0644 -g firebird -o firebird buildroot@prefix@/databases.conf @prefix@/databases.conf
file -u 0644 -g firebird -o firebird buildroot@prefix@/WhatsNew @prefix@/WhatsNew
end
#
Modified: firebird/trunk/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/hpux/classic/makeinstallImage.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -206,7 +206,7 @@
# Misc config files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/
- cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/
+ cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/
# Create links from @libdir@ to install area.
Modified: firebird/trunk/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/hpux/misc/createaliasDB.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -51,7 +51,7 @@
#------------------------------------------------------------------------------
# appendAliasEntry
-# check to see if an entry already exists in the aliases.conf file
+# check to see if an entry already exists in the databases.conf file
# if it doesn't append it to the end of the file
appendAliasEntry() {
@@ -138,7 +138,7 @@
aliasName=$1
newDB=$2
- AliasFile=@FB_CONFDIR@/aliases.conf
+ AliasFile=@FB_CONFDIR@/databases.conf
checkNameStartsWithSlash $newDB
Modified: firebird/trunk/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/hpux/super/makeinstallImage.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -169,7 +169,7 @@
# Miscellaneous config and stratup files
cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/firebird.conf
- cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/
+ cp $BuildRootDir/gen/install/misc/databases.conf $DestDir/
# Create links from /usr/lib to install area.
Modified: firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/linux/misc/makeInstallImage.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -304,7 +304,7 @@
#conf
cp $BuiltFBDir/firebird.conf ${TargetDir}@FB_CONFDIR@
- cp $BuiltFBDir/aliases.conf ${TargetDir}@FB_CONFDIR@
+ cp $BuiltFBDir/databases.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/fbtrace.conf ${TargetDir}@FB_CONFDIR@
cp $BuiltFBDir/plugins.conf ${TargetDir}@FB_CONFDIR@
Modified: firebird/trunk/builds/install/arch-specific/netbsd/install.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/netbsd/install.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/netbsd/install.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -197,14 +197,14 @@
cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf.sample || exit
-echo "#" >> $DestDir/aliases.conf.sample
-echo "# List of known database aliases" >> $DestDir/aliases.conf.sample
-echo "# ------------------------------" >> $DestDir/aliases.conf.sample
-echo "#" >> $DestDir/aliases.conf.sample
-echo "# Examples:" >> $DestDir/aliases.conf.sample
-echo "#" >> $DestDir/aliases.conf.sample
-echo "# employee = /$DestDir/examples/employee.fdb" >> $DestDir/aliases.conf.sample
-echo "#" >> $DestDir/aliases.conf.sample
+echo "#" >> $DestDir/databases.conf.sample
+echo "# List of known database aliases" >> $DestDir/databases.conf.sample
+echo "# ------------------------------" >> $DestDir/databases.conf.sample
+echo "#" >> $DestDir/databases.conf.sample
+echo "# Examples:" >> $DestDir/databases.conf.sample
+echo "#" >> $DestDir/databases.conf.sample
+echo "# employee = /$DestDir/examples/employee.fdb" >> $DestDir/databases.conf.sample
+echo "#" >> $DestDir/databases.conf.sample
echo Setting ownership and permissions on installed files
@@ -284,7 +284,7 @@
chmod ug=rw,o= help/*.fdb || exit
# install the samples if they don't exist
-[ -f aliases.conf ] || install -o firebird -g firebird -m 440 aliases.conf.sample aliases.conf
+[ -f databases.conf ] || install -o firebird -g firebird -m 440 databases.conf.sample databases.conf
[ -f firebird.conf ] || install -o firebird -g firebird -m 440 firebird.conf.sample firebird.conf
[ -f security2.fdb ] || install -o firebird -g firebird -m 660 security2.fdb.sample security2.fdb
Modified: firebird/trunk/builds/install/arch-specific/solaris/CS/prototype.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/solaris/CS/prototype.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/solaris/CS/prototype.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -18,7 +18,7 @@
v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird
v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0444 firebird firebird
-v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0444 firebird firebird
+v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0444 firebird firebird
v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird
f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird
Modified: firebird/trunk/builds/install/arch-specific/solaris/SS/prototype.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/solaris/SS/prototype.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/solaris/SS/prototype.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -18,7 +18,7 @@
v CONFIG.prsv @prefix@/security2.fdb=$SRCDIR/security2.fdb 0660 firebird firebird
v CONFIG.prsv @prefix@/firebird.conf=$SRCDIR/misc/firebird.conf 0644 firebird firebird
-v CONFIG.prsv @prefix@/aliases.conf=$SRCDIR/../../builds/install/misc/aliases.conf.in 0544 firebird firebird
+v CONFIG.prsv @prefix@/databases.conf=$SRCDIR/../../builds/install/misc/databases.conf.in 0544 firebird firebird
v CONFIG.prsv @prefix@/intl/fbintl.conf=$SRCDIR/misc/fbintl.conf 0644 firebird firebird
f none @prefix@/WhatsNew=$SRCDIR/../../doc/WhatsNew 0644 firebird firebird
Modified: firebird/trunk/builds/install/arch-specific/win32/BuildExecutableInstall.bat
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/BuildExecutableInstall.bat 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/win32/BuildExecutableInstall.bat 2013-04-08 16:28:05 UTC (rev 57918)
@@ -441,15 +441,15 @@
:ALIAS_CONF
:: Generate a sample aliases file
::===============================
-@echo Creating sample aliases.conf
-@echo # > %FB_OUTPUT_DIR%\aliases.conf
-@echo # List of known database aliases >> %FB_OUTPUT_DIR%\aliases.conf
-@echo # ------------------------------ >> %FB_OUTPUT_DIR%\aliases.conf
-@echo # >> %FB_OUTPUT_DIR%\aliases.conf
-@echo # Examples: >> %FB_OUTPUT_DIR%\aliases.conf
-@echo # >> %FB_OUTPUT_DIR%\aliases.conf
-@echo # dummy = c:\data\dummy.fdb >> %FB_OUTPUT_DIR%\aliases.conf
-@echo # >> %FB_OUTPUT_DIR%\aliases.conf
+@echo Creating sample databases.conf
+@echo # > %FB_OUTPUT_DIR%\databases.conf
+@echo # List of known database aliases >> %FB_OUTPUT_DIR%\databases.conf
+@echo # ------------------------------ >> %FB_OUTPUT_DIR%\databases.conf
+@echo # >> %FB_OUTPUT_DIR%\databases.conf
+@echo # Examples: >> %FB_OUTPUT_DIR%\databases.conf
+@echo # >> %FB_OUTPUT_DIR%\databases.conf
+@echo # dummy = c:\data\dummy.fdb >> %FB_OUTPUT_DIR%\databases.conf
+@echo # >> %FB_OUTPUT_DIR%\databases.conf
::End of ALIAS_CONF
::-----------------
@@ -585,7 +585,7 @@
@mkdir %FBBUILD_EMB_PACK_ROOT% 2>nul
@del /s /q %FBBUILD_EMB_PACK_ROOT%\ > nul
-for %%v in (aliases.conf firebird.conf firebird.msg) do ( @copy /Y %FB_OUTPUT_DIR%\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul)
+for %%v in (databases.conf firebird.conf firebird.msg) do ( @copy /Y %FB_OUTPUT_DIR%\%%v %FBBUILD_EMB_PACK_ROOT%\%%v > nul)
for %%v in ( doc intl udf ) do (@mkdir %FBBUILD_EMB_PACK_ROOT%\%%v 2>nul)
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc 2013-04-08 16:28:05 UTC (rev 57918)
@@ -736,7 +736,7 @@
else
SharedFileArray[26].Filename := ExpandConstant('{sys}')+'FIREBI~1.CPL';
-SharedFileArray[27].Filename := ExpandConstant('{app}')+'aliases.conf';
+SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security3.fdb';
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2013-04-08 16:28:05 UTC (rev 57918)
@@ -494,7 +494,7 @@
Source: {#FilesDir}\firebird.conf; DestDir: {app}; DestName: firebird.conf; Components: ServerComponent; Flags: uninsneveruninstall; check: NoFirebirdConfExists
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent;
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists;
-Source: {#FilesDir}\aliases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
+Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@@ -665,7 +665,7 @@
// Options for scripted uninstall.
CleanUninstall: Boolean; // If /clean is passed to the uninstaller it will delete
// user config files - firebird.conf, firebird.log,
- // aliases.conf, fbtrace.conf and the security database.
+ // databases.conf, fbtrace.conf and the security database.
SYSDBAName: String; // Name of SYSDBA
SYSDBAPassword: String; // SYSDBA password
@@ -1056,7 +1056,7 @@
//Manually set the sharedfile count of these files.
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
- IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\aliases.conf', false);
+ IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false);
end;
@@ -1168,9 +1168,9 @@
if CleanUninstall then
DeleteFile(GetAppPath+'\firebird.log');
- if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\aliases.conf') then
+ if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf') then
if CleanUninstall then
- DeleteFile(GetAppPath+'\aliases.conf');
+ DeleteFile(GetAppPath+'\databases.conf');
if DecrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf') then
if CleanUninstall then
Modified: firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/win32/installation_readme.txt 2013-04-08 16:28:05 UTC (rev 57918)
@@ -130,7 +130,7 @@
o Uninstallation leaves five files in the install
directory:
- - aliases.conf
+ - databases.conf
- firebird.conf
- fbtrace.conf
- firebird.log
Modified: firebird/trunk/builds/install/arch-specific/win32/installation_scripted.txt
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/installation_scripted.txt 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/arch-specific/win32/installation_scripted.txt 2013-04-08 16:28:05 UTC (rev 57918)
@@ -398,7 +398,7 @@
the uninstallation process has completed:
firebird.conf
- aliases.conf
+ databases.conf
firebird.log
security3.fdb
fbtrace.conf
Deleted: firebird/trunk/builds/install/misc/aliases.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/aliases.conf.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/misc/aliases.conf.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -1,13 +0,0 @@
-# ------------------------------
-# List of known database aliases
-# ------------------------------
-
-#
-# Example Database:
-#
-employee.fdb = $(dir_sampledb)/employee.fdb
-employee = $(dir_sampledb)/employee.fdb
-
-#
-# Live Databases:
-#
Modified: firebird/trunk/builds/install/misc/createAliasDB.sh.in
===================================================================
--- firebird/trunk/builds/install/misc/createAliasDB.sh.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/misc/createAliasDB.sh.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -36,7 +36,7 @@
#------------------------------------------------------------------------------
# appendAliasEntry
-# check to see if an entry already exists in the aliases.conf file
+# check to see if an entry already exists in the databases.conf file
# if it doesn't append it to the end of the file
appendAliasEntry() {
@@ -121,7 +121,7 @@
aliasName=$1
newDB=$2
- AliasFile=@FB_CONFDIR@/aliases.conf
+ AliasFile=@FB_CONFDIR@/databases.conf
checkNameStartsWithSlash $newDB
appendAliasEntry $aliasName $newDB
Copied: firebird/trunk/builds/install/misc/databases.conf.in (from rev 57903, firebird/trunk/builds/install/misc/aliases.conf.in)
===================================================================
--- firebird/trunk/builds/install/misc/databases.conf.in (rev 0)
+++ firebird/trunk/builds/install/misc/databases.conf.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -0,0 +1,13 @@
+# ------------------------------
+# List of known database aliases
+# ------------------------------
+
+#
+# Example Database:
+#
+employee.fdb = $(dir_sampledb)/employee.fdb
+employee = $(dir_sampledb)/employee.fdb
+
+#
+# Live Databases:
+#
Property changes on: firebird/trunk/builds/install/misc/databases.conf.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2013-04-08 16:28:05 UTC (rev 57918)
@@ -70,7 +70,7 @@
# To specify access to specific trees, enum all required paths
# (for Win32 this may be something like 'C:\DataBase;D:\Mirror',
# for unix - '/db;/mnt/mirrordb'). If you choose 'None', then only
-# databases listed in aliases.conf can be attached.
+# databases listed in databases.conf can be attached.
#
# Note: simple quotation marks shown above should *NOT* be used when
# specifying values and directory path names. Examples:
Modified: firebird/trunk/builds/posix/postfix.darwin
===================================================================
--- firebird/trunk/builds/posix/postfix.darwin 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/builds/posix/postfix.darwin 2013-04-08 16:28:05 UTC (rev 57918)
@@ -105,8 +105,8 @@
cp ../builds/install/arch-specific/darwin/Readme.txt \
$(FB_FW)/Resources/Readme.txt
cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
- cp ../builds/install/arch-specific/darwin/aliases.conf.in \
- $(FB_FW)/Resources/English.lproj/var/aliases.conf
+ cp ../builds/install/arch-specific/darwin/databases.conf.in \
+ $(FB_FW)/Resources/English.lproj/var/databases.conf
cp ../src/utilities/ntrace/fbtrace.conf \
$(FB_FW)/Resources/English.lproj/var/fbtrace.conf
@@ -171,8 +171,8 @@
cp ../builds/install/arch-specific/darwin/Readme.txt \
$(FB_FW)/Resources/Readme.txt
cp ../gen/install/misc/firebird.conf $(FB_FW)/Resources/English.lproj/var
- cp ../builds/install/arch-specific/darwin/aliases.conf.in \
- $(FB_FW)/Resources/English.lproj/var/aliases.conf
+ cp ../builds/install/arch-specific/darwin/databases.conf.in \
+ $(FB_FW)/Resources/English.lproj/var/databases.conf
cp ../src/utilities/ntrace/fbtrace.conf \
$(FB_FW)/Resources/English.lproj/var/fbtrace.conf
darwin_postbuild_target: package
Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/configure.ac 2013-04-08 16:28:05 UTC (rev 57918)
@@ -1114,7 +1114,7 @@
for fb_tgt in $FB_TARGETS; do
AC_CONFIG_FILES([
gen/$fb_tgt/firebird/firebird.conf:builds/install/misc/firebird.conf.in
-gen/$fb_tgt/firebird/aliases.conf:builds/install/misc/aliases.conf.in
+gen/$fb_tgt/firebird/databases.conf:builds/install/misc/databases.conf.in
gen/$fb_tgt/firebird/fbtrace.conf:src/utilities/ntrace/fbtrace.conf
gen/$fb_tgt/firebird/intl/fbintl.conf:builds/install/misc/fbintl.conf
gen/$fb_tgt/firebird/plugins.conf:builds/install/misc/plugins.conf
Modified: firebird/trunk/doc/README.raw_devices
===================================================================
--- firebird/trunk/doc/README.raw_devices 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/doc/README.raw_devices 2013-04-08 16:28:05 UTC (rev 57918)
@@ -74,6 +74,6 @@
In all other aspects raw devices do not have known specific
in use.
- Tip: it's good idea to have raw devices in aliases.conf - in
+ Tip: it's good idea to have raw devices in databases.conf - in
case of HW reconfiguration of your server you will not need to
change connection strings.
Modified: firebird/trunk/doc/install_windows_manually.txt
===================================================================
--- firebird/trunk/doc/install_windows_manually.txt 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/doc/install_windows_manually.txt 2013-04-08 16:28:05 UTC (rev 57918)
@@ -81,7 +81,7 @@
instclient.exe remove <libname>
- Delete installation directory. You may wish to keep the log file, security
- database, firebird.conf and aliases.conf.
+ database, firebird.conf and databases.conf.
Modified: firebird/trunk/src/common/db_alias.cpp
===================================================================
--- firebird/trunk/src/common/db_alias.cpp 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/src/common/db_alias.cpp 2013-04-08 16:28:05 UTC (rev 57918)
@@ -54,7 +54,7 @@
};
InitInstance<DatabaseDirectoryList> databaseDirectoryList;
- const char* const ALIAS_FILE = "aliases.conf";
+ const char* const ALIAS_FILE = "databases.conf";
void replace_dir_sep(PathName& s)
{
@@ -272,8 +272,8 @@
return false;
}
-// Search for 'alias' in aliases.conf, return its value in 'file' if found. Else set file to alias.
-// Returns true if alias is found in aliases.conf.
+// Search for 'alias' in databases.conf, return its value in 'file' if found. Else set file to alias.
+// Returns true if alias is found in databases.conf.
static bool resolveAlias(const PathName& alias, PathName& file, RefPtr<Config>* config)
{
PathName correctedAlias = alias;
@@ -346,7 +346,7 @@
}
// Full processing of database name
-// Returns true if alias was found in aliases.conf
+// Returns true if alias was found in databases.conf
bool expandDatabaseName(const Firebird::PathName& alias,
Firebird::PathName& file,
Firebird::RefPtr<Config>* config)
@@ -357,13 +357,13 @@
}
catch (const fatal_exception& ex)
{
- gds__log("File aliases.conf contains bad data: %s", ex.what());
+ gds__log("File databases.conf contains bad data: %s", ex.what());
(Arg::Gds(isc_random) << "Server misconfigured - contact administrator please").raise();
}
ReadLockGuard guard(aliasesConf().rwLock, "expandDatabaseName");
- // First of all check in aliases.conf
+ // First of all check in databases.conf
if (resolveAlias(alias, file, config))
{
return true;
@@ -390,7 +390,7 @@
}
}
- // Search for correct config in aliases.conf
+ // Search for correct config in databases.conf
if (config)
{
DbName* db = aliasesConf().dbHash.lookup(file);
Modified: firebird/trunk/src/yvalve/PluginManager.cpp
===================================================================
--- firebird/trunk/src/yvalve/PluginManager.cpp 2013-04-08 15:05:22 UTC (rev 57917)
+++ firebird/trunk/src/yvalve/PluginManager.cpp 2013-04-08 16:28:05 UTC (rev 57918)
@@ -395,7 +395,7 @@
PluginModule* builtin = NULL;
// Provides most of configuration services for plugins,
- // except per-database configuration in aliases.conf
+ // except per-database configuration in databases.conf
class ConfiguredPlugin : public RefCntIface<ITimer, FB_TIMER_VERSION>
{
public:
@@ -472,7 +472,7 @@
PathName plugName;
};
- // Provides per-database configuration from aliases.conf.
+ // Provides per-database configuration from databases.conf.
class FactoryParameter : public RefCntIface<IPluginConfig, FB_PLUGIN_CONFIG_VERSION>
{
public:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
