Merge branch 'master' of ssh://git/home/git/ice

9 files changed, 131 insertions, 87 deletions

diff --git a/config/TestUtil.py b/config/TestUtil.py
index 09d776e539e..a6156ef1721 100755
--- a/config/TestUtil.py
+++ b/config/TestUtil.py
@@ -617,14 +617,7 @@ class InvalidSelectorString(Exception):
 
 sslConfigTree = { 
         "cpp" : { 
-            "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL  --Ice.Default.Protocol=ssl --IceSSL.DefaultDir=%(certsdir)s " +  
-            "--IceSSL.CertAuthFile=cacert.pem",
-            "client" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem",
-            "server" : " --IceSSL.CertFile=s_rsa1024_pub.pem --IceSSL.KeyFile=s_rsa1024_priv.pem",
-            "colloc" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem"
-            },
-        "rb" : { 
-            "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL  --Ice.Default.Protocol=ssl --IceSSL.DefaultDir=%(certsdir)s " +  
+            "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL --Ice.Default.Protocol=ssl --IceSSL.DefaultDir=%(certsdir)s " +  
             "--IceSSL.CertAuthFile=cacert.pem",
             "client" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem",
             "server" : " --IceSSL.CertFile=s_rsa1024_pub.pem --IceSSL.KeyFile=s_rsa1024_priv.pem",
@@ -645,6 +638,8 @@ sslConfigTree = {
             "colloc" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.ImportCert.CurrentUser.Root=cacert.pem --IceSSL.CheckCertName=0"
             },
         }
+sslConfigTree["py"] = sslConfigTree["cpp"]
+sslConfigTree["rb"] = sslConfigTree["cpp"]
 
 def getDefaultMapping(currentDir = ""):
     """Try and guess the language mapping out of the current path"""
diff --git a/distribution/src/windows/vc60/doc/README.txt b/distribution/src/windows/vc60/doc/README.txt
index 5e30421173e..11693086d8f 100755
--- a/distribution/src/windows/vc60/doc/README.txt
+++ b/distribution/src/windows/vc60/doc/README.txt
@@ -23,8 +23,8 @@ This binary distribution provides all Ice run time services and
 development tools to build Ice applications:

 

  - in C++, using Visual Studio 6.0

- - in Ruby, using Ruby 1.8.5

- - in PHP, using PHP 5.2.1

+ - in Ruby, using Ruby 1.8.6

+ - in PHP, using PHP 5.2.5

 

 If you want to develop Ice applications in another programming 

 language, or with another C++ compiler, please download the 

@@ -48,6 +48,26 @@ Supported Windows versions
 This distribution is supported on Windows XP with Service Pack 2.

 

 

+Monotonic clock

+---------------

+

+Ice uses the QueryPerformanceCounter Windows API function to measure

+time with a monotonic clock. If you are experiencing timing or

+performance issues, there are two knowledgebase articles that may be

+relevant for your system:

+

+  http://support.microsoft.com/?id=896256

+  http://support.microsoft.com/?id=895980

+

+

+Running IceGrid and Glacier2 components as services

+---------------------------------------------------

+

+An appendix in the Ice manual provides information on installing and

+running the IceGrid registry, IceGrid node, and Glacier2 router as

+Windows services.

+

+

 Setting up Visual Studio 6.0 to build Ice applications in C++

 -------------------------------------------------------------

 

@@ -79,26 +99,6 @@ libraries, and executables.
 - Add <Ice installation root directory>\bin

 

 

-Monotonic clock

----------------

-

-Ice uses the QueryPerformanceCounter Windows API function to measure

-time with a monotonic clock. If you are experiencing timing or

-performance issues, there are two knowledgebase articles that may be

-relevant for your system:

-

-  http://support.microsoft.com/?id=896256

-  http://support.microsoft.com/?id=895980

-

-

-Running IceGrid and Glacier2 components as services

----------------------------------------------------

-

-The WINDOWS_SERVICES.txt file included in this distribution contains

-information on how to install and run the IceGrid registry, IceGrid

-node, and Glacier2 router as Windows services.

-

-

 Building and running the C++ demos

 ----------------------------------

 

@@ -131,7 +131,7 @@ Running the Ruby demos
 

 The Ruby demos are in the demorb directory.

 

-You need Ruby 1.8.5 to run the demos. A binary installer for Ruby

+You need Ruby 1.8.6 to run the demos. A binary installer for Ruby

 can be downloaded from:

 

   http://rubyforge.org/projects/rubyinstaller/

@@ -186,7 +186,7 @@ Running the PHP demos
 

 Two PHP demos are provided in the demophp directory.

 

-To run the PHP demos, you need PHP 5.2.1. It can be downloaded from:

+To run the PHP demos, you need PHP 5.2.5. It can be downloaded from:

 

   http://www.php.net/downloads.php

 

diff --git a/distribution/src/windows/vc80/doc/README.txt b/distribution/src/windows/vc80/doc/README.txt
index 10ddb7eff16..18bc5eaa3eb 100755
--- a/distribution/src/windows/vc80/doc/README.txt
+++ b/distribution/src/windows/vc80/doc/README.txt
@@ -27,7 +27,7 @@ development tools to build Ice applications:
  - in Visual Basic, using Visual Studio 2005 or Visual Basic 2005 

    Express Edition

  - in Java, using Java 2, Java 5 or Java 6

- - in Python, using Python 2.5

+ - in Python, using Python 2.5.2

 

 If you want to develop Ice applications in Ruby or in PHP, or with

 another C++ compiler, please download the appropriate Ice binary 

@@ -49,9 +49,57 @@ Supported Windows versions
 --------------------------

 

 This distribution is supported on the following Windows versions:

+

  - Windows XP with Service Pack 2 (x86)

- - Windows Server 2003 Standard (x86)

- - Windows Vista (x86)

+ - Windows Server 2003 Standard (x86 and x64)

+ - Windows Vista (x86 and x64)

+

+Note that this installer does not include the Visual C++ 8.0 run time

+for 64-bit platforms. If you are installing this distribution on a

+64-bit platform without Visual Studio, you must also install the

+Visual C++ run time. You can download the "redistributable" package

+using the link below:

+

+  http://www.microsoft.com/downloads/details.aspx?familyid=90548130-4468-4bbc-9673-d6acabd5d13b&displaylang=en

+

+

+Monotonic clock

+---------------

+

+Ice uses the QueryPerformanceCounter Windows API function to measure

+time with a monotonic clock. If you are experiencing timing or

+performance issues, there are two knowledgebase articles that may be

+relevant for your system:

+

+  http://support.microsoft.com/?id=896256

+  http://support.microsoft.com/?id=895980

+

+

+Running IceGrid and Glacier2 components as services

+---------------------------------------------------

+

+An appendix in the Ice manual provides information on installing and

+running the IceGrid registry, IceGrid node, and Glacier2 router as

+Windows services.

+

+

+Python Compatibility

+--------------------

+

+The binary distributions of Python 2.5.x for Windows available from

+www.python.org are compiled with Visual C++ 7.1, and the Ice extension

+for Python included in this installer is compiled with Visual C++ 8.0.

+Python's developers do not support extensions built with another

+compiler, however we have tested the Ice extension extensively and

+have not encountered any compatibility issues.

+

+If you distribute an Ice for Python application, you must include the

+DLLs for the extension, the Ice run time, and the Visual C++ 8.0 run

+time. An appendix in the Ice manual provides more information on

+distributing Ice applications. The link below describes the process

+of deploying the Visual C++ 8.0 run time:

+

+http://msdn2.microsoft.com/en-us/library/ms235291(VS.80).aspx

 

 

 Setting up Visual Studio 2005 to build Ice applications in C++

@@ -76,26 +124,6 @@ libraries, and executables.
 - Add <Ice installation root directory>\bin

 

 

-Monotonic clock

----------------

-

-Ice uses the QueryPerformanceCounter Windows API function to measure

-time with a monotonic clock. If you are experiencing timing or

-performance issues, there are two knowledgebase articles that may be

-relevant for your system:

-

-  http://support.microsoft.com/?id=896256

-  http://support.microsoft.com/?id=895980

-

-

-Running IceGrid and Glacier2 components as services

----------------------------------------------------

-

-The WINDOWS_SERVICES.txt file included in this distribution contains

-information on how to install and run the IceGrid registry, IceGrid

-node, and Glacier2 router as Windows services.

-

-

 Setting up Visual C++ 2005 Express Edition

 ------------------------------------------

 

diff --git a/distribution/src/windows/vc90/doc/README.txt b/distribution/src/windows/vc90/doc/README.txt
index ff13a5d58f7..8057c298ffe 100755
--- a/distribution/src/windows/vc90/doc/README.txt
+++ b/distribution/src/windows/vc90/doc/README.txt
@@ -48,9 +48,38 @@ Supported Windows versions
 --------------------------

 

 This distribution is supported on the following Windows versions:

+

  - Windows XP with Service Pack 2 (x86)

- - Windows Server 2003 Standard (x86)

- - Windows Vista (x86)

+ - Windows Server 2003 Standard (x86 & x64)

+ - Windows Vista (x86 & x64)

+

+Note that this installer does not include the Visual C++ 9.0 run time

+for 64-bit platforms. If you are installing this distribution on a

+64-bit platform without Visual Studio, you must also install the

+Visual C++ run time. You can download the "redistributable" package

+using the link below:

+

+  http://www.microsoft.com/downloads/details.aspx?FamilyID=bd2a6171-e2d6-4230-b809-9a8d7548c1b6&DisplayLang=en

+

+

+Monotonic clock

+---------------

+

+Ice uses the QueryPerformanceCounter Windows API function to measure

+time with a monotonic clock. If you are experiencing timing or

+performance issues, there are two knowledgebase articles that may be

+relevant for your system:

+

+  http://support.microsoft.com/?id=896256

+  http://support.microsoft.com/?id=895980

+

+

+Running IceGrid and Glacier2 components as services

+---------------------------------------------------

+

+An appendix in the Ice manual provides information on installing and

+running the IceGrid registry, IceGrid node, and Glacier2 router as

+Windows services.

 

 

 Setting up Visual Studio 2008 to build Ice applications in C++

@@ -75,26 +104,6 @@ libraries, and executables.
 - Add <Ice installation root directory>\bin

 

 

-Monotonic clock

----------------

-

-Ice uses the QueryPerformanceCounter Windows API function to measure

-time with a monotonic clock. If you are experiencing timing or

-performance issues, there are two knowledgebase articles that may be

-relevant for your system:

-

-  http://support.microsoft.com/?id=896256

-  http://support.microsoft.com/?id=895980

-

-

-Running IceGrid and Glacier2 components as services

----------------------------------------------------

-

-The WINDOWS_SERVICES.txt file included in this distribution contains

-information on how to install and run the IceGrid registry, IceGrid

-node, and Glacier2 router as Windows services.

-

-

 Setting up Visual C++ 2008 Express Edition

 ------------------------------------------

 

diff --git a/py/INSTALL b/py/INSTALL
index 60f47fdd334..1809cce94c9 100644
--- a/py/INSTALL
+++ b/py/INSTALL
@@ -55,6 +55,17 @@ The Python interpreter is readily available on Windows platforms. You
 can build it yourself using Microsoft Visual C++, or obtain a binary
 distribution from the Python web site (http://www.python.org).
 
+Note that the binary distribution for Python 2.5.x available from
+www.python.org is compiled with Visual C++ 7.1, which is not a
+compiler that Ice supports. Although the Python developers do not
+support the use of Python extensions that are compiled with other
+versions of Visual C++, we have tested the Ice extension built with
+Visual C++ 8.0 and experienced no issues in combination with Python's
+binary distribution. It should also be possible to use the Ice
+extension when compiled with Visual C++ 6.0, however the extension
+cannot be compiled with Visual C++ 9.0. The optimal solution is to
+compile both Python and Ice using Visual C++ 8.0.
+
 Follow these steps to build the Ice extension for Python:
 
 1) Open a command prompt that supports command-line compilation with
diff --git a/py/config/Make.rules.mak b/py/config/Make.rules.mak
index 7d8a3243869..9086b632df9 100644
--- a/py/config/Make.rules.mak
+++ b/py/config/Make.rules.mak
@@ -23,7 +23,7 @@ OPTIMIZE		= yes
 
 #
 # Specify your C++ compiler. Supported values are:
-# VC60, VC71, VC80, VC80_EXPRESS
+# VC60, VC71, VC80, VC80_EXPRESS, VC90, VC90_EXPRESS
 #
 !if "$(CPP_COMPILER)" == ""
 CPP_COMPILER            = VC80
@@ -33,7 +33,7 @@ CPP_COMPILER            = VC80
 # Set PYTHON_HOME to your Python installation directory.
 #
 !if "$(PYTHON_HOME)" == ""
-PYTHON_HOME		= C:\Python24
+PYTHON_HOME		= C:\Python25
 !endif
 
 #
@@ -85,7 +85,8 @@ install_libdir		= $(prefix)\python
 THIRDPARTY_HOME 	= $(STLPORT_HOME)
 
 !if "$(CPP_COMPILER)" != "VC60" && "$(CPP_COMPILER)" != "VC71" && \
-    "$(CPP_COMPILER)" != "VC80" && "$(CPP_COMPILER)" != "VC80_EXPRESS"
+    "$(CPP_COMPILER)" != "VC80" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && \
+    "$(CPP_COMPILER)" != "VC90" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
 !error Invalid setting for CPP_COMPILER: $(CPP_COMPILER)
 !endif
 
diff --git a/py/test/Ice/blobject/Client.py b/py/test/Ice/blobject/Client.py
index b0645fc0552..b402d0e8145 100644
--- a/py/test/Ice/blobject/Client.py
+++ b/py/test/Ice/blobject/Client.py
@@ -53,13 +53,15 @@ def run(args, communicator, sync):
         hello.shutdown()
     return True
 
+argv = sys.argv[:]  # Clone the arguments to use again later
+
 try:
     initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
+    initData.properties = Ice.createProperties(argv)
     initData.properties.setProperty('Ice.Warn.Dispatch', '0')
-    communicator = Ice.initialize(sys.argv, initData)
+    communicator = Ice.initialize(argv, initData)
     router = RouterI.RouterI(communicator, False)
-    print "testing async blobject... ",
+    print "testing async blobject...",
     sys.stdout.flush()
     status = run(sys.argv, communicator, False)
     print "ok"
@@ -82,7 +84,7 @@ if status:
         initData.properties.setProperty('Ice.Warn.Dispatch', '0')
         communicator = Ice.initialize(sys.argv, initData)
         router = RouterI.RouterI(communicator, True)
-        print "testing sync blobject... ",
+        print "testing sync blobject...",
         sys.stdout.flush()
         status = run(sys.argv, communicator, True)
         print "ok"
diff --git a/py/test/Ice/blobject/RouterI.py b/py/test/Ice/blobject/RouterI.py
index 14ba9c8c508..30259e99c7e 100644
--- a/py/test/Ice/blobject/RouterI.py
+++ b/py/test/Ice/blobject/RouterI.py
@@ -144,7 +144,7 @@ class ServantLocatorI(Ice.ServantLocator):
 
 class RouterI(Ice.Router):
     def __init__(self, communicator, sync):
-        self._adapter = communicator.createObjectAdapterWithEndpoints("forward", "tcp -h 127.0.0.1")
+        self._adapter = communicator.createObjectAdapterWithEndpoints("forward", "default -h 127.0.0.1")
         if sync:
             self._blobject = BlobjectI()
         else:
diff --git a/py/test/Ice/blobject/run.py b/py/test/Ice/blobject/run.py
index 0f23ed5db61..aac96096db2 100755
--- a/py/test/Ice/blobject/run.py
+++ b/py/test/Ice/blobject/run.py
@@ -28,7 +28,5 @@ TestUtil.processCmdLine()
 
 name = os.path.join("Ice", "blobject")
 
-
-print "tests with regular server."
 TestUtil.clientServerTest(name)
 sys.exit(0)