branching/tagging

8 files changed, 58 insertions, 55 deletions

diff --git a/modules/ACE/rpmbuild/ace-tao-ciao.spec b/modules/ACE/rpmbuild/ace-tao-ciao.spec
index 0445981d270..2aad3f4cc4e 100644
--- a/modules/ACE/rpmbuild/ace-tao-ciao.spec
+++ b/modules/ACE/rpmbuild/ace-tao-ciao.spec
@@ -1,7 +1,7 @@
 # Set the version number here.
-%define ACEVER  5.7.1
-%define TAOVER  1.7.1
-%define CIAOVER 0.7.1
+%define ACEVER  5.7.2
+%define TAOVER  1.7.2
+%define CIAOVER 0.7.2
 
 # Conditional build
 # Default values are
@@ -498,7 +498,7 @@ Summary:      Make Project Creator
 Version:      %{ACEVER}
 Group:        Development/Tools/Building
 %if !0%{?suse_version}
-Provides:     perl(Driver) perl(MakeProjectBase) perl(ObjectGenerator) perl(ProjectCreator) perl(WorkspaceCreator) perl(WorkspaceHelper) perl(DependencyWriter) perl (WIXProjectCreator)
+Provides:     perl(Driver) perl(MakeProjectBase) perl(ObjectGenerator) perl(ProjectCreator) perl(WorkspaceCreator) perl(WorkspaceHelper) perl(DependencyWriter) perl(WIXProjectCreator)
 %endif
 
 %description -n mpc
@@ -2043,7 +2043,7 @@ fi
 %files -n ace-gperf
 %defattr(-,root,root,-)
 %{_bindir}/ace_gperf
-%{_libdir}/ACE_gperfd_lib.so.%{ACEVERSO}
+%{_libdir}/libACE_gperf_lib.so.%{ACEVERSO}
 %attr(0644,root,root) %{_mandir}/man1/ace_gperf.1%{_extension}
 %attr(0644,root,root) %{_infodir}/ace_gperf.info%{_extension}
 
@@ -2664,6 +2664,9 @@ fi
 # ================================================================
 
 %changelog
+* Thu Jul 23 2009 Johnny Willemsen <jwillemsen@remedy.nl> - 5.7.2-0
+- New micro release
+
 * Mon Jul 13 2009 Phil Mesnier <mesnier_p@ociweb.com> - 5.7.1-0
 - New micro release
 
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosconcurrency b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosconcurrency
index 340a53eeeed..f0382139b2d 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosconcurrency
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosconcurrency
@@ -7,7 +7,7 @@
 # system startup script for service/daemon tao-cosconcurrency
 #
 # LSB compatible service control script; see http://www.linuxbase.org/spec/
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          tao-cosconcurrency
 # Required-Start:    $syslog $remote_fs tao-cosnaming
@@ -24,22 +24,22 @@
 # Note: Special treatment of stop for LSB conformance
 TAO_COSCONCURRENCY_BIN=/usr/sbin/tao-cosconcurrency
 
-test -x $TAO_COSCONCURRENCY_BIN || { echo "$TAO_COSCONCURRENCY_BIN not installed"; 
+test -x $TAO_COSCONCURRENCY_BIN || { echo "$TAO_COSCONCURRENCY_BIN not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 # Check for existence of needed config file and read it
-TAO_COSCONCURRENCY_CONFIG=/etc/sysconfig/tao-cosconcurrency
+TAO_COSCONCURRENCY_CONFIG=/etc/tao/tao-cosconcurrency
 
 test -r $TAO_COSCONCURRENCY_CONFIG || { echo "$TAO_COSCONCURRENCY_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
 
-# Read config	
+# Read config
 . $TAO_COSCONCURRENCY_CONFIG
 
 # Source LSB init functions
-# providing start_daemon, killproc, pidofproc, 
+# providing start_daemon, killproc, pidofproc,
 # log_success_msg, log_failure_msg and log_warning_msg.
 # This is currently not used by UnitedLinux based distributions and
 # not needed for init scripts for UnitedLinux only. If it is used,
@@ -73,7 +73,7 @@ rc_reset
 # 6       - program is not configured
 # 7       - program is not running
 # 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-# 
+#
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
 # with force-reload (in case signaling is not supported) are
@@ -88,7 +88,7 @@ case "$1" in
 	echo -n "Starting $svcname: "
 	## Start daemon with startproc(8). If this fails
 	## the return value is set appropriately by startproc.
-	/sbin/startproc $TAO_COSCONCURRENCY_BIN $OPTIONS -ORBSvcConf $svcconf --daemon 
+	/sbin/startproc $TAO_COSCONCURRENCY_BIN $OPTIONS -ORBSvcConf $svcconf --daemon
 
 	# Remember status and be verbose
 	rc_status -v
@@ -153,7 +153,7 @@ case "$1" in
 	/sbin/killproc -HUP $TAO_COSCONCURRENCY_BIN
 	#touch /var/run/FOO.pid
 	rc_status -v
-	
+
 	## Otherwise if it does not support reload:
 	#rc_failed 3
 	#rc_status -v
@@ -170,7 +170,7 @@ case "$1" in
 	# 3 - service not running (unused)
 	# 4 - service status unknown :-(
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-	
+
 	# NOTE: checkproc returns LSB compliant status values.
 	/sbin/checkproc $TAO_COSCONCURRENCY_BIN
 	# NOTE: rc_status knows that we called this init script with
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosevent b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosevent
index cc84eee8669..a176e3cb464 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosevent
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosevent
@@ -13,7 +13,7 @@
 # system startup script for service/daemon TAO-cosconcurrency
 #
 # LSB compatible service control script; see http://www.linuxbase.org/spec/
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          TAO-cosconcurrency
 # Required-Start:    $syslog $remote_fs TAO-cosnaming
@@ -30,22 +30,22 @@
 # Note: Special treatment of stop for LSB conformance
 TAO_COSEVENT_BIN=/usr/sbin/tao-cosevent
 
-test -x $TAO_COSEVENT_BIN || { echo "$TAO_COSEVENT_BIN not installed"; 
+test -x $TAO_COSEVENT_BIN || { echo "$TAO_COSEVENT_BIN not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 # Check for existence of needed config file and read it
-TAO_COSEVENT_CONFIG=/etc/sysconfig/tao-cosevent
+TAO_COSEVENT_CONFIG=/etc/tao/tao-cosevent
 
 test -r $TAO_COSEVENT_CONFIG || { echo "$TAO_COSEVENT_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
 
-# Read config	
+# Read config
 . $TAO_COSEVENT_CONFIG
 
 # Source LSB init functions
-# providing start_daemon, killproc, pidofproc, 
+# providing start_daemon, killproc, pidofproc,
 # log_success_msg, log_failure_msg and log_warning_msg.
 # This is currently not used by UnitedLinux based distributions and
 # not needed for init scripts for UnitedLinux only. If it is used,
@@ -79,7 +79,7 @@ rc_reset
 # 6       - program is not configured
 # 7       - program is not running
 # 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-# 
+#
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
 # with force-reload (in case signaling is not supported) are
@@ -160,7 +160,7 @@ case "$1" in
 	/sbin/killproc -HUP $TAO_COSEVENT_BIN
 	#touch /var/run/FOO.pid
 	rc_status -v
-	
+
 	## Otherwise if it does not support reload:
 	#rc_failed 3
 	#rc_status -v
@@ -177,7 +177,7 @@ case "$1" in
 	# 3 - service not running (unused)
 	# 4 - service status unknown :-(
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-	
+
 	# NOTE: checkproc returns LSB compliant status values.
 	/sbin/checkproc $TAO_COSEVENT_BIN
 	# NOTE: rc_status knows that we called this init script with
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnaming b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnaming
index 20c0b475eec..eadd7a4cd01 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnaming
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnaming
@@ -7,7 +7,7 @@
 # system startup script for service/daemon tao-cosnaming
 #
 # LSB compatible service control script; see http://www.linuxbase.org/spec/
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          tao-cosnaming
 # Required-Start:    $syslog $remote_fs
@@ -24,22 +24,22 @@
 # Note: Special treatment of stop for LSB conformance
 TAO_COSNAMING_BIN=/usr/sbin/tao-cosnaming
 
-test -x $TAO_COSNAMING_BIN || { echo "$TAO_COSNAMING_BIN not installed"; 
+test -x $TAO_COSNAMING_BIN || { echo "$TAO_COSNAMING_BIN not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 # Check for existence of needed config file and read it
-TAO_COSNAMING_CONFIG=/etc/sysconfig/TAO-cosnaming
+TAO_COSNAMING_CONFIG=/etc/tao/tao-cosnaming
 
 test -r $TAO_COSNAMING_CONFIG || { echo "$TAO_COSNAMING_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
 
-# Read config	
+# Read config
 . $TAO_COSNAMING_CONFIG
 
 # Source LSB init functions
-# providing start_daemon, killproc, pidofproc, 
+# providing start_daemon, killproc, pidofproc,
 # log_success_msg, log_failure_msg and log_warning_msg.
 # This is currently not used by UnitedLinux based distributions and
 # not needed for init scripts for UnitedLinux only. If it is used,
@@ -73,7 +73,7 @@ rc_reset
 # 6       - program is not configured
 # 7       - program is not running
 # 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-# 
+#
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
 # with force-reload (in case signaling is not supported) are
@@ -153,7 +153,7 @@ case "$1" in
 	/sbin/killproc -HUP $TAO_COSNAMING_BIN
 	#touch /var/run/FOO.pid
 	rc_status -v
-	
+
 	## Otherwise if it does not support reload:
 	#rc_failed 3
 	#rc_status -v
@@ -170,7 +170,7 @@ case "$1" in
 	# 3 - service not running (unused)
 	# 4 - service status unknown :-(
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-	
+
 	# NOTE: checkproc returns LSB compliant status values.
 	/sbin/checkproc $TAO_COSNAMING_BIN
 	# NOTE: rc_status knows that we called this init script with
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnotification b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnotification
index f7c34c79509..9c64ce4072a 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnotification
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-cosnotification
@@ -7,7 +7,7 @@
 # system startup script for service/daemon tao-cosnotification
 #
 # LSB compatible service control script; see http://www.linuxbase.org/spec/
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          tao-cosnotification
 # Required-Start:    $syslog $remote_fs tao-cosnaming
@@ -24,22 +24,22 @@
 # Note: Special treatment of stop for LSB conformance
 TAO_COSNOTIFICATION_BIN=/usr/sbin/tao-cosnotification
 
-test -x $TAO_COSNOTIFICATION_BIN || { echo "$TAO_COSNOTIFICATION_BIN not installed"; 
+test -x $TAO_COSNOTIFICATION_BIN || { echo "$TAO_COSNOTIFICATION_BIN not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 # Check for existence of needed config file and read it
-TAO_COSNOTIFICATION_CONFIG=/etc/sysconfig/tao-cosnotification
+TAO_COSNOTIFICATION_CONFIG=/etc/tao/tao-cosnotification
 
 test -r $TAO_COSNOTIFICATION_CONFIG || { echo "$TAO_COSNOTIFICATION_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
 
-# Read config	
+# Read config
 . $TAO_COSNOTIFICATION_CONFIG
 
 # Source LSB init functions
-# providing start_daemon, killproc, pidofproc, 
+# providing start_daemon, killproc, pidofproc,
 # log_success_msg, log_failure_msg and log_warning_msg.
 # This is currently not used by UnitedLinux based distributions and
 # not needed for init scripts for UnitedLinux only. If it is used,
@@ -73,7 +73,7 @@ rc_reset
 # 6       - program is not configured
 # 7       - program is not running
 # 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-# 
+#
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
 # with force-reload (in case signaling is not supported) are
@@ -153,7 +153,7 @@ case "$1" in
 	/sbin/killproc -HUP $TAO_COSNOTIFICATION_BIN
 	#touch /var/run/FOO.pid
 	rc_status -v
-	
+
 	## Otherwise if it does not support reload:
 	#rc_failed 3
 	#rc_status -v
@@ -170,7 +170,7 @@ case "$1" in
 	# 3 - service not running (unused)
 	# 4 - service status unknown :-(
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-	
+
 	# NOTE: checkproc returns LSB compliant status values.
 	/sbin/checkproc $TAO_COSNOTIFICATION_BIN
 	# NOTE: rc_status knows that we called this init script with
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-costrading b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-costrading
index feb0c5a92f0..a9aba0862c0 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-costrading
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-costrading
@@ -7,7 +7,7 @@
 # system startup script for service/daemon TAO-cosnotification
 #
 # LSB compatible service control script; see http://www.linuxbase.org/spec/
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          tao-costrading
 # Required-Start:    $syslog $remote_fs tao-cosnaming
@@ -24,22 +24,22 @@
 # Note: Special treatment of stop for LSB conformance
 TAO_COSTRADING_BIN=/usr/sbin/tao-costrading
 
-test -x $TAO_COSTRADING_BIN || { echo "$TAO_COSTRADING_BIN not installed"; 
+test -x $TAO_COSTRADING_BIN || { echo "$TAO_COSTRADING_BIN not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 # Check for existence of needed config file and read it
-TAO_COSTRADING_CONFIG=/etc/sysconfig/tao-costrading
+TAO_COSTRADING_CONFIG=/etc/tao/tao-costrading
 
 test -r $TAO_COSTRADING_CONFIG || { echo "$TAO_COSTRADING_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
 
-# Read config	
+# Read config
 . $TAO_COSTRADING_CONFIG
 
 # Source LSB init functions
-# providing start_daemon, killproc, pidofproc, 
+# providing start_daemon, killproc, pidofproc,
 # log_success_msg, log_failure_msg and log_warning_msg.
 # This is currently not used by UnitedLinux based distributions and
 # not needed for init scripts for UnitedLinux only. If it is used,
@@ -73,7 +73,7 @@ rc_reset
 # 6       - program is not configured
 # 7       - program is not running
 # 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-# 
+#
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
 # with force-reload (in case signaling is not supported) are
@@ -153,7 +153,7 @@ case "$1" in
 	/sbin/killproc -HUP $TAO_COSTRADING_BIN
 	#touch /var/run/FOO.pid
 	rc_status -v
-	
+
 	## Otherwise if it does not support reload:
 	#rc_failed 3
 	#rc_status -v
@@ -170,7 +170,7 @@ case "$1" in
 	# 3 - service not running (unused)
 	# 4 - service status unknown :-(
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-	
+
 	# NOTE: checkproc returns LSB compliant status values.
 	/sbin/checkproc $TAO_COSTRADING_BIN
 	# NOTE: rc_status knows that we called this init script with
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-rtevent b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-rtevent
index 05046402f9c..09d44d692d0 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-rtevent
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/init.d/tao-rtevent
@@ -7,7 +7,7 @@
 # system startup script for service/daemon TAO-rtevent
 #
 # LSB compatible service control script; see http://www.linuxbase.org/spec/
-# 
+#
 ### BEGIN INIT INFO
 # Provides:          TAO-rtevent
 # Required-Start:    $syslog $remote_fs tao-cosnaming
@@ -24,22 +24,22 @@
 # Note: Special treatment of stop for LSB conformance
 TAO_RTEVENT_BIN=/usr/sbin/tao-rtevent
 
-test -x $TAO_RTEVENT_BIN || { echo "$TAO_RTEVENT_BIN not installed"; 
+test -x $TAO_RTEVENT_BIN || { echo "$TAO_RTEVENT_BIN not installed";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 5; fi; }
 
 # Check for existence of needed config file and read it
-TAO_RTEVENT_CONFIG=/etc/sysconfig/tao-rtevent
+TAO_RTEVENT_CONFIG=/etc/tao/tao-rtevent
 
 test -r $TAO_RTEVENT_CONFIG || { echo "$TAO_RTEVENT_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
 
-# Read config	
+# Read config
 . $TAO_RTEVENT_CONFIG
 
 # Source LSB init functions
-# providing start_daemon, killproc, pidofproc, 
+# providing start_daemon, killproc, pidofproc,
 # log_success_msg, log_failure_msg and log_warning_msg.
 # This is currently not used by UnitedLinux based distributions and
 # not needed for init scripts for UnitedLinux only. If it is used,
@@ -73,7 +73,7 @@ rc_reset
 # 6       - program is not configured
 # 7       - program is not running
 # 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
-# 
+#
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
 # with force-reload (in case signaling is not supported) are
@@ -153,7 +153,7 @@ case "$1" in
 	/sbin/killproc -HUP $TAO_RTEVENT_BIN
 	#touch /var/run/FOO.pid
 	rc_status -v
-	
+
 	## Otherwise if it does not support reload:
 	#rc_failed 3
 	#rc_status -v
@@ -170,7 +170,7 @@ case "$1" in
 	# 3 - service not running (unused)
 	# 4 - service status unknown :-(
 	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
-	
+
 	# NOTE: checkproc returns LSB compliant status values.
 	/sbin/checkproc $TAO_RTEVENT_BIN
 	# NOTE: rc_status knows that we called this init script with
diff --git a/modules/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming b/modules/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming
index 1a805f0ebcb..bf22c1974db 100755
--- a/modules/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming
+++ b/modules/ACE/rpmbuild/ace-tao-init-suse/tao/tao-cosnaming
@@ -27,7 +27,7 @@ TAO_COSNAMING_MULTICAST=""
 ## ServiceRestart: tao-cosnaming
 #
 # Enable debug logging, set to "-ORBDebugLevel 10" to enable.
-TAO_COSNAMING_DEBUG = ""
+TAO_COSNAMING_DEBUG=""
 
 ## Type            string
 ## Default:        "-ORBLogFile /var/log/tao/tao-cosnaming.log"