Simulator and Scheduling Service fixes

6 files changed, 29 insertions, 14 deletions

diff --git a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
index 737edeaf5ac..c4fbf15b245 100644
--- a/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
+++ b/TAO/examples/Simulator/DOVEBrowser/NS_Resolve.java
@@ -60,12 +60,13 @@ public class NS_Resolve
 	  // Create a message with the port and service name in it,
 	  // length and port number are in network byte order
 	  ByteArrayOutputStream msg = new ByteArrayOutputStream();
-	  int dataLength = TAO_SERVICEID_NAMESERVICE.length() + 2;
+	  int dataLength = TAO_SERVICEID_NAMESERVICE.length() + 3;
 	  msg.write((dataLength >> 8) & 0xff);
 	  msg.write(dataLength & 0xff);
 	  msg.write((listenSocket.getLocalPort() >> 8) & 0xff);
 	  msg.write(listenSocket.getLocalPort() & 0xff);
 	  msg.write(TAO_SERVICEID_NAMESERVICE.getBytes());
+	  msg.write(0);
 
 	  // Define the group for the multicast
 	  InetAddress group = InetAddress.getByName(ACE_DEFAULT_MULTICAST_ADDR);
@@ -97,7 +98,7 @@ public class NS_Resolve
 	  replySocket.close();
 
 	  // Convert the String into ??
-	  return orb.string_to_object(new String(reply, 0, length));
+	  return orb.string_to_object(new String(reply, 2, length-2));
 	}
       catch (SocketException e)
 	{
diff --git a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
index 7e17de6fc0e..1d37b2486e3 100644
--- a/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
+++ b/TAO/examples/Simulator/DOVEBrowser/PushConsumer.java
@@ -167,6 +167,16 @@ public class PushConsumer extends RtecEventComm._PushConsumerImplBase
           System.err.println ("Demo_Consumer.open_consumer: Duplicate names");
           System.err.println (e);
         }
+  catch (RtecScheduler.INTERNAL e)
+        {
+          System.err.println ("Demo_Consumer.open_consumer: internal scheduler error");
+          System.err.println (e);
+        }
+  catch (RtecScheduler.SYNCHRONIZATION_FAILURE e)
+        {
+          System.err.println ("Demo_Consumer.open_consumer: scheduler synchronization failure");
+          System.err.println (e);
+        }
   catch(org.omg.CORBA.SystemException e)
         {
           System.err.println(e);
diff --git a/TAO/examples/Simulator/DOVEBrowser/make.bat b/TAO/examples/Simulator/DOVEBrowser/make.bat
index 49677db37bb..2e75260c46d 100755
--- a/TAO/examples/Simulator/DOVEBrowser/make.bat
+++ b/TAO/examples/Simulator/DOVEBrowser/make.bat
@@ -41,10 +41,10 @@ idltojava RtecEventComm.idl
 idltojava RtecEventChannelAdmin.idl
 idltojava RtecScheduler.idl
 idltojava CosNaming.idl
-idltojava CosTimeBase.idl
+idltojava TimeBase.idl
 javac CosNaming\NamingContextPackage\*.java
 javac CosNaming\*.java
-javac CosTimeBase\*.java
+javac TimeBase\*.java
 javac RtecScheduler\*.java
 javac RtecEventComm\*.java
 javac RtecEventComm\EventChannelPackage\*.java
@@ -59,7 +59,9 @@ javac *.java
 
 @del *.idl
 @xcopy ..\NavWeap.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\CosTimeBase.idl
+@xcopy ..\..\..\orbsvcs\orbsvcs\TimeBase.idl
+@mkdir tao
+@xcopy ..\..\..\tao\TimeBase.pidl tao\
 @xcopy ..\..\..\orbsvcs\orbsvcs\CosNaming.idl
 @xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventComm.idl
 @xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventChannelAdmin.idl
@@ -73,7 +75,9 @@ javac *.java
 
 @del *.idl
 @xcopy ..\NavWeap.idl
-@xcopy ..\..\..\orbsvcs\orbsvcs\CosTimeBase.idl
+@xcopy ..\..\..\orbsvcs\orbsvcs\TimeBase.idl
+@mkdir tao
+@xcopy ..\..\..\tao\TimeBase.pidl tao\
 @xcopy ..\..\..\orbsvcs\orbsvcs\CosNaming.idl
 @xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventComm.idl
 @xcopy ..\..\..\orbsvcs\orbsvcs\RtecEventChannelAdmin.idl
@@ -114,9 +118,9 @@ javac *.java
 @rd CosNaming\NamingContextPackage
 @rd CosNaming
 
-@REM del CosTimeBase\*.java
-@REM del CosTimeBase\*.class
-@REM rd CosTimeBase
+@REM del TimeBase\*.java
+@REM del TimeBase\*.class
+@REM rd TimeBase
 
 @del TimeBase\*.java
 @del TimeBase\*.class
@@ -138,8 +142,8 @@ REM This part build with VB
 @idl2java RtecScheduler.idl
 @echo idl2java CosNaming.idl
 @idl2java CosNaming.idl
-@echo idl2java CosTimeBase.idl
-@idl2java CosTimeBase.idl
+@echo idl2java TimeBase.idl
+@idl2java TimeBase.idl
 
 :VBJAVA
 
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
index c9445677081..a63073a1d7c 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.dsp
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\orbsvcs\\" /I "..\..\..\orbsvcs\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
index 9337e5509f4..c94bb530094 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.dsp
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\orbsvcs\\" /I "..\..\..\orbsvcs\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
index fbc08d6f3d5..7b04274841f 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.dsp
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\\" /I "..\..\..\\" /I "..\..\..\orbsvcs\\" /I "..\..\..\orbsvcs\orbsvcs\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "TAO_ORBSVCS_HAS_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"