Mon Dec 10 16:33:39 2001 Justin Michel <michel_j@ociweb.com>

4 files changed, 102 insertions, 6 deletions

diff --git a/TAO/tests/ORB_init/Portspan/portspan.dsp b/TAO/tests/ORB_init/Portspan/portspan.dsp
index e9b540e8a77..07be1e7096e 100644
--- a/TAO/tests/ORB_init/Portspan/portspan.dsp
+++ b/TAO/tests/ORB_init/Portspan/portspan.dsp
@@ -51,7 +51,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib /nologo /subsystem:console /machine:I386 /out:"Release/server.exe" /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

 

 !ELSEIF  "$(CFG)" == "portspan - Win32 Debug"

 

@@ -76,7 +76,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"./server.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

+# ADD LINK32 aced.lib TAOd.lib TAO_PortableServerd.lib /nologo /subsystem:console /debug /machine:I386 /out:"server.exe" /pdbtype:sept /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer"

 

 !ENDIF 

 

@@ -102,7 +102,7 @@ InputPath=.\simple.idl
 InputName=simple

 

 BuildCmds= \

-	$(ace_root)/bin/tao_idl -GI .\$(InputName).idl

+	..\..\..\..\bin\Release\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -135,12 +135,13 @@ BuildCmds= \
 !ELSEIF  "$(CFG)" == "portspan - Win32 Debug"

 

 # PROP Ignore_Default_Tool 1

+USERDEP__SIMPL="..\..\..\..\..\bin\tao_idl.exe"	

 # Begin Custom Build

 InputPath=.\simple.idl

 InputName=simple

 

 BuildCmds= \

-	$(ace_root)/bin/tao_idl -GI .\$(InputName).idl

+	..\..\..\..\bin\tao_idl -Ge 1 $(InputName).idl

 

 "$(InputName)C.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/TAO/tests/ORB_init/Portspan/run_test.pl b/TAO/tests/ORB_init/Portspan/run_test.pl
index 5d899208196..ca71f02e801 100755
--- a/TAO/tests/ORB_init/Portspan/run_test.pl
+++ b/TAO/tests/ORB_init/Portspan/run_test.pl
@@ -26,8 +26,8 @@ if ($test2 != 0) {
     exit 1;
 }
 
-$test3 = $P3->SpawnWaitKill(1);
-if ($test3 != 1) {
+$test3 = $P3->SpawnWaitKill(5);
+if ($test3 == 0) {
     print STDERR "ERROR: Last server didn't fail! Err:$test3\n";
     $P1->Kill();
     $P2->Kill();
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.cpp b/TAO/tests/ORB_init/Portspan/simpleI.cpp
new file mode 100644
index 00000000000..3634ed4bd95
--- /dev/null
+++ b/TAO/tests/ORB_init/Portspan/simpleI.cpp
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#include "simpleI.h"
+
+// Implementation skeleton constructor
+simple_i::simple_i (void)
+  {
+  }
+  
+// Implementation skeleton destructor
+simple_i::~simple_i (void)
+  {
+  }
+  
+void simple_i::test (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+
+  {
+    //Add your implementation here
+  }
+  
diff --git a/TAO/tests/ORB_init/Portspan/simpleI.h b/TAO/tests/ORB_init/Portspan/simpleI.h
new file mode 100644
index 00000000000..b46754c60b9
--- /dev/null
+++ b/TAO/tests/ORB_init/Portspan/simpleI.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+#ifndef SIMPLEI_H_
+#define SIMPLEI_H_
+
+#include "simpleS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+//Class simple_i
+class  simple_i : public virtual POA_simple
+{
+public:
+  //Constructor 
+  simple_i (void);
+  
+  //Destructor 
+  virtual ~simple_i (void);
+  
+virtual void test (
+    CORBA::Environment &ACE_TRY_ENV
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ));
+
+};
+
+
+#endif /* SIMPLEI_H_  */