Changed version to 3.3.0

51 files changed, 215 insertions, 216 deletions

diff --git a/cpp/config/templates.xml b/cpp/config/templates.xml
index c535446362a..c7404c7ba0e 100644
--- a/cpp/config/templates.xml
+++ b/cpp/config/templates.xml
@@ -60,7 +60,7 @@
       <parameter name="publish-endpoints" default="default"/>
       <parameter name="flush-timeout" default="1000"/>
 
-      <service name="IceStorm${index}" entry="IceStormService,33b:createIceStorm">
+      <service name="IceStorm${index}" entry="IceStormService,33:createIceStorm">
 
         <dbenv name="${service}"/>
 
diff --git a/cpp/demo/IceStorm/clock/config.icebox b/cpp/demo/IceStorm/clock/config.icebox
index 277716ca66e..455571cacdf 100644
--- a/cpp/demo/IceStorm/clock/config.icebox
+++ b/cpp/demo/IceStorm/clock/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/counter/config.icebox b/cpp/demo/IceStorm/counter/config.icebox
index 277716ca66e..455571cacdf 100644
--- a/cpp/demo/IceStorm/counter/config.icebox
+++ b/cpp/demo/IceStorm/counter/config.icebox
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9998
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.service
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.service
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated/application.xml b/cpp/demo/IceStorm/replicated/application.xml
index 8688c6c56f6..fae711bcb01 100644
--- a/cpp/demo/IceStorm/replicated/application.xml
+++ b/cpp/demo/IceStorm/replicated/application.xml
@@ -21,7 +21,7 @@
 
        <icebox id="${instance-name}-${index}" exe="icebox" activation="on-demand">
 
-         <service name="IceStorm" entry="IceStormService,33b:createIceStorm">
+         <service name="IceStorm" entry="IceStormService,33:createIceStorm">
 
            <dbenv name="${service}"/>
 
diff --git a/cpp/demo/IceStorm/replicated2/config.ib1 b/cpp/demo/IceStorm/replicated2/config.ib1
index d31ea884fa9..461a826bb4f 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib1
+++ b/cpp/demo/IceStorm/replicated2/config.ib1
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9990
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.s1
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.s1
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/config.ib2 b/cpp/demo/IceStorm/replicated2/config.ib2
index 76484a0999b..54a0f3ad796 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib2
+++ b/cpp/demo/IceStorm/replicated2/config.ib2
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9991
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.s2
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.s2
 
 #
 # Warn about connection exceptions
diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3
index 4e76f76ec16..c12a6328483 100644
--- a/cpp/demo/IceStorm/replicated2/config.ib3
+++ b/cpp/demo/IceStorm/replicated2/config.ib3
@@ -6,7 +6,7 @@ IceBox.ServiceManager.Endpoints=tcp -p 9993
 #
 # The IceStorm service
 #
-IceBox.Service.IceStorm=IceStormService,33b:createIceStorm --Ice.Config=config.s3
+IceBox.Service.IceStorm=IceStormService,33:createIceStorm --Ice.Config=config.s3
 
 #
 # Warn about connection exceptions
diff --git a/cpp/doc/swish/swish.conf b/cpp/doc/swish/swish.conf
index 13f72a833d2..4a1c7381fa4 100644
--- a/cpp/doc/swish/swish.conf
+++ b/cpp/doc/swish/swish.conf
@@ -1,6 +1,6 @@
 Replacerules remove /var/www/html/
-IndexDir /var/www/html/doc/Ice-3.3b/reference
-IndexDir /var/www/html/doc/Ice-3.3b/manual
+IndexDir /var/www/html/doc/Ice-3.3.0/reference
+IndexDir /var/www/html/doc/Ice-3.3.0/manual
 IndexOnly .html
 FileRules filename is _sindex\.html
 DefaultContents HTML*
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index cea7c696265..41bbcd39a57 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -214,7 +214,7 @@ typedef long long Int64;
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.3b" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30351      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.3.0" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30300      // AABBCC, with AA=major, BB=minor, CC=patch
 
 #endif
diff --git a/cpp/src/Freeze/Freeze.rc b/cpp/src/Freeze/Freeze.rc
index a0ca69e6723..5ee1953201d 100644
--- a/cpp/src/Freeze/Freeze.rc
+++ b/cpp/src/Freeze/Freeze.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "freeze33bd\0"

- #define ORIGINALFILENAME "freeze33bd.dll\0"

+ #define INTERNALNAME "freeze33d\0"

+ #define ORIGINALFILENAME "freeze33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "freeze33b\0"

- #define ORIGINALFILENAME "freeze33b.dll\0"

+ #define INTERNALNAME "freeze33\0"

+ #define ORIGINALFILENAME "freeze33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Freeze DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/FreezeScript/DumpDB.rc b/cpp/src/FreezeScript/DumpDB.rc
index adb4c29ed17..7ebdadf2abf 100644
--- a/cpp/src/FreezeScript/DumpDB.rc
+++ b/cpp/src/FreezeScript/DumpDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Dump Database\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "dumpdb\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "dumpdb.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/FreezeScript/TransformDB.rc b/cpp/src/FreezeScript/TransformDB.rc
index 5c3ae87a7d3..2db3049ffae 100644
--- a/cpp/src/FreezeScript/TransformDB.rc
+++ b/cpp/src/FreezeScript/TransformDB.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Transform Database\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "transformdb\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "transformdb.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Glacier2/Glacier2.rc b/cpp/src/Glacier2/Glacier2.rc
index 7cdfda44294..606dc5f5948 100644
--- a/cpp/src/Glacier2/Glacier2.rc
+++ b/cpp/src/Glacier2/Glacier2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "glacier233bd\0"

- #define ORIGINALFILENAME "glacier233bd.dll\0"

+ #define INTERNALNAME "glacier233d\0"

+ #define ORIGINALFILENAME "glacier233d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "glacier233b\0"

- #define ORIGINALFILENAME "glacier233b.dll\0"

+ #define INTERNALNAME "glacier233\0"

+ #define ORIGINALFILENAME "glacier233.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Glacier2 DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Glacier2/Glacier2Router.rc b/cpp/src/Glacier2/Glacier2Router.rc
index 4d49e2083b0..f5c6928f3a0 100644
--- a/cpp/src/Glacier2/Glacier2Router.rc
+++ b/cpp/src/Glacier2/Glacier2Router.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Glacier2 Router\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "glacier2router\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "glacier2router.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Ice/Ice.rc b/cpp/src/Ice/Ice.rc
index ab5cdb03feb..b865c069544 100644
--- a/cpp/src/Ice/Ice.rc
+++ b/cpp/src/Ice/Ice.rc
@@ -2,17 +2,17 @@
 #include "EventLoggerMsg.rc"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "ice33bd\0"

- #define ORIGINALFILENAME "ice33bd.dll\0"

+ #define INTERNALNAME "ice33d\0"

+ #define ORIGINALFILENAME "ice33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "ice33b\0"

- #define ORIGINALFILENAME "ice33b.dll\0"

+ #define INTERNALNAME "ice33\0"

+ #define ORIGINALFILENAME "ice33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -24,12 +24,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Ice Core DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceBox/IceBox.rc b/cpp/src/IceBox/IceBox.rc
index 4087fec0fc7..674fb11b0c5 100644
--- a/cpp/src/IceBox/IceBox.rc
+++ b/cpp/src/IceBox/IceBox.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icebox33bd\0"

- #define ORIGINALFILENAME "icebox33bd.dll\0"

+ #define INTERNALNAME "icebox33d\0"

+ #define ORIGINALFILENAME "icebox33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icebox33b\0"

- #define ORIGINALFILENAME "icebox33b.dll\0"

+ #define INTERNALNAME "icebox33\0"

+ #define ORIGINALFILENAME "icebox33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceBox DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceBox/IceBoxAdmin.rc b/cpp/src/IceBox/IceBoxAdmin.rc
index 14e5189829e..340474beb12 100644
--- a/cpp/src/IceBox/IceBoxAdmin.rc
+++ b/cpp/src/IceBox/IceBoxAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceBox Admin\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "iceboxadmin\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "iceboxadmin.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceBox/IceBoxExe.rc b/cpp/src/IceBox/IceBoxExe.rc
index 4d13ee044fc..c3e9a22aa4c 100644
--- a/cpp/src/IceBox/IceBoxExe.rc
+++ b/cpp/src/IceBox/IceBoxExe.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceBox\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGrid/IceGridAdmin.rc b/cpp/src/IceGrid/IceGridAdmin.rc
index cbe699f0b0c..06cbb1858de 100644
--- a/cpp/src/IceGrid/IceGridAdmin.rc
+++ b/cpp/src/IceGrid/IceGridAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid Admin\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icegridadmin\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icegridadmin.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGrid/IceGridNode.rc b/cpp/src/IceGrid/IceGridNode.rc
index dd829b9fdae..927f1537aec 100644
--- a/cpp/src/IceGrid/IceGridNode.rc
+++ b/cpp/src/IceGrid/IceGridNode.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid Node\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icegridnode\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icegridnode.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGrid/IceGridRegistry.rc b/cpp/src/IceGrid/IceGridRegistry.rc
index 6086ad115bd..8dedd280c45 100644
--- a/cpp/src/IceGrid/IceGridRegistry.rc
+++ b/cpp/src/IceGrid/IceGridRegistry.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid Registry\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icegridregistry\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icegridregistry.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceGridLib/IceGrid.rc b/cpp/src/IceGridLib/IceGrid.rc
index ce59dc81cb9..b17d7808a27 100644
--- a/cpp/src/IceGridLib/IceGrid.rc
+++ b/cpp/src/IceGridLib/IceGrid.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icegrid33bd\0"

- #define ORIGINALFILENAME "icegrid33bd.dll\0"

+ #define INTERNALNAME "icegrid33d\0"

+ #define ORIGINALFILENAME "icegrid33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icegrid33b\0"

- #define ORIGINALFILENAME "icegrid33b.dll\0"

+ #define INTERNALNAME "icegrid33\0"

+ #define ORIGINALFILENAME "icegrid33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceGrid DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2.rc b/cpp/src/IcePatch2/IcePatch2.rc
index a61912dc938..f739b5443a5 100644
--- a/cpp/src/IcePatch2/IcePatch2.rc
+++ b/cpp/src/IcePatch2/IcePatch2.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icepatch233bd\0"

- #define ORIGINALFILENAME "icepatch233bd.dll\0"

+ #define INTERNALNAME "icepatch233d\0"

+ #define ORIGINALFILENAME "icepatch233d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icepatch233b\0"

- #define ORIGINALFILENAME "icepatch233b.dll\0"

+ #define INTERNALNAME "icepatch233\0"

+ #define ORIGINALFILENAME "icepatch233.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2Calc.rc b/cpp/src/IcePatch2/IcePatch2Calc.rc
index fed1ef59bdf..1b9ca0394f9 100644
--- a/cpp/src/IcePatch2/IcePatch2Calc.rc
+++ b/cpp/src/IcePatch2/IcePatch2Calc.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 Calc\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icepatch2calc\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icepatch2calc.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2Client.rc b/cpp/src/IcePatch2/IcePatch2Client.rc
index 7e7a5a0b483..0158d3ac769 100644
--- a/cpp/src/IcePatch2/IcePatch2Client.rc
+++ b/cpp/src/IcePatch2/IcePatch2Client.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 Client\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icepatch2client\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icepatch2client.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IcePatch2/IcePatch2Server.rc b/cpp/src/IcePatch2/IcePatch2Server.rc
index a3dbe8f9729..fd21331c5bb 100644
--- a/cpp/src/IcePatch2/IcePatch2Server.rc
+++ b/cpp/src/IcePatch2/IcePatch2Server.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IcePatch2 Server\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icepatch2server\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icepatch2server.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceSSL/IceSSL.rc b/cpp/src/IceSSL/IceSSL.rc
index 0713b2195b3..e2f35105630 100644
--- a/cpp/src/IceSSL/IceSSL.rc
+++ b/cpp/src/IceSSL/IceSSL.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icessl33bd\0"

- #define ORIGINALFILENAME "icessl33bd.dll\0"

+ #define INTERNALNAME "icessl33d\0"

+ #define ORIGINALFILENAME "icessl33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icessl33b\0"

- #define ORIGINALFILENAME "icessl33b.dll\0"

+ #define INTERNALNAME "icessl33\0"

+ #define ORIGINALFILENAME "icessl33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceSSL DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStorm.rc b/cpp/src/IceStorm/IceStorm.rc
index 01a7dbaea3d..25e8e9aaaee 100644
--- a/cpp/src/IceStorm/IceStorm.rc
+++ b/cpp/src/IceStorm/IceStorm.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icestorm33bd\0"

- #define ORIGINALFILENAME "icestorm33bd.dll\0"

+ #define INTERNALNAME "icestorm33d\0"

+ #define ORIGINALFILENAME "icestorm33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icestorm33b\0"

- #define ORIGINALFILENAME "icestorm33b.dll\0"

+ #define INTERNALNAME "icestorm33\0"

+ #define ORIGINALFILENAME "icestorm33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStormAdmin.rc b/cpp/src/IceStorm/IceStormAdmin.rc
index a3985f37fc5..fc1cbec9e30 100644
--- a/cpp/src/IceStorm/IceStormAdmin.rc
+++ b/cpp/src/IceStorm/IceStormAdmin.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm Admin\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icestormadmin\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icestormadmin.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStormMigrate.rc b/cpp/src/IceStorm/IceStormMigrate.rc
index be395b1a10a..e8f89c3bba2 100644
--- a/cpp/src/IceStorm/IceStormMigrate.rc
+++ b/cpp/src/IceStorm/IceStormMigrate.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm Migrate\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "icestormmigrate\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "icestormmigrate.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceStorm/IceStormService.rc b/cpp/src/IceStorm/IceStormService.rc
index e2f3035ea14..72130fd4589 100644
--- a/cpp/src/IceStorm/IceStormService.rc
+++ b/cpp/src/IceStorm/IceStormService.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icestormservice33bd\0"

- #define ORIGINALFILENAME "icestormservice33bd.dll\0"

+ #define INTERNALNAME "icestormservice33d\0"

+ #define ORIGINALFILENAME "icestormservice33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icestormservice33b\0"

- #define ORIGINALFILENAME "icestormservice33b.dll\0"

+ #define INTERNALNAME "icestormservice33\0"

+ #define ORIGINALFILENAME "icestormservice33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceStorm Service DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
index d6b7fc791c9..a979fd9e923 100644
--- a/cpp/src/IceUtil/IceUtil.rc
+++ b/cpp/src/IceUtil/IceUtil.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "iceutil33bd\0"

- #define ORIGINALFILENAME "iceutil33bd.dll\0"

+ #define INTERNALNAME "iceutil33d\0"

+ #define ORIGINALFILENAME "iceutil33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "iceutil33b\0"

- #define ORIGINALFILENAME "iceutil33b.dll\0"

+ #define INTERNALNAME "iceutil33\0"

+ #define ORIGINALFILENAME "iceutil33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Ice Utilities DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/IceXML/IceXML.rc b/cpp/src/IceXML/IceXML.rc
index d339d66e208..978d2841d95 100644
--- a/cpp/src/IceXML/IceXML.rc
+++ b/cpp/src/IceXML/IceXML.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "icexml33bd\0"

- #define ORIGINALFILENAME "icexml33bd.dll\0"

+ #define INTERNALNAME "icexml33d\0"

+ #define ORIGINALFILENAME "icexml33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "icexml33b\0"

- #define ORIGINALFILENAME "icexml33b.dll\0"

+ #define INTERNALNAME "icexml33\0"

+ #define ORIGINALFILENAME "icexml33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "IceXML DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/Slice/Slice.rc b/cpp/src/Slice/Slice.rc
index 6a5658329d2..d8dc68ba05d 100644
--- a/cpp/src/Slice/Slice.rc
+++ b/cpp/src/Slice/Slice.rc
@@ -1,17 +1,17 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

- #define INTERNALNAME "slice33bd\0"

- #define ORIGINALFILENAME "slice33bd.dll\0"

+ #define INTERNALNAME "slice33d\0"

+ #define ORIGINALFILENAME "slice33d.dll\0"

 #else

  FILEFLAGS 0x0L

- #define INTERNALNAME "slice33b\0"

- #define ORIGINALFILENAME "slice33b.dll\0"

+ #define INTERNALNAME "slice33\0"

+ #define ORIGINALFILENAME "slice33.dll\0"

 #endif

  FILEOS 0x4L

  FILETYPE VFT_DLL

@@ -23,12 +23,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice Utilities DLL\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", INTERNALNAME

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", ORIGINALFILENAME

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca
index bda51441e01..3053bc21ef7 100755
--- a/cpp/src/ca/iceca
+++ b/cpp/src/ca/iceca
@@ -98,7 +98,7 @@ if sys.argv[script] == "import":
         # script ../lib). For development purposes we also check ".".
         #
         checkLocations = [".", os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), "..", "lib")),
-                          "/usr/share/Ice-3.3b"]
+                          "/usr/share/Ice-3.3.0"]
         for bindir in checkLocations:
             bindir = os.path.normpath(bindir)
             if os.path.exists(os.path.join(bindir, "ImportKey.class")):
diff --git a/cpp/src/iceserviceinstall/IceServiceInstall.rc b/cpp/src/iceserviceinstall/IceServiceInstall.rc
index c7b25954863..87ec9b0fc87 100644
--- a/cpp/src/iceserviceinstall/IceServiceInstall.rc
+++ b/cpp/src/iceserviceinstall/IceServiceInstall.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Service Installer\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "iceserviceinstall\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "iceserviceinstall.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2cpp/Slice2Cpp.rc b/cpp/src/slice2cpp/Slice2Cpp.rc
index 84f49209baf..abd11f9f5e9 100644
--- a/cpp/src/slice2cpp/Slice2Cpp.rc
+++ b/cpp/src/slice2cpp/Slice2Cpp.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To C++ Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2cpp\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2cpp.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2cppe/Slice2CppE.rc b/cpp/src/slice2cppe/Slice2CppE.rc
index 66a4d2c2ab1..8c8dba404e8 100644
--- a/cpp/src/slice2cppe/Slice2CppE.rc
+++ b/cpp/src/slice2cppe/Slice2CppE.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To C++ Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2cppe\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2cppe.exe\0"

             VALUE "ProductName", "Ice-E\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2cs/Slice2Cs.rc b/cpp/src/slice2cs/Slice2Cs.rc
index 17753a8e713..e988ae75ea4 100644
--- a/cpp/src/slice2cs/Slice2Cs.rc
+++ b/cpp/src/slice2cs/Slice2Cs.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To C# Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2cs\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2cs.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2docbook/Slice2Docbook.rc b/cpp/src/slice2docbook/Slice2Docbook.rc
index 343f2725114..7f18a58e229 100644
--- a/cpp/src/slice2docbook/Slice2Docbook.rc
+++ b/cpp/src/slice2docbook/Slice2Docbook.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Docbook Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2docbook\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2docbook.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2freeze/Slice2Freeze.rc b/cpp/src/slice2freeze/Slice2Freeze.rc
index 833c390b005..f8be2ab7db6 100644
--- a/cpp/src/slice2freeze/Slice2Freeze.rc
+++ b/cpp/src/slice2freeze/Slice2Freeze.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Freeze Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2freeze\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2freeze.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2freezej/Slice2FreezeJ.rc b/cpp/src/slice2freezej/Slice2FreezeJ.rc
index 8289fc8c1bd..bf7c874a441 100644
--- a/cpp/src/slice2freezej/Slice2FreezeJ.rc
+++ b/cpp/src/slice2freezej/Slice2FreezeJ.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Freeze for Java Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2freezej\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2freezej.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2html/Slice2Html.rc b/cpp/src/slice2html/Slice2Html.rc
index ba65550df58..9ba46dbe50c 100644
--- a/cpp/src/slice2html/Slice2Html.rc
+++ b/cpp/src/slice2html/Slice2Html.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To HTML Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2html\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2html.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2java/Slice2Java.rc b/cpp/src/slice2java/Slice2Java.rc
index 8b6acb67594..9a953d33b79 100644
--- a/cpp/src/slice2java/Slice2Java.rc
+++ b/cpp/src/slice2java/Slice2Java.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Java Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2java\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2java.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2javae/Slice2JavaE.rc b/cpp/src/slice2javae/Slice2JavaE.rc
index ac556e711b2..d5cdd6a7bcb 100644
--- a/cpp/src/slice2javae/Slice2JavaE.rc
+++ b/cpp/src/slice2javae/Slice2JavaE.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Java Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2javae\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2javae.exe\0"

             VALUE "ProductName", "Ice-E\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2py/Slice2Py.rc b/cpp/src/slice2py/Slice2Py.rc
index f571040b60e..29036d298e6 100644
--- a/cpp/src/slice2py/Slice2Py.rc
+++ b/cpp/src/slice2py/Slice2Py.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Python Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2py\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2py.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2rb/Slice2Rb.rc b/cpp/src/slice2rb/Slice2Rb.rc
index a8579a94527..2a27b4e1698 100644
--- a/cpp/src/slice2rb/Slice2Rb.rc
+++ b/cpp/src/slice2rb/Slice2Rb.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Ruby Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2rb\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2rb.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/src/slice2sl/Slice2Sl.rc b/cpp/src/slice2sl/Slice2Sl.rc
index 65541d9e8b4..e6d12c0b997 100644
--- a/cpp/src/slice2sl/Slice2Sl.rc
+++ b/cpp/src/slice2sl/Slice2Sl.rc
@@ -1,8 +1,8 @@
 #include "winver.h"

 

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION 3,3,51,0

- PRODUCTVERSION 3,3,51,0

+ FILEVERSION 3,3,0,0

+ PRODUCTVERSION 3,3,0,0

  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK

 #ifdef _DEBUG

  FILEFLAGS VS_FF_DEBUG

@@ -19,12 +19,12 @@ BEGIN
         BEGIN

             VALUE "CompanyName", "ZeroC, Inc.\0"

             VALUE "FileDescription", "Slice To Silverlight Translator\0"

-            VALUE "FileVersion", "3.3b\0"

+            VALUE "FileVersion", "3.3.0\0"

             VALUE "InternalName", "slice2sl\0"

             VALUE "LegalCopyright", "Copyright (c) 2003 - 2008 ZeroC, Inc.  All rights reserved.\0"

             VALUE "OriginalFilename", "slice2sl.exe\0"

             VALUE "ProductName", "Ice\0"

-            VALUE "ProductVersion", "3.3b\0"

+            VALUE "ProductVersion", "3.3.0\0"

         END

     END

     BLOCK "VarFileInfo"

diff --git a/cpp/test/Ice/background/.gitignore b/cpp/test/Ice/background/.gitignore
index 076b8e40b12..70003eefc96 100644
--- a/cpp/test/Ice/background/.gitignore
+++ b/cpp/test/Ice/background/.gitignore
@@ -3,8 +3,8 @@
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 client
 server
-libTestTransport.so.3.3b
-libTestTransport.so.33b
+libTestTransport.so.3.3.0
+libTestTransport.so.33
 libTestTransport.so
 Test.cpp
 Test.h
diff --git a/cpp/test/IceBox/configuration/.gitignore b/cpp/test/IceBox/configuration/.gitignore
index 60460cfc40a..bc5fb97a328 100644
--- a/cpp/test/IceBox/configuration/.gitignore
+++ b/cpp/test/IceBox/configuration/.gitignore
@@ -5,4 +5,3 @@ client
 libTestService.so
 Test.cpp
 Test.h
-build.txt
diff --git a/cpp/test/IceStorm/repgrid/application.xml b/cpp/test/IceStorm/repgrid/application.xml
index b678cf06ff2..a820d40f836 100644
--- a/cpp/test/IceStorm/repgrid/application.xml
+++ b/cpp/test/IceStorm/repgrid/application.xml
@@ -11,7 +11,7 @@
 
        <icebox id="${instance-name}-${index}" exe="${icebox.exe}" activation="on-demand">
 
-         <service name="IceStormServiceName" entry="IceStormService,33b:createIceStorm">
+         <service name="IceStormServiceName" entry="IceStormService,33:createIceStorm">
 
            <dbenv name="${service}"/>