5 files changed, 45 insertions, 56 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index fdb2c60d64b..89a8f92a67e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -10,66 +10,56 @@
 
 #pragma ndds typesupport "Base/VTopics_BaseSupport.h"
 
-// Plain Topic
-struct TestTopic {
-  string key; //@key
-  long x;
-};
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
+  //string
+  struct TopicString {
+    string key; //@key
+    string x_str;
+   };
 
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
+  //arrays
+  struct TopicArray {
+    string key; //@key
+    octet x_array[5];
+   };
 
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet x_array[5];
-};
+  //unions
+/*  union X_Union switch (short) {
+    case 0:
+      string x_test;
+    case 1:
+      long   x_long;
+   };
 
-// Unions
-union X_Union switch (short) {
-  case 0:
-    string x_test;
-  case 1:
-    long   x_long;
-};
+  struct TopicUnion {
+    string key; //@key
+    X_Union x_uni;
 
-struct TopicUnion {
-  string key; //@key
-  X_Union x_uni;
-};
+   };
 
-// Sequence
-struct test {
-  short x_test;
-  string x_teststr;
-};
-typedef sequence<test> test_seq;
+ */
 
-struct TopicSeq {
-  string key; //@key
-  test_seq x_seq;
+  struct test {
+    short x_test;
+    string x_teststr;
   };
+  typedef sequence<test> test_seq;
+
+  //sequence
+  struct TopicSeq {
+    string key; //@key
+    test_seq x_seq;
+   };
 
- // ValueType
-valuetype X_Valuetype {
-  public string type;
-  public long x_long;
-};
 
-struct TopicValuetype {
-  string key; //@key
-  X_Valuetype x_vt;
-};
+  typedef sequence<TestTopic> TestTopic_Seq;
+  typedef sequence<TopicString> TopicString_Seq;
+  typedef sequence<TopicArray> TopicArray_Seq;
+ // typedef sequence<TopicUnion> TopicUnion_Seq;
+  typedef sequence<TopicSeq> TopicSeq_Seq;
 
-// Sequences
-typedef sequence<TestTopic> TestTopic_Seq;
-typedef sequence<TopicString> TopicString_Seq;
-typedef sequence<TopicArray> TopicArray_Seq;
-typedef sequence<TopicUnion> TopicUnion_Seq;
-typedef sequence<TopicSeq> TopicSeq_Seq;
-typedef sequence<TopicValuetype> TopicValuetype_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
index e1115f446e0..a3845bb2b50 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
@@ -5,12 +5,11 @@ project (DDS_VTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_defaul
   dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL
   libout = ../lib
 
-  idlflags += -SS -Sci \
+  idlflags += -SS -Gxhst -Sci \
               -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \
               -Wb,stub_export_include=VTopics_Base_stub_export.h
 
   IDL_Files {
-    idlflags += -Gxhst
     VTopics_Base.idl
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
index 9c9211c701a..c5b143dc340 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver_exec.cpp
@@ -8,7 +8,7 @@
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_time.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/ndds/Utils.h"
 
 
 namespace CIAO_VTopics_Receiver_Impl
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
index 81feebce2d4..33663b76c74 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender_exec.cpp
@@ -7,7 +7,7 @@
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
-#include "dds4ccm/impl/dds/Utils.h"
+#include "dds4ccm/impl/ndds/Utils.h"
 
 namespace CIAO_VTopics_Sender_Impl
 {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
index d7266527ff7..6065a5cc28b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
@@ -226,7 +226,7 @@ print "Invoking executor - stop the application -\n";
 print "by running dance_plan_launcher.exe with -k file://$ior_emfile -x $cdp_file -q\n";
 
 $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -s");
+                        "-k file://$ior_emfile -x $cdp_file -q");
 $pl_status = $E->SpawnWaitKill (2 * $tg_executor->ProcessStartWaitInterval ());
 
 if ($pl_status != 0) {