summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-08-04 01:39:02 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-08-04 01:39:02 +0000
commitc99e93de99233c4dd4fa72ab56adfb58ba028ed0 (patch)
tree7cc6ef9ebc4464c6963e62fceb9d2cb8c224caf3
parenta32d81d295e9c52e73eddf68310067c90552420d (diff)
downloadATCD-c99e93de99233c4dd4fa72ab56adfb58ba028ed0.tar.gz
Completed the Policy_Combinations test.
-rw-r--r--TAO/tao/Strategies/SHMIOP_Acceptor.cpp4
-rw-r--r--TAO/tests/RTCORBA/RTCORBA_tests.dsw38
2 files changed, 33 insertions, 9 deletions
diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
index 4a1cd5687ad..05e8d147626 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -367,7 +367,7 @@ TAO_SHMIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
if (TAO_debug_level > 0)
{
ACE_DEBUG ((LM_DEBUG,
- ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"),
+ ACE_TEXT ("TAO (%P|%t) SHMIOP_Profile::decode - v%d.%d\n"),
major,
minor));
}
@@ -486,7 +486,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
if (name == "priority")
{
ACE_ERROR_RETURN ((LM_ERROR,
- ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ")
+ ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ")
ACE_TEXT ("endpoint priorities no longer supported. \n"),
value.c_str ()),
-1);
diff --git a/TAO/tests/RTCORBA/RTCORBA_tests.dsw b/TAO/tests/RTCORBA/RTCORBA_tests.dsw
index f2f059be667..70731e9b93f 100644
--- a/TAO/tests/RTCORBA/RTCORBA_tests.dsw
+++ b/TAO/tests/RTCORBA/RTCORBA_tests.dsw
@@ -123,6 +123,30 @@ Package=<4>
###############################################################################
+Project: "Policy_Combinations Client"=.\Policy_Combinations\client.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "Policy_Combinations Server"=.\Policy_Combinations\server.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "Private_Connection Client"=.\Private_Connection\client.dsp - Package Owner=<4>
Package=<5>
@@ -147,7 +171,7 @@ Package=<4>
###############################################################################
-Project: "Server_Declared Client"=.\Server_Declared\client.dsp - Package Owner=<4>
+Project: "RTMutex Server"=.\RTMutex\server.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -159,7 +183,7 @@ Package=<4>
###############################################################################
-Project: "Server_Declared Server"=.\Server_Declared\server.dsp - Package Owner=<4>
+Project: "Server_Declared Client"=.\Server_Declared\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -171,7 +195,7 @@ Package=<4>
###############################################################################
-Project: "Server_Protocol Client"=.\Server_Protocol\client.dsp - Package Owner=<4>
+Project: "Server_Declared Server"=.\Server_Declared\server.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -183,7 +207,7 @@ Package=<4>
###############################################################################
-Project: "Server_Protocol Server"=.\Server_Protocol\server.dsp - Package Owner=<4>
+Project: "Server_Protocol Client"=.\Server_Protocol\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -195,7 +219,7 @@ Package=<4>
###############################################################################
-Project: "Thread_Pool Client"=.\Thread_Pool\client.dsp - Package Owner=<4>
+Project: "Server_Protocol Server"=.\Server_Protocol\server.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -207,7 +231,7 @@ Package=<4>
###############################################################################
-Project: "Thread_Pool Server"=.\Thread_Pool\server.dsp - Package Owner=<4>
+Project: "Thread_Pool Client"=.\Thread_Pool\client.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -219,7 +243,7 @@ Package=<4>
###############################################################################
-Project: "RTMutex Server"=.\RTMutex\server.dsp - Package Owner=<4>
+Project: "Thread_Pool Server"=.\Thread_Pool\server.dsp - Package Owner=<4>
Package=<5>
{{{