Merge commit 'origin/R3_3_branch'

Conflicts:
	CHANGES
	cpp/demo/Freeze/backup/.depend
	cpp/demo/Freeze/bench/.depend
	cpp/demo/Freeze/casino/.depend
	cpp/demo/Freeze/customEvictor/.depend
	cpp/demo/Freeze/library/.depend
	cpp/demo/Freeze/phonebook/.depend
	cpp/demo/Freeze/transform/.depend
	cpp/demo/Glacier2/callback/.depend
	cpp/demo/Glacier2/chat/.depend
	cpp/demo/Ice/async/.depend
	cpp/demo/Ice/bidir/.depend
	cpp/demo/Ice/callback/.depend
	cpp/demo/Ice/converter/.depend
	cpp/demo/Ice/hello/.depend
	cpp/demo/Ice/invoke/.depend
	cpp/demo/Ice/latency/.depend
	cpp/demo/Ice/minimal/.depend
	cpp/demo/Ice/multicast/.depend
	cpp/demo/Ice/nested/.depend
	cpp/demo/Ice/nrvo/.depend
	cpp/demo/Ice/session/.depend
	cpp/demo/Ice/throughput/.depend
	cpp/demo/Ice/value/.depend
	cpp/demo/IceBox/hello/.depend
	cpp/demo/IceGrid/allocate/.depend
	cpp/demo/IceGrid/icebox/.depend
	cpp/demo/IceGrid/replication/.depend
	cpp/demo/IceGrid/sessionActivation/.depend
	cpp/demo/IceGrid/simple/.depend
	cpp/demo/IceStorm/clock/.depend
	cpp/demo/IceStorm/counter/.depend
	cpp/demo/IceStorm/replicated/.depend
	cpp/demo/IceStorm/replicated2/.depend
	cpp/demo/book/freeze_filesystem/.depend
	cpp/demo/book/lifecycle/.depend
	cpp/demo/book/printer/.depend
	cpp/demo/book/simple_filesystem/.depend
	cpp/src/Freeze/.depend
	cpp/src/FreezeScript/.depend
	cpp/src/Ice/.depend
	cpp/src/Ice/UdpTransceiver.cpp
	cpp/src/Ice/UdpTransceiver.h
	cpp/src/IceBox/.depend
	cpp/src/IceGrid/.depend
	cpp/src/IceGridLib/.depend
	cpp/src/IcePatch2/.depend
	cpp/src/IceStorm/.depend
	cpp/src/slice2freeze/.depend
	cpp/test/Freeze/complex/.depend
	cpp/test/Freeze/dbmap/.depend
	cpp/test/Freeze/evictor/.depend
	cpp/test/Freeze/oldevictor/.depend
	cpp/test/FreezeScript/dbmap/.depend
	cpp/test/FreezeScript/evictor/.depend
	cpp/test/Glacier2/attack/.depend
	cpp/test/Glacier2/dynamicFiltering/.depend
	cpp/test/Glacier2/router/.depend
	cpp/test/Glacier2/sessionControl/.depend
	cpp/test/Glacier2/ssl/.depend
	cpp/test/Glacier2/staticFiltering/.depend
	cpp/test/Ice/adapterDeactivation/.depend
	cpp/test/Ice/background/.depend
	cpp/test/Ice/binding/.depend
	cpp/test/Ice/checksum/.depend
	cpp/test/Ice/checksum/server/.depend
	cpp/test/Ice/custom/.depend
	cpp/test/Ice/exceptions/.depend
	cpp/test/Ice/facets/.depend
	cpp/test/Ice/faultTolerance/.depend
	cpp/test/Ice/gc/.depend
	cpp/test/Ice/hold/.depend
	cpp/test/Ice/inheritance/.depend
	cpp/test/Ice/interceptor/.depend
	cpp/test/Ice/location/.depend
	cpp/test/Ice/objects/.depend
	cpp/test/Ice/operations/.depend
	cpp/test/Ice/proxy/.depend
	cpp/test/Ice/retry/.depend
	cpp/test/Ice/servantLocator/.depend
	cpp/test/Ice/slicing/exceptions/.depend
	cpp/test/Ice/slicing/objects/.depend
	cpp/test/Ice/stream/.depend
	cpp/test/Ice/stringConverter/.depend
	cpp/test/Ice/timeout/.depend
	cpp/test/Ice/udp/.depend
	cpp/test/IceBox/configuration/.depend
	cpp/test/IceGrid/activation/.depend
	cpp/test/IceGrid/allocation/.depend
	cpp/test/IceGrid/deployer/.depend
	cpp/test/IceGrid/distribution/.depend
	cpp/test/IceGrid/replicaGroup/.depend
	cpp/test/IceGrid/replication/.depend
	cpp/test/IceGrid/session/.depend
	cpp/test/IceGrid/simple/.depend
	cpp/test/IceGrid/update/.depend
	cpp/test/IceSSL/configuration/.depend
	cpp/test/IceStorm/federation/.depend
	cpp/test/IceStorm/federation2/.depend
	cpp/test/IceStorm/rep1/.depend
	cpp/test/IceStorm/repgrid/.depend
	cpp/test/IceStorm/repstress/.depend
	cpp/test/IceStorm/single/.depend
	cpp/test/IceStorm/stress/.depend
	cpp/test/Slice/keyword/.depend
	cs/src/Ice/Instance.cs
	cs/src/IceSSL/ConnectorI.cs
	java/demo/book/simple_filesystem/Filesystem/DirectoryI.java
	java/demo/book/simple_filesystem/Filesystem/FileI.java
	java/src/IceInternal/TcpConnector.java
	java/src/IceSSL/ConnectorI.java
	py/modules/IcePy/.depend
	rb/src/IceRuby/.depend

4 files changed, 29 insertions, 29 deletions

diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 39a5683a778..e15a8a30b09 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -94,7 +94,7 @@ ValueClient::run(int argc, char* argv[])
     cin.getline(c, 2);
 
     Ice::ObjectFactoryPtr factory = new ObjectFactory;
-    communicator()->addObjectFactory(factory, "::Demo::Printer");
+    communicator()->addObjectFactory(factory, Demo::Printer::ice_staticId());
 
     initial->getPrinter(printer, printerProxy);
     cout << "==> " << printer->message << endl;
@@ -127,7 +127,7 @@ ValueClient::run(int argc, char* argv[])
     PrinterPtr derivedAsBase;
     derivedAsBase = initial->getDerivedPrinter();
     cout << "==> The type ID of the received object is \"" << derivedAsBase->ice_id() << "\"" << endl;
-    assert(derivedAsBase->ice_id() == "::Demo::Printer");
+    assert(derivedAsBase->ice_id() == Demo::Printer::ice_staticId());
     
     cout << '\n'
          << "Now we install a factory for the derived class, and try again.\n"
@@ -136,7 +136,7 @@ ValueClient::run(int argc, char* argv[])
          << "[press enter]\n";
     cin.getline(c, 2);
     
-    communicator()->addObjectFactory(factory, "::Demo::DerivedPrinter");
+    communicator()->addObjectFactory(factory, Demo::DerivedPrinter::ice_staticId());
     
     derivedAsBase = initial->getDerivedPrinter();
     DerivedPrinterPtr derived = DerivedPrinterPtr::dynamicCast(derivedAsBase);
diff --git a/cpp/demo/Ice/value/Ice.value.client.dsp b/cpp/demo/Ice/value/Ice.value.client.dsp
index c6587d5e4ab..4c3e0199200 100644
--- a/cpp/demo/Ice/value/Ice.value.client.dsp
+++ b/cpp/demo/Ice/value/Ice.value.client.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Ice.value.client" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Ice.value.client.exe" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Ice.value.client - Win32 Debug

+CFG=Ice.value.client.exe - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=Ice.value.client - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Ice.value.client.mak" CFG="Ice.value.client - Win32 Debug"

+!MESSAGE NMAKE /f "Ice.value.client.mak" CFG="Ice.value.client.exe - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Ice.value.client - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ice.value.client - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Ice.value.client.exe - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Ice.value.client.exe - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=Ice.value.client - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Ice.value.client - Win32 Release"

+!IF  "$(CFG)" == "Ice.value.client.exe - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -51,10 +51,10 @@ 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 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"client.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089

 # SUBTRACT LINK32 /debug /nodefaultlib

 

-!ELSEIF  "$(CFG)" == "Ice.value.client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Ice.value.client.exe - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -84,8 +84,8 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "Ice.value.client - Win32 Release"

-# Name "Ice.value.client - Win32 Debug"

+# Name "Ice.value.client.exe - Win32 Release"

+# Name "Ice.value.client.exe - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

@@ -129,7 +129,7 @@ SOURCE=.\ValueI.h
 

 SOURCE=.\Value.ice

 

-!IF  "$(CFG)" == "Ice.value.client - Win32 Release"

+!IF  "$(CFG)" == "Ice.value.client.exe - Win32 Release"

 

 USERDEP__VALUE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	

 # Begin Custom Build

@@ -145,7 +145,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Ice.value.client - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Ice.value.client.exe - Win32 Debug"

 

 USERDEP__VALUE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	

 # Begin Custom Build

diff --git a/cpp/demo/Ice/value/Ice.value.server.dsp b/cpp/demo/Ice/value/Ice.value.server.dsp
index 5a76579f5b5..1699328eeda 100644
--- a/cpp/demo/Ice/value/Ice.value.server.dsp
+++ b/cpp/demo/Ice/value/Ice.value.server.dsp
@@ -1,10 +1,10 @@
-# Microsoft Developer Studio Project File - Name="Ice.value.server" - Package Owner=<4>

+# Microsoft Developer Studio Project File - Name="Ice.value.server.exe" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00

 # ** DO NOT EDIT **

 

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

 

-CFG=Ice.value.server - Win32 Debug

+CFG=Ice.value.server.exe - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,

 !MESSAGE use the Export Makefile command and run

 !MESSAGE 

@@ -13,12 +13,12 @@ CFG=Ice.value.server - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE

 !MESSAGE by defining the macro CFG on the command line. For example:

 !MESSAGE 

-!MESSAGE NMAKE /f "Ice.value.server.mak" CFG="Ice.value.server - Win32 Debug"

+!MESSAGE NMAKE /f "Ice.value.server.mak" CFG="Ice.value.server.exe - Win32 Debug"

 !MESSAGE 

 !MESSAGE Possible choices for configuration are:

 !MESSAGE 

-!MESSAGE "Ice.value.server - Win32 Release" (based on "Win32 (x86) Console Application")

-!MESSAGE "Ice.value.server - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE "Ice.value.server.exe - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "Ice.value.server.exe - Win32 Debug" (based on "Win32 (x86) Console Application")

 !MESSAGE 

 

 # Begin Project

@@ -28,7 +28,7 @@ CFG=Ice.value.server - Win32 Debug
 CPP=cl.exe

 RSC=rc.exe

 

-!IF  "$(CFG)" == "Ice.value.server - Win32 Release"

+!IF  "$(CFG)" == "Ice.value.server.exe - Win32 Release"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 0

@@ -51,10 +51,10 @@ 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 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no

+# ADD LINK32 Ice.lib IceUtil.lib setargv.obj /nologo /subsystem:console /pdb:none /machine:I386 /out:"server.exe" /libpath:"../../../lib" /FIXED:no /IGNORE:4089

 # SUBTRACT LINK32 /debug /nodefaultlib

 

-!ELSEIF  "$(CFG)" == "Ice.value.server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Ice.value.server.exe - Win32 Debug"

 

 # PROP BASE Use_MFC 0

 # PROP BASE Use_Debug_Libraries 1

@@ -84,8 +84,8 @@ LINK32=link.exe
 

 # Begin Target

 

-# Name "Ice.value.server - Win32 Release"

-# Name "Ice.value.server - Win32 Debug"

+# Name "Ice.value.server.exe - Win32 Release"

+# Name "Ice.value.server.exe - Win32 Debug"

 # Begin Group "Source Files"

 

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

@@ -121,7 +121,7 @@ SOURCE=.\ValueI.h
 

 SOURCE=.\Value.ice

 

-!IF  "$(CFG)" == "Ice.value.server - Win32 Release"

+!IF  "$(CFG)" == "Ice.value.server.exe - Win32 Release"

 

 USERDEP__VALUE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\slice.lib"	

 # Begin Custom Build

@@ -137,7 +137,7 @@ BuildCmds= \
    $(BuildCmds)

 # End Custom Build

 

-!ELSEIF  "$(CFG)" == "Ice.value.server - Win32 Debug"

+!ELSEIF  "$(CFG)" == "Ice.value.server.exe - Win32 Debug"

 

 USERDEP__VALUE="..\..\..\bin\slice2cpp.exe"	"..\..\..\lib\sliced.lib"	

 # Begin Custom Build

diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp
index 6f694ae6906..bfd16f57e89 100644
--- a/cpp/demo/Ice/value/ObjectFactory.cpp
+++ b/cpp/demo/Ice/value/ObjectFactory.cpp
@@ -16,12 +16,12 @@ using namespace std;
 Ice::ObjectPtr
 ObjectFactory::create(const string& type)
 {
-    if(type == "::Demo::Printer")
+    if(type == Demo::Printer::ice_staticId())
     {
         return new PrinterI;
     }
 
-    if(type == "::Demo::DerivedPrinter")
+    if(type == Demo::DerivedPrinter::ice_staticId())
     {
         return new DerivedPrinterI;
     }