summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-02-15 13:12:07 +0000
committerelliott_c <elliott_c@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-02-15 13:12:07 +0000
commitdc51e93bde1526327b5e9884b3db62f8adc1b06f (patch)
tree65f3ba3b0206106ebd925b4fc01a6f84b200aa42 /TAO
parentdcacf21fd717fe524090c0f4a3d3ee50d43ed3b9 (diff)
downloadATCD-dc51e93bde1526327b5e9884b3db62f8adc1b06f.tar.gz
ChangeLogTag: Thu Feb 15 13:09:42 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLog29
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc2
-rw-r--r--TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc2
-rw-r--r--TAO/examples/Simple/bank/bank.mpc2
-rw-r--r--TAO/examples/ior_corbaloc/ior_corbaloc.mpc2
-rw-r--r--TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc2
-rw-r--r--TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc4
-rw-r--r--TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc2
-rw-r--r--TAO/performance-tests/Callback/Callback.mpc8
-rw-r--r--TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc2
-rw-r--r--TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc4
-rw-r--r--TAO/performance-tests/Pluggable/Pluggable.mpc2
-rw-r--r--TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc2
-rw-r--r--TAO/tests/Bug_1676_Regression/client.cpp2
-rw-r--r--TAO/tests/ICMG_Any_Bug/Hello.mpc2
-rw-r--r--TAO/tests/MT_BiDir/client.cpp2
-rw-r--r--TAO/tests/OctetSeq/OctetSeq.mpc2
19 files changed, 52 insertions, 23 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 55bdf47d0f2..d507eb34c42 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Thu Feb 15 13:09:42 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
+
+ * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+ * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+ * examples/Simple/bank/bank.mpc:
+ * examples/ior_corbaloc/ior_corbaloc.mpc:
+ * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc:
+ * orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc:
+ * orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc:
+ * orbsvcs/tests/Notify/Discarding/Discarding.mpc:
+ * orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc:
+ * performance-tests/Callback/Callback.mpc:
+ * performance-tests/Memory/Single_Threaded/Memory_Growth.mpc:
+ * performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc:
+ * performance-tests/Pluggable/Pluggable.mpc:
+ * performance-tests/Sequence_Latency/Deferred/Deferred.mpc:
+ * tests/ICMG_Any_Bug/Hello.mpc:
+ * tests/OctetSeq/OctetSeq.mpc:
+
+ Re-arranged the generated source files so that they are at the
+ beginning (like MPC would do if it were automatically generating
+ the list of source files). This is required for template
+ instantiation to work properly for Visual Age 6.0.
+
+ * tests/Bug_1676_Regression/client.cpp:
+ * tests/MT_BiDir/client.cpp:
+
+ Changed "catched" to "caught".
+
Thu Feb 15 07:46:14 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Bug_2560_Regression/server.cpp:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
index 9a330589bd5..a1956a49971 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
@@ -13,8 +13,8 @@ project(*Server): csd_threadpool, taoserver, pi, avoids_corba_e_micro {
after += *idl
Source_Files {
- FooS.cpp
FooC.cpp
+ FooS.cpp
Foo_i.cpp
OrbTask.cpp
ServerApp.cpp
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index 20122bafaea..824dca4d76d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -15,8 +15,8 @@ project(*Server): csd_threadpool, taoserver, avoids_minimum_corba, avoids_corba_
after += *idl
Source_Files {
- FooS.cpp
FooC.cpp
+ FooS.cpp
Foo_i.cpp
ServerApp.cpp
server_main.cpp
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 911a626883b..34179d05bdd 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -12,8 +12,8 @@ project(*server): namingexe, iortable, utils, avoids_corba_e_micro {
exename = server
after += *IDL
Source_Files {
- BankS.cpp
BankC.cpp
+ BankS.cpp
Account_i.cpp
AccountManager_i.cpp
../Simple_util.cpp
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index a7e25194fbc..f2c5451d7cd 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -13,8 +13,8 @@ project(*server): namingexe, portableserver {
after += *IDL
Source_Files {
- corbalocS.cpp
corbalocC.cpp
+ corbalocS.cpp
status_i.cpp
server.cpp
}
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index ab009dea00a..1373d0a3582 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -9,8 +9,8 @@ project(*idl): taoidldefaults {
project(*Server): orbsvcsexe, fault_tolerance, tmcast, pi_server, interceptors {
after += *idl
Source_Files {
- RolyPolyS.cpp
RolyPolyC.cpp
+ RolyPolyS.cpp
RolyPoly_i.cpp
ORB_Initializer.cpp
ReplicaController.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
index 39952cd6ebd..4275aecbd97 100644
--- a/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Bug_2615_Regression.mpc
@@ -25,8 +25,8 @@ project (*Server) : taoserver, ftclientorb, pi_server {
exename = server
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
server.cpp
Hello.cpp
ServerORBInitializer2.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
index 8c73a352758..c283222d560 100644
--- a/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Bug_2709_Regression.mpc
@@ -12,8 +12,8 @@ project(*Client): taoserver, iortable, ftclientorb, fault_tolerance {
after += *idl
exename = client
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
client.cpp
Client_Task.cpp
Server_Task.cpp
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index a2e662bee54..ef176697b7e 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -13,8 +13,8 @@ project(*Ntf Struct Supp): notifytest {
after += *idl
Source_Files {
- goS.cpp
goC.cpp
+ goS.cpp
Structured_Supplier.cpp
}
IDL_Files {
@@ -39,8 +39,8 @@ project(*Ntf Seq Supp): notifytest {
after += *idl
Source_Files {
- goS.cpp
goC.cpp
+ goS.cpp
Sequence_Supplier.cpp
}
IDL_Files {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
index a66c80a9f27..5d5a9e17f90 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
@@ -15,8 +15,8 @@ project(*Ntf Seq Supp): notifytest {
after += *idl
Source_Files {
- goS.cpp
goC.cpp
+ goS.cpp
Sequence_Supplier.cpp
}
IDL_Files {
diff --git a/TAO/performance-tests/Callback/Callback.mpc b/TAO/performance-tests/Callback/Callback.mpc
index 55764d4ae3a..2d9fbe40121 100644
--- a/TAO/performance-tests/Callback/Callback.mpc
+++ b/TAO/performance-tests/Callback/Callback.mpc
@@ -12,10 +12,10 @@ project(*server): taoserver, messaging, strategies {
after += *Perf_IDL
avoids += ace_for_tao
Source_Files {
+ callbackC.cpp
+ callbackS.cpp
Server_i.cpp
server.cpp
- callbackS.cpp
- callbackC.cpp
}
IDL_Files {
}
@@ -25,10 +25,10 @@ project(*client): taoexe, messaging, portableserver, strategies {
after += *Perf_IDL
avoids += ace_for_tao
Source_Files {
+ callbackC.cpp
+ callbackS.cpp
Callback_i.cpp
client.cpp
- callbackS.cpp
- callbackC.cpp
}
IDL_Files {
}
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
index 7fa47023a38..2acd1ce5e05 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
+++ b/TAO/performance-tests/Memory/Single_Threaded/Memory_Growth.mpc
@@ -12,8 +12,8 @@ project(*idl): taoidldefaults {
project(*server): taoserver {
after += *idl
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
Memory_Growth.cpp
server.cpp
}
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index e0e2c10fd07..7e6e57c1719 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -15,8 +15,8 @@ project(*server): taoserver {
after += *idl
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
Factory.cpp
Simple.cpp
server.cpp
@@ -44,8 +44,8 @@ project(*collocated): taoserver {
after += *idl
exename = collocated
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
Simple.cpp
collocated.cpp
}
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index caba1d13456..75e85bf24df 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -11,8 +11,8 @@ project(*idl): taoidldefaults {
project(*server): taoserver, utils, avoids_corba_e_micro {
after += *idl
Source_Files {
- PP_TestS.cpp
PP_TestC.cpp
+ PP_TestS.cpp
PP_Test_Server.cpp
PP_Test_i.cpp
server.cpp
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 2fbfd86306b..54def5f5f87 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
@@ -13,8 +13,8 @@ project(*sequence server): taoserver, strategies, avoids_minimum_corba, avoids_c
exename = server
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
Roundtrip.cpp
server.cpp
}
diff --git a/TAO/tests/Bug_1676_Regression/client.cpp b/TAO/tests/Bug_1676_Regression/client.cpp
index 7a5e4c8c920..5b778002e7a 100644
--- a/TAO/tests/Bug_1676_Regression/client.cpp
+++ b/TAO/tests/Bug_1676_Regression/client.cpp
@@ -126,7 +126,7 @@ void get_stringList2(Test::Hello_var hello)
}
catch (const CORBA::BAD_PARAM& )
{
- ACE_DEBUG ((LM_DEBUG, "(%P|%t) - catched expected exception BAD_PARAM\n"));
+ ACE_DEBUG ((LM_DEBUG, "(%P|%t) - caught expected exception BAD_PARAM\n"));
}
catch (const CORBA::Exception& ex)
{
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index 704df71ad6f..11b1b561a3a 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -13,8 +13,8 @@ project(ICMG_Any_Bug_Hello_IDL): taoidldefaults {
project(ICMG_Any_Bug_Hello_Server): taoserver {
after += ICMG_Any_Bug_Hello_IDL
Source_Files {
- TestS.cpp
TestC.cpp
+ TestS.cpp
Hello.cpp
HelloWorld.cpp
server.cpp
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index a05380c7256..724fdc4bfcc 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
}
catch (const CORBA::Exception& ex)
{
- ex._tao_print_exception ("Catched exception:");
+ ex._tao_print_exception ("Caught exception:");
return 1;
}
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index 210815c2ac8..dd82699300d 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -12,8 +12,8 @@ project(*Server): taoserver {
avoids += ace_for_tao
after += *idl
Source_Files {
- testS.cpp
testC.cpp
+ testS.cpp
test_i.cpp
server.cpp
}