Merge branch 'R3_3_branch' of cvs:/home/git/ice into R3_3_branch

Conflicts:

	java/resources/IceGridAdmin/icegridadmin_content_dyn.html
	java/resources/IceGridAdmin/icegridadmin_content_static.html

1 files changed, 82 insertions, 0 deletions

diff --git a/cpp/test/Ice/udp/Server.cpp b/cpp/test/Ice/udp/Server.cpp
new file mode 100644
index 00000000000..bcaa010beea
--- /dev/null
+++ b/cpp/test/Ice/udp/Server.cpp
@@ -0,0 +1,82 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/Ice.h>
+#include <TestI.h>
+
+using namespace std;
+
+int
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+{
+    Ice::PropertiesPtr properties = communicator->getProperties();
+    if(argc == 2 && string(argv[1]) == "1")
+    {
+        properties->setProperty("TestAdapter.Endpoints", "udp -p 12010");
+        Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
+        adapter->add(new TestIntfI, communicator->stringToIdentity("test"));
+        adapter->activate();
+    }
+
+    string host;
+    if(properties->getProperty("Ice.IPv6") == "1")
+    {
+        host = "\"ff01::1:1\"";
+    }
+    else
+    {
+        host = "239.255.1.1";
+    }
+    properties->setProperty("McastTestAdapter.Endpoints", "udp -h " + host + " -p 12020");
+    Ice::ObjectAdapterPtr mcastAdapter = communicator->createObjectAdapter("McastTestAdapter");
+    mcastAdapter->add(new TestIntfI, communicator->stringToIdentity("test"));
+    mcastAdapter->activate();
+
+    communicator->waitForShutdown();
+    return EXIT_SUCCESS;
+}
+
+int
+main(int argc, char* argv[])
+{
+    int status;
+    Ice::CommunicatorPtr communicator;
+
+    try
+    {
+        Ice::InitializationData initData;
+        initData.properties = Ice::createProperties(argc, argv);
+
+        initData.properties->setProperty("Ice.Warn.Connections", "0");
+        initData.properties->setProperty("Ice.UDP.RcvSize", "16384");
+
+        communicator = Ice::initialize(argc, argv, initData);
+        status = run(argc, argv, communicator);
+    }
+    catch(const Ice::Exception& ex)
+    {
+        cerr << ex << endl;
+        status = EXIT_FAILURE;
+    }
+
+    if(communicator)
+    {
+        try
+        {
+            communicator->destroy();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cerr << ex << endl;
+            status = EXIT_FAILURE;
+        }
+    }
+
+    return status;
+}