Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO

# Conflicts:
#	ACE/protocols/ace/HTBP/HTBP_Channel.cpp
#	ACE/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
#	ACE/protocols/ace/HTBP/HTBP_Session.cpp

4 files changed, 0 insertions, 176 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
deleted file mode 100644
index e2c585fc01a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @file RG_ResetTopic_Base.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef RG_RESETTOPIC_BASE_IDL
-#define RG_RESETTOPIC_BASE_IDL
-
-#pragma ndds typesupport "Base/RG_ResetTopic_BaseSupport.h"
-#pragma opendds typesupport "Base/RG_ResetTopic_BaseTypeSupportImpl.h"
-
-#pragma DCPS_DATA_TYPE "RG_ResetTopicSample"
-#pragma DCPS_DATA_KEY "RG_ResetTopicSample key"
-
-struct RG_ResetTopicSample {
-  string key; //@key
-  long iteration;
-};
-
-#if defined DDS4CCM_NEEDS_SEQUENCES_DEFINED
-typedef sequence<RG_ResetTopicSample> RG_ResetTopicSampleSeq;
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
deleted file mode 100644
index 4a603838df6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/RG_ResetTopic_Base.mpc
+++ /dev/null
@@ -1,24 +0,0 @@
-project (RG_ResetTopicBase_stub) : taoidldefaults, dds4ccm_ts_default {
-  sharedname = RG_ResetTopicBase_stub
-  dynamicflags += RG_RESETTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Sci \
-              -Wb,stub_export_macro=RG_RESETTOPIC_BASE_STUB_Export \
-              -Wb,stub_export_include=LateBinding_Base_stub_export.h
-
-  IDL_Files {
-    idlflags += -Gxhst
-    RG_ResetTopic_Base.idl
-  }
-
-  opendds_ts_flags += --export=RG_RESETTOPIC_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    RG_ResetTopic_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
deleted file mode 100644
index b237220bed5..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * @file Reader_Starter.idl
- * @author Marcel Smit (msmit@remedy.nl)
- */
-
-#ifndef READER_STARTER_IDL
-#define READER_STARTER_IDL
-
-#pragma ciao lem "Base/Reader_StarterE.idl"
-
-interface ReaderStarter
-{
-  void start_read (in string topic_name);
-  void set_reader_properties (in unsigned short nr_keys,
-                              in unsigned short nr_iterations);
-};
-
-#endif /* READER_STARTER_IDL */
diff --git a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
deleted file mode 100644
index f557cee43cb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/ResetTopic/ReadGet/Base/Reader_Starter.mpc
+++ /dev/null
@@ -1,110 +0,0 @@
-project(reader_starter_rt_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after +=
-  idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
-              -Wb,stub_export_include=reader_starter_rt_stub_export.h \
-              -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,skel_export_include=reader_starter_rt_svnt_export.h \
-              -Wb,svnt_export_macro=READER_STARTER_SVNT_Export \
-              -Wb,svnt_export_include=reader_starter_rt_svnt_export.h \
-              -Wb,exec_export_macro=READER_STARTER_EXEC_Export \
-              -Wb,exec_export_include=Reader_Starter_exec_export.h -I..
-
-  IDL_Files {
-    Reader_Starter.idl
-  }
-}
-
-project(reader_starter_rt_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += reader_starter_rt_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
-              -Wb,stub_export_include=reader_starter_rt_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Reader_StarterE.idl
-  }
-}
-
-project(reader_starter_rt_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += reader_starter_rt_lem_gen reader_starter_rt_stub
-  libs  += reader_starter_rt_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = reader_starter_rt_lem_stub
-  dynamicflags += READER_STARTER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterEC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterEC.h
-    reader_starter_rt_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterEC.inl
-  }
-}
-
-project(reader_starter_rt_stub) : ccm_stub, dds4ccm_base {
-  after += reader_starter_rt_idl_gen
-  libs  +=
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = reader_starter_rt_stub
-  dynamicflags += READER_STARTER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterC.cpp
-  }
-
-  Header_Files {
-    Reader_StarterC.h
-    reader_starter_rt_stub_export.h
-  }
-
-  Inline_Files {
-    Reader_StarterC.inl
-  }
-}
-
-
-project(reader_starter_rt_svnt) : ciao_servant, dds4ccm_lem_stub, dds4ccm_skel {
-  after      +=   reader_starter_rt_lem_stub reader_starter_rt_stub
-  sharedname  = reader_starter_rt_svnt
-  libs       += reader_starter_rt_stub reader_starter_rt_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags += READER_STARTER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Reader_StarterS.cpp
-    Reader_Starter_svnt.cpp
-  }
-
-  Header_Files {
-    Reader_StarterS.h
-    Reader_Starter_svnt.h
-    reader_starter_rt_svnt_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-