ChangeLogTag:Fri Mar 02 07:40:28 2001 Ossama Othman <ossama@uci.edu>

5 files changed, 61 insertions, 5 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 9406e4e9743..e6cf0529bb4 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,20 @@
+Fri Mar 02 07:40:28 2001  Ossama Othman  <ossama@uci.edu>
+
+	* tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl:
+
+	  Added this missing file.  I neglected to commit it with my
+	  previous set of changes for this test.
+
+	* tests/Portable_Interceptors/ForwardRequest/Makefile:
+	* tests/Portable_Interceptors/ForwardRequest/server.bor:
+
+	  Added missing `ServerRequestInterceptor.idl' related rules to
+	  these Makefiles.
+
+	* tests/Portable_Interceptors/ForwardRequest/server.dsp:
+
+	  Added missing header files to the header file list.
+
 Fri Mar 02 07:25:50 2001  Ossama Othman  <ossama@uci.edu>
 
 	* tao/ORB_Core.cpp (destroy_interceptors):
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile
index 05dd1efc958..a075e94972e 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Makefile
@@ -14,8 +14,11 @@ endif # ! TAO_ROOT
 
 LDLIBS = -lTAO
 
-IDL_FILES = test
-IDL_SRC = testC.cpp testS.cpp
+IDL_FILES = test ServerRequestInterceptor
+IDL_SRC = \
+  testC.cpp \
+  testS.cpp \
+  ServerRequestInterceptorC.cpp
 BIN_UNCHECKED = client server
 
 SRC = $(addsuffix .cpp, $(BIN_UNCHECKED) test_i Client_Request_Interceptor Client_ORBInitializer Server_ORBInitializer Server_Request_Interceptor) $(IDL_SRC)
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl b/TAO/tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl
new file mode 100644
index 00000000000..99f0d71978d
--- /dev/null
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/ServerRequestInterceptor.idl
@@ -0,0 +1,31 @@
+// -*- IDL -*-
+
+//=============================================================================
+/**
+ * @file Server_Request_Interceptor.idl
+ *
+ * $Id$
+ *
+ * IDL file for the ForwardRequest specialized server request
+ * interceptor.
+ *
+ * @author Ossama Othman <ossama@uci.edu>
+ */
+//=============================================================================
+
+#include "tao/PortableInterceptor.pidl"
+
+module ForwardRequestTest
+{
+
+  local interface ServerRequestInterceptor
+    : PortableInterceptor::ServerRequestInterceptor
+  {
+
+    /// Set the references to which requests will be forwarded.
+    void forward_references (in Object obj1,
+                             in Object obj2);
+
+  };
+
+};
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor b/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
index 00fdcad6121..babed7ea4d6 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.bor
@@ -11,6 +11,7 @@ TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
 OBJFILES = \
 	$(OBJDIR)\testC.obj \
 	$(OBJDIR)\testS.obj \
+	$(OBJDIR)\ServerRequestInterceptorC.obj \
 	$(OBJDIR)\server.obj \
 	$(OBJDIR)\test_i.obj \
 	$(OBJDIR)\Server_Request_Interceptor.obj \
@@ -27,7 +28,8 @@ LIBFILES = \
 	$(TAO_PORTABLESERVER_LIB)
 
 IDLFILES = \
-	$(IDLDIR)\test.idl
+	$(IDLDIR)\test.idl \
+	$(IDLDIR)\ServerRequestInterceptor.idl
 
 CPPDIR = .
 
@@ -41,3 +43,6 @@ IDLDIR = .
 
 $(IDLDIR)\testS.cpp $(IDLDIR)\testC.cpp: $(IDLDIR)\test.idl
 	$(TAO_IDL) $**
+
+$(IDLDIR)\ServerRequestInterceptorC.cpp: $(IDLDIR)\ServerRequestInteceptor.idl
+	$(TAO_IDL) -DCORBA3 -I..\..\.. $**
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp
index 9b62f6e83fc..dcaf8a8a497 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.dsp
@@ -137,11 +137,11 @@ SOURCE=.\test_i.h
 # End Source File

 # Begin Source File

 

-SOURCE=.\testS.h

+SOURCE=.\testC.h

 # End Source File

 # Begin Source File

 

-SOURCE=.\testS_T.h

+SOURCE=.\testS.h

 # End Source File

 # End Group

 # Begin Group "IDL Files"