summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog39
-rw-r--r--ace/HTBP/Makefile.am60
-rw-r--r--ace/ace.mwc1
-rw-r--r--protocols/ace/HTBP/HTBP.mpc (renamed from ace/HTBP/HTBP.mpc)0
-rw-r--r--protocols/ace/HTBP/HTBP_Addr.cpp (renamed from ace/HTBP/HTBP_Addr.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Addr.h (renamed from ace/HTBP/HTBP_Addr.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Channel.cpp (renamed from ace/HTBP/HTBP_Channel.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Channel.h (renamed from ace/HTBP/HTBP_Channel.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Channel.inl (renamed from ace/HTBP/HTBP_Channel.inl)0
-rw-r--r--protocols/ace/HTBP/HTBP_Environment.cpp (renamed from ace/HTBP/HTBP_Environment.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Environment.h (renamed from ace/HTBP/HTBP_Environment.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Export.h (renamed from ace/HTBP/HTBP_Export.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Filter.cpp (renamed from ace/HTBP/HTBP_Filter.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Filter.h (renamed from ace/HTBP/HTBP_Filter.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Filter.inl (renamed from ace/HTBP/HTBP_Filter.inl)0
-rw-r--r--protocols/ace/HTBP/HTBP_Filter_Factory.cpp (renamed from ace/HTBP/HTBP_Filter_Factory.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Filter_Factory.h (renamed from ace/HTBP/HTBP_Filter_Factory.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_ID_Requestor.cpp (renamed from ace/HTBP/HTBP_ID_Requestor.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_ID_Requestor.h (renamed from ace/HTBP/HTBP_ID_Requestor.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp (renamed from ace/HTBP/HTBP_Inside_Squid_Filter.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h (renamed from ace/HTBP/HTBP_Inside_Squid_Filter.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl (renamed from ace/HTBP/HTBP_Inside_Squid_Filter.inl)0
-rw-r--r--protocols/ace/HTBP/HTBP_Macros.h (renamed from ace/HTBP/HTBP_Macros.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Notifier.cpp (renamed from ace/HTBP/HTBP_Notifier.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Notifier.h (renamed from ace/HTBP/HTBP_Notifier.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Notifier.inl (renamed from ace/HTBP/HTBP_Notifier.inl)0
-rw-r--r--protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp (renamed from ace/HTBP/HTBP_Outside_Squid_Filter.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h (renamed from ace/HTBP/HTBP_Outside_Squid_Filter.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl (renamed from ace/HTBP/HTBP_Outside_Squid_Filter.inl)0
-rw-r--r--protocols/ace/HTBP/HTBP_Session.cpp (renamed from ace/HTBP/HTBP_Session.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Session.h (renamed from ace/HTBP/HTBP_Session.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Session.inl (renamed from ace/HTBP/HTBP_Session.inl)0
-rw-r--r--protocols/ace/HTBP/HTBP_Stream.cpp (renamed from ace/HTBP/HTBP_Stream.cpp)0
-rw-r--r--protocols/ace/HTBP/HTBP_Stream.h (renamed from ace/HTBP/HTBP_Stream.h)0
-rw-r--r--protocols/ace/HTBP/HTBP_Stream.inl (renamed from ace/HTBP/HTBP_Stream.inl)0
-rw-r--r--protocols/ace/HTBP/HTID_Generator.cgi (renamed from ace/HTBP/HTID_Generator.cgi)0
-rw-r--r--protocols/ace/HTBP/README (renamed from ace/HTBP/README)0
37 files changed, 35 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog
index 9296719f7f3..44f198b35e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+Thu Nov 4 22:08:40 2004 Phil Mesnier <mesnier_p@ociweb.com>
+
+ * ace/HTBP/:
+ Moved to new protocols/ace/HTBP.
+
+ * protocols/:
+ This is a new subdirectory added in anticipation of new
+ libraries that use ACE to create new methods of transporting
+ data between peers. This directory exists as a peer to ace
+ signifying that entites under this directory are not wrappers in
+ and of themselves, but do not necessarily have dependencies on
+ any higher level code.
+
+ * protocols/ace/HTBP:
+ This directory contains the implementation of the Hypertext
+ Tunneling Bidirectional Protocol, that was previously under the
+ ace directory. The additional ace directory was added to avoid
+ having to modify any code that depends on HTBP, currently its
+ tests and the TAO pluggable protocol, HTIOP. Keeping the
+ relative path the same meant that the only external change
+ required as a side effect of this move was to add a single line
+ to htbp.mpb so that code including HTBP headers get
+ -I $ACE_ROOT/protocols added to the compile line. No other
+ changes are required.
+
+ * ace/ace.mwc:
+ Removed ace/HTBP from the workspace definition.
+
+ * bin/MakeProjectCreator/config/htbp.mpb:
+ Added "includes += $(ACE_ROOT)/protocols" to the base project.
+
Thu Nov 4 18:47:22 2004 Steve Huston <shuston@riverace.com>
* ace/config-WinCE.h: Added ACE_LACKS_WCTYPE_H for CE 3 and lower.
@@ -7,7 +38,7 @@ Thu Nov 4 18:47:22 2004 Steve Huston <shuston@riverace.com>
Thu Nov 4 17:06:08 CST 2004 Scott Harris <harris_s@ociweb.com>
* test/Test_Output.cpp:
-
+
Fix a bug introduced by a memory leak fix in Logging_Strategy.cpp,
Mon Oct 18 21:13:02 2004 Douglas C. Schmidt <schmidt@cs.wustl.edu>
, that broke the test/Logging_Strategy_Test on some platforms.
@@ -16,14 +47,14 @@ Thu Nov 4 17:06:08 CST 2004 Scott Harris <harris_s@ociweb.com>
stream but ACE_END_TEST still tries to close and destory it.
The solution was to only have Test_Output close/destroy the
stream if it has not already be changed in ACE_LOG_MSG.
-
+
* test/Log_Msg_Test.cpp:
-
+
The above change made it so ACE_Test_Output::output_file ()
returns the ACE_MSG_LOG stream so it would not return
a possibly destroyed stream. Log_Msg_Test had
to be changed to save off the message stream when it
- switched to a different file stream and then back
+ switched to a different file stream and then back
to the original.
Thu Nov 4 14:00:50 2004 J.T. Conklin <jtc@acorntoolworks.com>
diff --git a/ace/HTBP/Makefile.am b/ace/HTBP/Makefile.am
deleted file mode 100644
index 0fb6995d9d5..00000000000
--- a/ace/HTBP/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-includedir = @includedir@/ace/HTBP
-
-ACE_BUILDDIR = $(top_builddir)
-ACE_ROOT = $(top_srcdir)
-
-## Makefile.HTBP.am
-lib_LTLIBRARIES = libACE_HTBP.la
-
-libACE_HTBP_la_CPPFLAGS = \
- -I$(ACE_ROOT) \
- -I$(ACE_BUILDDIR) \
- -DHTBP_BUILD_DLL
-
-libACE_HTBP_la_SOURCES = \
- HTBP_Addr.cpp \
- HTBP_Channel.cpp \
- HTBP_Environment.cpp \
- HTBP_Filter.cpp \
- HTBP_Filter_Factory.cpp \
- HTBP_ID_Requestor.cpp \
- HTBP_Inside_Squid_Filter.cpp \
- HTBP_Notifier.cpp \
- HTBP_Outside_Squid_Filter.cpp \
- HTBP_Session.cpp \
- HTBP_Stream.cpp
-
-libACE_HTBP_la_LIBADD = \
- $(ACE_BUILDDIR)/ace/libACE.la
-
-nobase_include_HEADERS = \
- HTBP_Addr.h \
- HTBP_Channel.h \
- HTBP_Environment.h \
- HTBP_Export.h \
- HTBP_Filter.h \
- HTBP_Filter_Factory.h \
- HTBP_ID_Requestor.h \
- HTBP_Inside_Squid_Filter.h \
- HTBP_Macros.h \
- HTBP_Notifier.h \
- HTBP_Outside_Squid_Filter.h \
- HTBP_Session.h \
- HTBP_Stream.h \
- HTBP_Channel.inl \
- HTBP_Filter.inl \
- HTBP_Inside_Squid_Filter.inl \
- HTBP_Notifier.inl \
- HTBP_Outside_Squid_Filter.inl \
- HTBP_Session.inl \
- HTBP_Stream.inl
-
-## Clean up template repositories, etc.
-clean-local:
- -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
- -rm -f gcctemp.c gcctemp so_locations *.ics
- -rm -rf cxx_repository ptrepository ti_files
- -rm -rf templateregistry ir.out
- -rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/ace/ace.mwc b/ace/ace.mwc
index a099b894be9..0ae6180ea24 100644
--- a/ace/ace.mwc
+++ b/ace/ace.mwc
@@ -7,5 +7,4 @@ workspace {
RMCast
SSL
TMCast
- HTBP
}
diff --git a/ace/HTBP/HTBP.mpc b/protocols/ace/HTBP/HTBP.mpc
index 21c99d9a407..21c99d9a407 100644
--- a/ace/HTBP/HTBP.mpc
+++ b/protocols/ace/HTBP/HTBP.mpc
diff --git a/ace/HTBP/HTBP_Addr.cpp b/protocols/ace/HTBP/HTBP_Addr.cpp
index 0ea811bb108..0ea811bb108 100644
--- a/ace/HTBP/HTBP_Addr.cpp
+++ b/protocols/ace/HTBP/HTBP_Addr.cpp
diff --git a/ace/HTBP/HTBP_Addr.h b/protocols/ace/HTBP/HTBP_Addr.h
index 3cbbaa397f7..3cbbaa397f7 100644
--- a/ace/HTBP/HTBP_Addr.h
+++ b/protocols/ace/HTBP/HTBP_Addr.h
diff --git a/ace/HTBP/HTBP_Channel.cpp b/protocols/ace/HTBP/HTBP_Channel.cpp
index ee00eb90efc..ee00eb90efc 100644
--- a/ace/HTBP/HTBP_Channel.cpp
+++ b/protocols/ace/HTBP/HTBP_Channel.cpp
diff --git a/ace/HTBP/HTBP_Channel.h b/protocols/ace/HTBP/HTBP_Channel.h
index 3109ed656eb..3109ed656eb 100644
--- a/ace/HTBP/HTBP_Channel.h
+++ b/protocols/ace/HTBP/HTBP_Channel.h
diff --git a/ace/HTBP/HTBP_Channel.inl b/protocols/ace/HTBP/HTBP_Channel.inl
index 70fc4834842..70fc4834842 100644
--- a/ace/HTBP/HTBP_Channel.inl
+++ b/protocols/ace/HTBP/HTBP_Channel.inl
diff --git a/ace/HTBP/HTBP_Environment.cpp b/protocols/ace/HTBP/HTBP_Environment.cpp
index 60d3b017f17..60d3b017f17 100644
--- a/ace/HTBP/HTBP_Environment.cpp
+++ b/protocols/ace/HTBP/HTBP_Environment.cpp
diff --git a/ace/HTBP/HTBP_Environment.h b/protocols/ace/HTBP/HTBP_Environment.h
index 2f4cc90a5ac..2f4cc90a5ac 100644
--- a/ace/HTBP/HTBP_Environment.h
+++ b/protocols/ace/HTBP/HTBP_Environment.h
diff --git a/ace/HTBP/HTBP_Export.h b/protocols/ace/HTBP/HTBP_Export.h
index 19ce8a89547..19ce8a89547 100644
--- a/ace/HTBP/HTBP_Export.h
+++ b/protocols/ace/HTBP/HTBP_Export.h
diff --git a/ace/HTBP/HTBP_Filter.cpp b/protocols/ace/HTBP/HTBP_Filter.cpp
index 0e239e0b419..0e239e0b419 100644
--- a/ace/HTBP/HTBP_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Filter.cpp
diff --git a/ace/HTBP/HTBP_Filter.h b/protocols/ace/HTBP/HTBP_Filter.h
index 9548f377d1b..9548f377d1b 100644
--- a/ace/HTBP/HTBP_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Filter.h
diff --git a/ace/HTBP/HTBP_Filter.inl b/protocols/ace/HTBP/HTBP_Filter.inl
index 224b7e02699..224b7e02699 100644
--- a/ace/HTBP/HTBP_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Filter.inl
diff --git a/ace/HTBP/HTBP_Filter_Factory.cpp b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
index 8c42584d143..8c42584d143 100644
--- a/ace/HTBP/HTBP_Filter_Factory.cpp
+++ b/protocols/ace/HTBP/HTBP_Filter_Factory.cpp
diff --git a/ace/HTBP/HTBP_Filter_Factory.h b/protocols/ace/HTBP/HTBP_Filter_Factory.h
index 84f32000664..84f32000664 100644
--- a/ace/HTBP/HTBP_Filter_Factory.h
+++ b/protocols/ace/HTBP/HTBP_Filter_Factory.h
diff --git a/ace/HTBP/HTBP_ID_Requestor.cpp b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
index 3c4b72e38fb..3c4b72e38fb 100644
--- a/ace/HTBP/HTBP_ID_Requestor.cpp
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.cpp
diff --git a/ace/HTBP/HTBP_ID_Requestor.h b/protocols/ace/HTBP/HTBP_ID_Requestor.h
index e6cdd87fb1d..e6cdd87fb1d 100644
--- a/ace/HTBP/HTBP_ID_Requestor.h
+++ b/protocols/ace/HTBP/HTBP_ID_Requestor.h
diff --git a/ace/HTBP/HTBP_Inside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
index b936cd8e580..b936cd8e580 100644
--- a/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.cpp
diff --git a/ace/HTBP/HTBP_Inside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
index 142607aa49f..142607aa49f 100644
--- a/ace/HTBP/HTBP_Inside_Squid_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.h
diff --git a/ace/HTBP/HTBP_Inside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
index d9c4618537e..d9c4618537e 100644
--- a/ace/HTBP/HTBP_Inside_Squid_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Inside_Squid_Filter.inl
diff --git a/ace/HTBP/HTBP_Macros.h b/protocols/ace/HTBP/HTBP_Macros.h
index 0cb1300cc1d..0cb1300cc1d 100644
--- a/ace/HTBP/HTBP_Macros.h
+++ b/protocols/ace/HTBP/HTBP_Macros.h
diff --git a/ace/HTBP/HTBP_Notifier.cpp b/protocols/ace/HTBP/HTBP_Notifier.cpp
index fab0dbd44ba..fab0dbd44ba 100644
--- a/ace/HTBP/HTBP_Notifier.cpp
+++ b/protocols/ace/HTBP/HTBP_Notifier.cpp
diff --git a/ace/HTBP/HTBP_Notifier.h b/protocols/ace/HTBP/HTBP_Notifier.h
index 24ff34b0d5e..24ff34b0d5e 100644
--- a/ace/HTBP/HTBP_Notifier.h
+++ b/protocols/ace/HTBP/HTBP_Notifier.h
diff --git a/ace/HTBP/HTBP_Notifier.inl b/protocols/ace/HTBP/HTBP_Notifier.inl
index fec4c7f49c9..fec4c7f49c9 100644
--- a/ace/HTBP/HTBP_Notifier.inl
+++ b/protocols/ace/HTBP/HTBP_Notifier.inl
diff --git a/ace/HTBP/HTBP_Outside_Squid_Filter.cpp b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
index 3c035b8dcde..3c035b8dcde 100644
--- a/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.cpp
diff --git a/ace/HTBP/HTBP_Outside_Squid_Filter.h b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
index 5f0c820fccd..5f0c820fccd 100644
--- a/ace/HTBP/HTBP_Outside_Squid_Filter.h
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.h
diff --git a/ace/HTBP/HTBP_Outside_Squid_Filter.inl b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
index 351c6e53856..351c6e53856 100644
--- a/ace/HTBP/HTBP_Outside_Squid_Filter.inl
+++ b/protocols/ace/HTBP/HTBP_Outside_Squid_Filter.inl
diff --git a/ace/HTBP/HTBP_Session.cpp b/protocols/ace/HTBP/HTBP_Session.cpp
index 3aed6b14324..3aed6b14324 100644
--- a/ace/HTBP/HTBP_Session.cpp
+++ b/protocols/ace/HTBP/HTBP_Session.cpp
diff --git a/ace/HTBP/HTBP_Session.h b/protocols/ace/HTBP/HTBP_Session.h
index 9c162849215..9c162849215 100644
--- a/ace/HTBP/HTBP_Session.h
+++ b/protocols/ace/HTBP/HTBP_Session.h
diff --git a/ace/HTBP/HTBP_Session.inl b/protocols/ace/HTBP/HTBP_Session.inl
index fb5c337826c..fb5c337826c 100644
--- a/ace/HTBP/HTBP_Session.inl
+++ b/protocols/ace/HTBP/HTBP_Session.inl
diff --git a/ace/HTBP/HTBP_Stream.cpp b/protocols/ace/HTBP/HTBP_Stream.cpp
index ffbbb3b9d82..ffbbb3b9d82 100644
--- a/ace/HTBP/HTBP_Stream.cpp
+++ b/protocols/ace/HTBP/HTBP_Stream.cpp
diff --git a/ace/HTBP/HTBP_Stream.h b/protocols/ace/HTBP/HTBP_Stream.h
index c627f5ef6a5..c627f5ef6a5 100644
--- a/ace/HTBP/HTBP_Stream.h
+++ b/protocols/ace/HTBP/HTBP_Stream.h
diff --git a/ace/HTBP/HTBP_Stream.inl b/protocols/ace/HTBP/HTBP_Stream.inl
index 489ed1d91b5..489ed1d91b5 100644
--- a/ace/HTBP/HTBP_Stream.inl
+++ b/protocols/ace/HTBP/HTBP_Stream.inl
diff --git a/ace/HTBP/HTID_Generator.cgi b/protocols/ace/HTBP/HTID_Generator.cgi
index 0d57a552d6c..0d57a552d6c 100644
--- a/ace/HTBP/HTID_Generator.cgi
+++ b/protocols/ace/HTBP/HTID_Generator.cgi
diff --git a/ace/HTBP/README b/protocols/ace/HTBP/README
index 577aaf15866..577aaf15866 100644
--- a/ace/HTBP/README
+++ b/protocols/ace/HTBP/README