Thu Dec 10 08:06:08 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc:
        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc:
        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc:
        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc:
        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp:
          Shorten the names of the projects in order to solve some fuzz warnings.

6 files changed, 78 insertions, 69 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fb21c970442..0bd5c0259c0 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Thu Dec 10 08:06:08 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc:
+        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc:
+        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc:
+        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc:
+        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp:
+          Shorten the names of the projects in order to solve some fuzz warnings.
+
 Wed Dec  9 19:52:16 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DAnCE/Deployment/Deployment_DeploymentPlan.idl
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
index cff912a77b8..94f34e28e7f 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_State_Connection_Base_idl_gen) : taoidldefaults, anytypecode {
+project(DDS_SCT_Base_idl_gen) : taoidldefaults, anytypecode {
   custom_only = 1
   idlflags -= -St -Sa
   idlflags += -SS -Gxhst \
@@ -12,9 +12,9 @@ project(DDS_State_Connection_Base_idl_gen) : taoidldefaults, anytypecode {
   }
 }
 
-project(DDS_State_Connection_Base_ndds_ts_gen) : ndds_ts_defaults   {
+project(DDS_SCT_Base_ndds_ts_gen) : ndds_ts_defaults   {
   custom_only = 1
-  after += DDS_State_Connection_Base_idl_gen
+  after += DDS_SCT_Base_idl_gen
   ndds_ts_flags += -corba State_Connection_Test_BaseC.h -orb ACE_TAO1.7
 
   NDDSTypeSupport_Files {
@@ -22,12 +22,12 @@ project(DDS_State_Connection_Base_ndds_ts_gen) : ndds_ts_defaults   {
   }
 }
 
-project(DDS_State_Connection_Base_NDDS_TS) : nddslib, taolib {
-  after += DDS_State_Connection_Base_ndds_ts_gen DDS_State_Connection_Base_stub
-  libs += DDS_State_Connection_Base_stub
+project(DDS_SCT_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_SCT_Base_ndds_ts_gen DDS_SCT_Base_stub
+  libs += DDS_SCT_Base_stub
   libout = ../lib
   libpaths    += ../lib
-  sharedname = DDS_State_Connection_Base_NDDS_TS
+  sharedname = DDS_SCT_Base_NDDS_TS
   dynamicflags = NDDS_USER_DLL_EXPORT
 
   verbatim(gnuace, macros) {
@@ -50,11 +50,11 @@ project(DDS_State_Connection_Base_NDDS_TS) : nddslib, taolib {
   }
 }
 
-project(DDS_State_Connection_Base_stub) : ccm_stub {
-  after += DDS_State_Connection_Base_idl_gen
+project(DDS_SCT_Base_stub) : ccm_stub {
+  after += DDS_SCT_Base_idl_gen
   libout = ../lib
   libpaths += ../lib
-  sharedname = DDS_State_Connection_Base_stub
+  sharedname = DDS_SCT_Base_stub
   dynamicflags = STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
index c2f9c013c47..c1211c7ce56 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_State_Connection_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
+// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
 
-project(DDS_State_Connection_Connector_idl_gen) : connectoridldefaults {
+project(DDS_SCT_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \
@@ -19,9 +19,9 @@ project(DDS_State_Connection_Connector_idl_gen) : connectoridldefaults {
   }
 }
 
-project(DDS_State_Connection_Connector_lem_gen) : ciaoidldefaults {
+project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
-  after += DDS_State_Connection_Connector_idl_gen
+  after += DDS_SCT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=State_Connection_Test_Connector_lem_stub_export.h \
               -SS -Gxhst \
@@ -32,13 +32,13 @@ project(DDS_State_Connection_Connector_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_State_Connection_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_State_Connection_Connector_lem_gen DDS_State_Connection_Connector_stub DDS_State_Connection_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub DDS4CCM_lem_stub
+project(DDS_SCT_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_SCT_Connector_lem_gen DDS_SCT_Connector_stub DDS_SCT_Base_stub DDS4CCM_lem_stub
+  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  sharedname = DDS_State_Connection_Connector_lem_stub
+  sharedname = DDS_SCT_Connector_lem_stub
   dynamicflags   = STATE_CONNECTION_CONNECTOR_LEM_STUB_BUILD_DLL
 
   IDL_Files {
@@ -58,13 +58,13 @@ project(DDS_State_Connection_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_State_Connection_Connector_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_State_Connection_Connector_idl_gen DDS_State_Connection_Base_stub
-  libs  += DDS_State_Connection_Base_stub
+project(DDS_SCT_Connector_stub) : ccm_stub, dds4ccm_base   {
+  after += DDS_SCT_Connector_idl_gen DDS_SCT_Base_stub
+  libs  += DDS_SCT_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  sharedname = DDS_State_Connection_Connector_stub
+  sharedname = DDS_SCT_Connector_stub
   dynamicflags   = STATE_CONNECTION_CONNECTOR_STUB_BUILD_DLL
 
   IDL_Files {
@@ -84,10 +84,10 @@ project(DDS_State_Connection_Connector_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_State_Connection_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
-  after   += DDS_State_Connection_Connector_lem_stub DDS_State_Connection_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_State_Connection_Base_NDDS_TS
-  sharedname = DDS_State_Connection_Connector_exec
-  libs += DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_lem_stub DDS_State_Connection_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_State_Connection_Base_NDDS_TS
+project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_skel, nddslib {
+  after   += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_SCT_Base_NDDS_TS
+  sharedname = DDS_SCT_Connector_exec
+  libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_SCT_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -110,13 +110,13 @@ project(DDS_State_Connection_Connector_exec) : ciao_executor, dds4ccm_skel, ndds
 }
 
 
-project(DDS_State_Connection_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
-  after      += DDS_State_Connection_Connector_lem_stub DDS_State_Connection_Connector_exec DDS_State_Connection_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_State_Connection_Connector_svnt
-  libs       += DDS_State_Connection_Connector_stub \
-                DDS_State_Connection_Connector_lem_stub  \
-                DDS_State_Connection_Base_stub \
-                DDS_State_Connection_Connector_exec \
+project(DDS_SCT_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
+  after      += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_exec DDS_SCT_Connector_stub DDS4CCM_lem_stub
+  sharedname  = DDS_SCT_Connector_svnt
+  libs       += DDS_SCT_Connector_stub \
+                DDS_SCT_Connector_lem_stub  \
+                DDS_SCT_Base_stub \
+                DDS_SCT_Connector_exec \
                 DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
index 6f5e62bc4af..b56f86f819b 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
@@ -1,8 +1,8 @@
 // $Id$
 
-project(DDS_State_Connection_Receiver_idl_gen) : componentidldefaults {
+project(DDS_SCT_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
-  after += DDS_State_Connection_Connector_idl_gen
+  after += DDS_SCT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
@@ -17,8 +17,8 @@ project(DDS_State_Connection_Receiver_idl_gen) : componentidldefaults {
   }
 }
 
-project(DDS_State_Connection_Receiver_lem_gen) : ciaoidldefaults {
-  after += DDS_State_Connection_Receiver_idl_gen
+project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults {
+  after += DDS_SCT_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
               -Wb,stub_export_include=Receiver_lem_stub_export.h \
@@ -29,9 +29,9 @@ project(DDS_State_Connection_Receiver_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_State_Connection_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
-  after += DDS_State_Connection_Receiver_lem_gen DDS_State_Connection_Receiver_stub  DDS_State_Connection_Connector_stub DDS_State_Connection_Base_stub
-  libs  +=  Receiver_stub DDS_State_Connection_Connector_stub DDS_State_Connection_Base_stub
+project(DDS_SCT_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
+  after += DDS_SCT_Receiver_lem_gen DDS_SCT_Receiver_stub  DDS_SCT_Connector_stub DDS_SCT_Base_stub
+  libs  +=  Receiver_stub DDS_SCT_Connector_stub DDS_SCT_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -55,9 +55,9 @@ project(DDS_State_Connection_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
   }
 }
 
-project(DDS_State_Connection_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_State_Connection_Receiver_idl_gen  DDS_State_Connection_Connector_stub DDS_State_Connection_Base_stub DDS_State_Connection_Connector_lem_gen
-  libs  += DDS_State_Connection_Connector_stub DDS_State_Connection_Base_stub
+project(DDS_SCT_Receiver_stub) : ccm_stub, dds4ccm_base {
+  after += DDS_SCT_Receiver_idl_gen  DDS_SCT_Connector_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_gen
+  libs  += DDS_SCT_Connector_stub DDS_SCT_Base_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -81,10 +81,10 @@ project(DDS_State_Connection_Receiver_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_State_Connection_Receiver_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_State_Connection_Receiver_lem_stub DDS_State_Connection_Receiver_stub DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_lem_stub DDS4CCM_lem_stub
+project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_base {
+  after   += DDS_SCT_Receiver_lem_stub DDS_SCT_Receiver_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub
   sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_lem_stub DDS4CCM_lem_stub
+  libs += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -107,10 +107,10 @@ project(DDS_State_Connection_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_State_Connection_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      +=   DDS_State_Connection_Receiver_lem_stub DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_svnt DDS_State_Connection_Receiver_exec DDS_State_Connection_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      +=   DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_svnt Receiver_exec DDS_State_Connection_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
+  libs       += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
index 7fbf71399c7..f426b616880 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
@@ -1,8 +1,8 @@
 // $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_State_Connection_Base -l ../lib -o ../lib -c controller -u DDS Sender"
+// This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_State_Connection_Sender_idl_gen) : componentidldefaults   {
-  after += DDS_State_Connection_Connector_idl_gen
+project(DDS_SCT_Sender_idl_gen) : componentidldefaults   {
+  after += DDS_SCT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -19,8 +19,8 @@ project(DDS_State_Connection_Sender_idl_gen) : componentidldefaults   {
   }
 }
 
-project(DDS_State_Connection_Sender_lem_gen) : ciaoidldefaults {
-  after += DDS_State_Connection_Sender_idl_gen
+project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults {
+  after += DDS_SCT_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
               -Wb,stub_export_include=Sender_lem_stub_export.h \
@@ -31,9 +31,9 @@ project(DDS_State_Connection_Sender_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(DDS_State_Connection_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
-  after += DDS_State_Connection_Sender_lem_gen DDS_State_Connection_Sender_stub DDS_State_Connection_Base_stub
-  libs  += DDS_State_Connection_Base_stub Sender_stub
+project(DDS_SCT_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
+  after += DDS_SCT_Sender_lem_gen DDS_SCT_Sender_stub DDS_SCT_Base_stub
+  libs  += DDS_SCT_Base_stub Sender_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -57,9 +57,9 @@ project(DDS_State_Connection_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   }
 }
 
-project(DDS_State_Connection_Sender_stub) : ccm_stub, dds4ccm_base   {
-  after += DDS_State_Connection_Sender_idl_gen DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub
-  libs  += DDS_State_Connection_Base_stub DDS_State_Connection_Connector_stub
+project(DDS_SCT_Sender_stub) : ccm_stub, dds4ccm_base   {
+  after += DDS_SCT_Sender_idl_gen DDS_SCT_Base_stub DDS_SCT_Connector_stub
+  libs  += DDS_SCT_Base_stub DDS_SCT_Connector_stub
   includes += ..
   libpaths += ../lib
   libout = ../lib
@@ -83,10 +83,10 @@ project(DDS_State_Connection_Sender_stub) : ccm_stub, dds4ccm_base   {
   }
 }
 
-project(DDS_State_Connection_Sender_exec) : ciao_executor, dds4ccm_base   {
-  after   += DDS_State_Connection_Sender_lem_stub DDS_State_Connection_Sender_stub DDS_State_Connection_Connector_lem_stub DDS_State_Connection_Connector_stub
+project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base   {
+  after   += DDS_SCT_Sender_lem_stub DDS_SCT_Sender_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub
   sharedname = Sender_exec
-  libs += Sender_stub Sender_lem_stub DDS_State_Connection_Base_stub DDS_State_Connection_Connector_lem_stub DDS_State_Connection_Connector_stub
+  libs += Sender_stub Sender_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub
   libpaths += ../lib
   includes += ..
   libout = ../lib
@@ -109,11 +109,11 @@ project(DDS_State_Connection_Sender_exec) : ciao_executor, dds4ccm_base   {
 }
 
 
-project(DDS_State_Connection_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
-  after      += DDS_State_Connection_Base_stub  DDS_State_Connection_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_svnt  DDS_State_Connection_Connector_lem_stub
+project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      += DDS_SCT_Base_stub  DDS_SCT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SCT_Connector_stub DDS_SCT_Connector_svnt  DDS_SCT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
-                DDS_State_Connection_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_State_Connection_Connector_stub DDS_State_Connection_Connector_svnt DDS_State_Connection_Connector_lem_stub
+                DDS_SCT_Base_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Connector_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
index edf55fa6b3c..296570b84b9 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/Plan.cdp
@@ -533,19 +533,19 @@
     <name>State_Connection_Test_Connector_exec</name>
     <source/>
     <node/>
-    <location>DDS_State_Connection_Connector_exec</location>
+    <location>DDS_SCT_Connector_exec</location>
   </artifact>
   <artifact xmi:id="State_Connection_Test_Connector_SvntArtifact">
     <name>State_Connection_Test_Connector_svnt</name>
     <source/>
     <node/>
-    <location>DDS_State_Connection_Connector_svnt</location>
+    <location>DDS_SCT_Connector_svnt</location>
   </artifact>
   <artifact xmi:id="State_Connection_Test_Connector_StubArtifact">
     <name>State_Connection_Test_Connector_stub</name>
     <source/>
     <node/>
-    <location>DDS_State_Connection_Connector_stub</location>
+    <location>DDS_SCT_Connector_stub</location>
   </artifact>
   <artifact xmi:id="Receiver_ExecArtifact">
     <name>Receiver_exec</name>