From bf4ec823b356bd8cad5d54b42005b59c47f3f37b Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Wed, 16 Apr 2014 14:48:53 +0100 Subject: [PATCH 01/10] omero: Remove Ice 3.3 and make 3.4 the minimum, 3.5 the default --- .../AdvancedClientDevelopment.txt | 8 ++-- .../unix/server-install-homebrew.txt | 41 +------------------ omero/sysadmins/unix/server-installation.txt | 12 ++---- .../sysadmins/windows/server-installation.txt | 21 ++++------ 4 files changed, 17 insertions(+), 65 deletions(-) diff --git a/omero/developers/GettingStarted/AdvancedClientDevelopment.txt b/omero/developers/GettingStarted/AdvancedClientDevelopment.txt index 88e70e5854..1537526236 100644 --- a/omero/developers/GettingStarted/AdvancedClientDevelopment.txt +++ b/omero/developers/GettingStarted/AdvancedClientDevelopment.txt @@ -10,7 +10,7 @@ Developing OMERO clients - This page is intended for developers already familiar with client/server programming. If you are not, **your best starting point is to read the** - :zeroc:`Hello World ` + :zerocdoc:`Hello World ` **chapter of the Ice manual (or more)**. A deeper understanding of Ice might not be necessary, but certainly understanding the Ice basics will make reading this guide **much** easier. @@ -1183,8 +1183,8 @@ Example: :source:`examples/OmeroClients/smartpointers.cpp` a boolean or integer/long context, returns 1 for true (i.e. non-null) or 0 for false (i.e. null). Be especially careful with the RTypes. -For more information, see :zeroc:`6.14.6 Smart Pointers for -Classes ` in the +For more information, see :zerocdoc:`6.14.6 Smart Pointers for +Classes ` in the Ice manual, which also describes the ``Ice.GC.Interval`` parameter which determines how often garbage collection runs in C++ to reap objects. This is necessary with the |OmeroModel| @@ -2396,5 +2396,3 @@ Other ``ome.model.*`` interfaces - Annotation-link-loading can behave strangely if ``AnnotationLink.child`` is not loaded. -- Python applications can segfault under certain orderings of imports: - See :zeroc:`Bus Error under Mac OX 10.4 and IcePy 3.3.0 ` diff --git a/omero/sysadmins/unix/server-install-homebrew.txt b/omero/sysadmins/unix/server-install-homebrew.txt index 6391755736..6bff290ec4 100644 --- a/omero/sysadmins/unix/server-install-homebrew.txt +++ b/omero/sysadmins/unix/server-install-homebrew.txt @@ -127,14 +127,7 @@ simple Homebrew install is sufficient, e.g. This should install OMERO along with most of the non-Python requirements. -The default version of Ice installed by the OMERO formula is Ice 3.5. To -install OMERO with Ice 3.4, use:: - - $ brew install omero --with-ice34 - -or to install OMERO with Ice 3.3, use:: - - $ brew install omero --with-ice33 +The default version of Ice installed by the OMERO formula is currently Ice 3.5. Additional installation options can be listed using the ``info`` command: @@ -155,14 +148,7 @@ install the OMERO dependencies: $ brew tap ome/alt $ brew install `brew deps omero` -The default version of Ice installed by the OMERO formula is Ice 3.5. To -install the OMERO dependencies with Ice 3.4, use:: - - $ brew install `brew deps omero --with-ice34` - -or to install the OMERO dependencies with Ice 3.3, use:: - - $ brew install `brew deps omero --with-ice33` +The default version of Ice installed by the OMERO formula is currently Ice 3.5. Prepare a place for your OMERO code to live, e.g. @@ -234,14 +220,6 @@ required entries and correspond to a Homebrew installation of OMERO |release|: export PYTHONPATH=$(brew --prefix omero)/lib/python export PATH=/usr/local/bin:/usr/local/sbin:/usr/local/lib/node_modules:$PATH -If you have installed Ice 3.3 or Ice 3.4, you will need to specify the path to -Ice Python and dynamic libraries:: - - export PYTHONPATH=$(brew --prefix omero)/lib/python:$ICE_HOME/python - export DYLD_LIBRARY_PATH=$ICE_HOME/lib:$DYLD_LIBRARY_PATH - -where ``ICE_HOME`` needs to be replaced by ``$(brew --prefix zeroc-ice33)`` or ``$(brew --prefix zeroc-ice34)`` depending on your configuration. - .. note:: If you have a local :file:`.bash_profile` file, it will override your :file:`.profile` configuration file. @@ -454,21 +432,6 @@ Try: $ brew cleanup $ brew link ossp-uuid -Ice -^^^ - -:: - - Error: Failed executing: cd cpp && make M PP_HOME=/Users/sebastien/apps/ OMERO.libs/Cellar/mcpp/2.7.2 DB_HOME=/Users/sebastien/apps/OMERO.libs/Cellar/berkeley- db46/4.6.21 OPTIMIZE=yes prefix=/Users/sebastien/apps/OMERO.libs/Cellar/zeroc-ice33/3.3 embedded_runpath_prefix=/Users/sebastien/apps/OMERO.libs/Cellar/zeroc-ice33/3.3 install - -We have had problems building ``zeroc-ice33`` under MacOS 10.7.3 and 10.6.8 -(see :ticket:`8075`). You can try installing ``zeroc-ice34`` (Ice 3.4) -instead. If you decide to go with ``zeroc-ice33``, make sure that you do not -have :envvar:`DYLD_LIBRARY_PATH` set to an existing Ice's installation lib -directory path. In essence your ``.bash_profile`` shouldn't have any -OMERO-related environment variables set before executing the installation -script. - szip ^^^^ diff --git a/omero/sysadmins/unix/server-installation.txt b/omero/sysadmins/unix/server-installation.txt index d4d1a4b71e..61c3a6f2c4 100644 --- a/omero/sysadmins/unix/server-installation.txt +++ b/omero/sysadmins/unix/server-installation.txt @@ -71,7 +71,7 @@ The following packages are required: +--------------+-------------+---------+ | Package | Recommended | Minimum | +==============+=============+=========+ -| Ice | 3.5 | 3.3 | +| Ice | 3.5 | 3.4 | +--------------+-------------+---------+ | Java | 1.7 | 1.6 | +--------------+-------------+---------+ @@ -238,11 +238,9 @@ Ice .. note:: - OMERO |version| supports Ice 3.3, 3.4 and 3.5 on UNIX and UNIX-like - platforms, but you must install the correct version of OMERO.server (see - :downloads:`Downloads <>`). See :faq_plone:`"Do I use Ice 3.3 or - Ice 3.4?" ` in - the FAQ. If you have further questions, consult the :forum:`Forums <>`. + OMERO |version| supports 3.4 and 3.5 on UNIX and UNIX-like platforms, + but you must install the correct version of OMERO.server (see + :downloads:`Downloads <>`). If possible, install one of the following packages: @@ -266,8 +264,6 @@ and `Ubuntu `_ are shown below: | Distribution | ZeroC Ice version | OMERO version | +========+==============+===================+===============+ | Debian | 7.0 | 3.4 | 4.4.x, 5.x.x | -| +--------------+-------------------+---------------+ -| | 6.0 | 3.3 | 4.4.x, 5.0.x | +--------+--------------+-------------------+---------------+ | Ubuntu | 14.04 (LTS) | 3.5 | 4.4.x, 5.x.x | | +--------------+-------------------+---------------+ diff --git a/omero/sysadmins/windows/server-installation.txt b/omero/sysadmins/windows/server-installation.txt index 7a7b3fe6c2..1bc7ed30fd 100644 --- a/omero/sysadmins/windows/server-installation.txt +++ b/omero/sysadmins/windows/server-installation.txt @@ -23,10 +23,8 @@ users/passwords described in this install guide, please see :width: 35% :alt: -- Installation on Windows XP is not explicitly supported, especially - for OMERO.web. Significant testing has taken place on Windows Server - 2008 and we recommend this version. -- OMERO does not currently support Ice 3.5 or Python 3. +- Significant testing has taken place on Windows Server 2008 and we + recommend this version. - :doc:`/sysadmins/omeromovie` is not supported on Windows at present. - A reboot is required after installing the prerequisites. @@ -53,23 +51,20 @@ Java SE Development Kit (JDK) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Java SE Downloads are available from ``_. JDK 6 -and above are supported. +Java 7 is recommended, Java 6 is supported. -Ice (3.3.x or 3.4.x) -^^^^^^^^^^^^^^^^^^^^ +Ice +^^^ .. note:: - OMERO 5.0 supports both Ice 3.3 and 3.4 for Windows. You will need to pick - the appropriate server download for the version of Ice - you have installed locally. The downloads for Ice 3.4 have "ice34" in the - zip name. + OMERO |version| supports Ice 3.5 and 3.4. You will need to pick the + matching server download for the version of Ice you have installed. If you are using precompiled packages of Ice and Python (recommended) you should use the versions specified below. In particular since OMERO does not support Python 3 **it will not work with the Ice 3.5 package for - Windows**. If you have previously installed Ice 3.5 you should uninstall - it. + Windows**. However, Ice 3.5 will work when built against Python 2.7. Windows installers of Ice can be found on the :zeroc:`ZeroC Ice 3.4.2 download From 343b6e3200b502c477756f531c783f30a97b03ae Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Wed, 16 Apr 2014 14:58:06 +0100 Subject: [PATCH 02/10] sysadmins: Update diagnostics to use current versions --- omero/sysadmins/unix/server-installation.txt | 71 +++++++++---------- .../sysadmins/windows/server-installation.txt | 10 +-- 2 files changed, 39 insertions(+), 42 deletions(-) diff --git a/omero/sysadmins/unix/server-installation.txt b/omero/sysadmins/unix/server-installation.txt index 61c3a6f2c4..a3a363fa23 100644 --- a/omero/sysadmins/unix/server-installation.txt +++ b/omero/sysadmins/unix/server-installation.txt @@ -829,60 +829,57 @@ output of the diagnostics command: OMERO Diagnostics |release| ================================================================================ - Commands: java -version 1.6.0 (/usr/bin/java) - Commands: python -V 2.6.5 (/usr/bin/python) - Commands: icegridnode --version 3.3.1 (/usr/bin/icegridnode) - Commands: icegridadmin --version 3.3.1 (/usr/bin/icegridadmin) - Commands: psql --version 8.4.12 (/usr/bin/psql) + Commands: java -version 1.7.0 (/usr/bin/java) + Commands: python -V 2.7.6 (/usr/bin/python) + Commands: icegridnode --version 3.5.1 (/usr/bin/icegridnode) + Commands: icegridadmin --version 3.5.1 (/usr/bin/icegridadmin) + Commands: psql --version 9.1.13 (/usr/bin/psql) Server: icegridnode running - Server: Blitz-0 active (pid = 28933, enabled) - Server: DropBox active (pid = 28951, enabled) - Server: FileServer active (pid = 28954, enabled) - Server: Indexer-0 active (pid = 28957, enabled) - Server: MonitorServer active (pid = 28960, enabled) - Server: OMERO.Glacier2 active (pid = 28962, enabled) - Server: OMERO.IceStorm active (pid = 28964, enabled) - Server: PixelData-0 active (pid = 28963, enabled) - Server: Processor-0 active (pid = 28972, enabled) - Server: Tables-0 active (pid = 28974, enabled) + Server: Blitz-0 active (pid = 30324, enabled) + Server: DropBox active (pid = 30343, enabled) + Server: FileServer active (pid = 30345, enabled) + Server: Indexer-0 active (pid = 30348, enabled) + Server: MonitorServer active (pid = 30351, enabled) + Server: OMERO.Glacier2 active (pid = 30353, enabled) + Server: OMERO.IceStorm active (pid = 30376, enabled) + Server: PixelData-0 active (pid = 30393, enabled) + Server: Processor-0 active (pid = 30394, enabled) + Server: Tables-0 inactive (disabled) Server: TestDropBox inactive (enabled) - Log dir: /home/omero/OMERO.server-|version| + OMERO: SSL port 4064 + OMERO: TCP port 4063 - Log files: Blitz-0.log 360.0 MB errors=9 warnings=2458 - Log files: DropBox.log 3.0 KB errors=0 warnings=1 + Log dir: /home/omero/OMERO.server-5.0.1-ice35-b21/var/log exists + + Log files: Blitz-0.log 3.0 MB errors=0 warnings=9 + Log files: DropBox.log 4.0 KB errors=0 warnings=1 Log files: FileServer.log 0.0 KB - Log files: Indexer-0.log 506.0 KB errors=0 warnings=90 + Log files: Indexer-0.log 10.0 KB errors=0 warnings=5 Log files: MonitorServer.log 2.0 KB - Log files: OMEROweb.log 710.0 KB errors=5 warnings=2 - Log files: OMEROweb.log.1 777.0 KB errors=0 warnings=1 - Log files: OMEROweb.log.2 776.0 KB errors=0 warnings=2 - Log files: OMEROweb.log.3 777.0 KB - Log files: OMEROweb.log.4 879.0 KB errors=1 warnings=2 - Log files: OMEROweb.log.5 258.0 KB - Log files: OMEROweb_request.log 10.0 KB errors=3 warnings=3 - Log files: PixelData-0.log 4.0 KB - Log files: Processor-0.log 315.0 KB errors=0 warnings=1 - Log files: Tables-0.log 2.0 KB errors=0 warnings=1 + Log files: OMEROweb.log 642.0 KB errors=0 warnings=1 + Log files: OMEROweb_request.log 0.0 KB + Log files: PixelData-0.log 7.0 KB errors=0 warnings=4 + Log files: Processor-0.log 2.0 KB errors=0 warnings=1 + Log files: Tables-0.log n/a Log files: TestDropBox.log n/a - Log files: master.err 0.0 KB + Log files: master.err 0.0 KB errors=2 warnings=0 Log files: master.out 0.0 KB - Log files: Total size 365.49 MB - - Parsing Blitz-0.log:[line:30] => Server restarted <= - Parsing Blitz-0.log:[line:213] => Server restarted <= + Log files: Total size 3.83 MB Environment:OMERO_HOME=(unset) Environment:OMERO_NODE=(unset) Environment:OMERO_MASTER=(unset) - Environment:PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + Environment:OMERO_TEMPDIR=(unset) + Environment:PATH=/usr/local/bin:/usr/bin:/bin Environment:ICE_HOME=(unset) Environment:LD_LIBRARY_PATH=(unset) Environment:DYLD_LIBRARY_PATH=(unset) - OMERO data dir: '/OMERO' Exists? True Is writable? True - OMERO.web status... [RUNNING] (PID 28736) + OMERO data dir: '/OMERO' Exists? True Is writable? True + OMERO temp dir: '/home/omero/tmp' Exists? True Is writable? True (Size: 0) + OMERO.web status... DEVELOPMENT: You will have to check status by hand! .. toctree:: :hidden: diff --git a/omero/sysadmins/windows/server-installation.txt b/omero/sysadmins/windows/server-installation.txt index 1bc7ed30fd..727ca1145a 100644 --- a/omero/sysadmins/windows/server-installation.txt +++ b/omero/sysadmins/windows/server-installation.txt @@ -800,11 +800,11 @@ your server installation: OMERO Diagnostics |release| ================================================================================ - Commands: java -version 1.6.0 (C:\\WINDOWS\\system32\\java.EXE -- 3 others) - Commands: python -V 2.6 (C:\\Python26\\python.EXE) - Commands: icegridnode --version 3.3 (C:\\Ice-3.3.1\\bin\\x64\\icegridnode.EXE -- 2 others) - Commands: icegridadmin --version 3.3 (C:\\Ice-3.3.1\\bin\\x64\\icegridadmin.EXE -- 2 others) - Commands: psql --version 8.3 (C:\\Program Files (x86)\\PostgreSQL\\8.3\\bin\\psql.EXE -- 2 others) + Commands: java -version 1.7.0 (C:\\WINDOWS\\system32\\java.EXE -- 3 others) + Commands: python -V 2.7 (C:\\Python27\\python.EXE) + Commands: icegridnode --version 3.5 (C:\\Ice-3.3.1\\bin\\x64\\icegridnode.EXE -- 2 others) + Commands: icegridadmin --version 3.5 (C:\\Ice-3.3.1\\bin\\x64\\icegridadmin.EXE -- 2 others) + Commands: psql --version 9.1 (C:\\Program Files (x86)\\PostgreSQL\\9.1\\bin\\psql.EXE -- 2 others) Server: icegridnode running Server: Blitz-0 active (pid = 7704, enabled) From 9bcf916efc41cf9321a37bba7eee9ca21b441532 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 24 Apr 2014 14:58:39 +0100 Subject: [PATCH 03/10] windows: Update server diagnostics --- .../sysadmins/windows/server-installation.txt | 74 +++++++++++++------ 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/omero/sysadmins/windows/server-installation.txt b/omero/sysadmins/windows/server-installation.txt index 727ca1145a..016e713d33 100644 --- a/omero/sysadmins/windows/server-installation.txt +++ b/omero/sysadmins/windows/server-installation.txt @@ -795,40 +795,66 @@ your server installation: .. parsed-literal:: - C:\\OMERO.server> bin\\omero admin diagnostics + C:\\opt\\OMERO.server> bin\\omero admin diagnostics + ================================================================================ OMERO Diagnostics |release| ================================================================================ - Commands: java -version 1.7.0 (C:\\WINDOWS\\system32\\java.EXE -- 3 others) - Commands: python -V 2.7 (C:\\Python27\\python.EXE) - Commands: icegridnode --version 3.5 (C:\\Ice-3.3.1\\bin\\x64\\icegridnode.EXE -- 2 others) - Commands: icegridadmin --version 3.5 (C:\\Ice-3.3.1\\bin\\x64\\icegridadmin.EXE -- 2 others) - Commands: psql --version 9.1 (C:\\Program Files (x86)\\PostgreSQL\\9.1\\bin\\psql.EXE -- 2 others) + + Commands: java -version 1.8.0 (C:\\Program Files\\Java\\jdk1.7.0_51\\bin\\java.EXE -- 2 others) + Commands: python -V 2.7.6 (C:\\Python27\\python.EXE -- 2 others) + Commands: icegridnode --version 3.5.1 (c:\\opt\\Ice-3.5.1-win-x64-Release\\bin\\icegridnode.EXE) + Commands: icegridadmin --version 3.5.1 (c:\\opt\\Ice-3.5.1-win-x64-Release\\bin\\icegridadmin.EXE) + Commands: psql --version 9.3.4 (C:\\Program Files\\PostgreSQL\\9.3\\bin\\psql.EXE) Server: icegridnode running - Server: Blitz-0 active (pid = 7704, enabled) - Server: DropBox active (pid = 8008, enabled) - Server: FSServer active (pid = 7088, enabled) - Server: Indexer-0 active (pid = 4728, enabled) - Server: OMERO.Glacier2 active (pid = 5456, enabled) - Server: OMERO.IceStorm active (pid = 800, enabled) - Server: Processor-0 active (pid = 7316, enabled) - Server: Tables-0 active (pid = 4420, enabled) + Server: Blitz-0 active (pid = 1384, enabled) + Server: DropBox inactive (disabled) + Server: FileServer inactive (disabled) + Server: Indexer-0 active (pid = 3872, enabled) + Server: MonitorServer inactive (disabled) + Server: OMERO.Glacier2 active (pid = 5744, enabled) + Server: OMERO.IceStorm active (pid = 3520, enabled) + Server: PixelData-0 active (pid = 3096, enabled) + Server: Processor-0 inactive (disabled) + Server: Tables-0 inactive (disabled) Server: TestDropBox inactive (enabled) - Server: Web inactive (enabled) Server: OMERO.master active (running as LocalSystem) - Log dir: C:\\hudson\\trunk\\dist\\var\\log exists + OMERO: SSL port 4064 + OMERO: TCP port 4063 + + Log dir: C:\\opt\\OMERO.server-5.0.1-ice35-b21\\var\\log exists - Log files: Blitz-0.log 10.0 MB errors=4 warnings=26 - Log files: DropBox.log 2.0 KB - Log files: FSServer.log 1.0 KB - Log files: Indexer-0.log 8.0 MB errors=18 warnings=1870 + Log files: Blitz-0.log 38.0 KB + Log files: DropBox.log n/a + Log files: FileServer.log n/a + Log files: Indexer-0.log 64.0 KB errors=0 warnings=2 + + Log files: MonitorServer.log n/a Log files: OMEROweb.log n/a - Log files: Processor-0.log 0.0 KB - Log files: Tables-0.log 0.0 KB + Log files: PixelData-0.log 3.0 KB errors=0 warnings=2 + + Log files: Processor-0.log n/a + Log files: Tables-0.log n/a Log files: TestDropBox.log n/a - Log files: master.err 0.0 KB + Log files: master.err 1.0 KB errors=2 warnings=2 + Log files: master.out 0.0 KB - Log files: Total size 18.94 MB + Log files: Total size 0.11 MB + + + Environment:OMERO_HOME=(unset) + Environment:OMERO_NODE=(unset) + Environment:OMERO_MASTER=(unset) + Environment:OMERO_TEMPDIR=(unset) + Environment:PATH=C:\\Program Files\\PostgreSQL\\9.3\\bin;C:\\Python27;c:\\opt\\Ice-3.5.1-win-x64-Release\\bin;C:\\Program Files\\Java\\jdk1.7.0_51\\bin;C:\\Windows\\system32;C:\\Windows;C:\\Windows\\System32\\Wbem;C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\ + Environment:ICE_HOME=c:\\opt\\Ice-3.5.1-win-x64-Release + Environment:LD_LIBRARY_PATH=(unset) + Environment:DYLD_LIBRARY_PATH=(unset) + + OMERO data dir: 'C:\\\\opt\\\\omerodata' Exists? True Is writable? True + OMERO temp dir: 'C:\\Users\\omero\\AppData\\Roaming\\omero\\tmp' Exists? True + Is writable? True (Size: 0) + OMERO.web status... [NOT STARTED] From fa5072d22e226fea0ef5c2736cbfadd34e3199e5 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 1 May 2014 11:01:47 +0100 Subject: [PATCH 04/10] windows: Remove stray "JDK6" --- omero/sysadmins/windows/server-installation.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero/sysadmins/windows/server-installation.txt b/omero/sysadmins/windows/server-installation.txt index 016e713d33..58eb127378 100644 --- a/omero/sysadmins/windows/server-installation.txt +++ b/omero/sysadmins/windows/server-installation.txt @@ -50,7 +50,7 @@ The following are necessary: Java SE Development Kit (JDK) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Java SE Downloads are available from ``_. JDK 6 +Java SE Downloads are available from ``_. Java 7 is recommended, Java 6 is supported. Ice From d35045fde1587a0c2d1e84c7bfe68fa64be9eb57 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 1 May 2014 11:03:05 +0100 Subject: [PATCH 05/10] Cpp: Remove Ice 3.3 reference --- omero/developers/Cpp.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/omero/developers/Cpp.txt b/omero/developers/Cpp.txt index f8bbfae5e3..3136303fbf 100644 --- a/omero/developers/Cpp.txt +++ b/omero/developers/Cpp.txt @@ -24,9 +24,9 @@ Prerequisites Restrictions ------------ -Ice 3.3 and Ice 3.4 will only build with GCC versions *older* than 4.6 -(they contain broken headers which newer GCC versions will not parse). -GCC 4.4 is tested and recommended. +Ice 3.4 will only build with GCC versions *older* than 4.6 (it contains +broken headers which newer GCC versions will not parse). GCC 4.4 is +tested and recommended. Ice 3.5 will build with any GCC version up to 4.8, the latest stable version; later versions may work, but are untested. From b78cd3349e76b07fd9c81c4224b203b810cbc1fd Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 1 May 2014 11:10:06 +0100 Subject: [PATCH 06/10] troubleshooting: Replace Ice 3.3 reference --- omero/sysadmins/troubleshooting.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero/sysadmins/troubleshooting.txt b/omero/sysadmins/troubleshooting.txt index 95e4846783..e5bc8065c7 100644 --- a/omero/sysadmins/troubleshooting.txt +++ b/omero/sysadmins/troubleshooting.txt @@ -218,8 +218,8 @@ most likely cause is that your PYTHONPATH is not properly set. - If you installed Ice globally via your package manager, make sure you included ice-python. -- If you installed Ice manually, e.g. under ``/opt/Ice-3.3.1`` you need - to add ``/opt/Ice-3.3.1/python`` (or similar) to your PYTHONPATH +- If you installed Ice manually, e.g. under ``/opt/Ice-3.5.1`` you need + to add ``/opt/Ice-3.5.1/python`` (or similar) to your PYTHONPATH environment variable. See the Ice installation instructions for more information. From 26f08bdfd9ed4fcea102b143413972ffe0077803 Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 1 May 2014 11:10:27 +0100 Subject: [PATCH 07/10] developers: Refer to current ZeroC documentation --- omero/developers/Java.txt | 5 +++-- omero/developers/Modules/ExceptionHandling.txt | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/omero/developers/Java.txt b/omero/developers/Java.txt index 85ed75a34c..22bdca0579 100644 --- a/omero/developers/Java.txt +++ b/omero/developers/Java.txt @@ -2,8 +2,9 @@ OMERO Java language bindings ============================ Using the :zeroc:`Ice Java language mapping -` from ZeroC_, OMERO provides access to -your data within an :doc:`/developers/server-blitz` server from Java code. +:zerocdoc:`Hello World ` from ZeroC_, + OMERO provides access to your data within an +:doc:`/developers/server-blitz` server from Java code. Using the ``omero_client.jar`` ------------------------------ diff --git a/omero/developers/Modules/ExceptionHandling.txt b/omero/developers/Modules/ExceptionHandling.txt index 0d525f56fd..daeec61e95 100644 --- a/omero/developers/Modules/ExceptionHandling.txt +++ b/omero/developers/Modules/ExceptionHandling.txt @@ -36,7 +36,7 @@ handling. *

* All exceptions that are thrown by a remote call (any call on a *Prx instance) * will be either a subclass of [Ice::UserException] or [Ice::LocalException]. - * Figure 4.4 + * Inheritance Hierarchy for Exceptions * from the Ice manual shows the entire exception hierarchy. The exceptions described in * this file will subclass from [Ice::UserException]. Other Ice-runtime exceptions subclass * from [Ice::LocalException]. From dbbb173dc64ab7c80dc61d3d0a1857488366c0bf Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Thu, 1 May 2014 11:44:05 +0100 Subject: [PATCH 08/10] server-installation: Wording matches 5.0 changes --- omero/sysadmins/unix/server-installation.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero/sysadmins/unix/server-installation.txt b/omero/sysadmins/unix/server-installation.txt index a3a363fa23..405eb96421 100644 --- a/omero/sysadmins/unix/server-installation.txt +++ b/omero/sysadmins/unix/server-installation.txt @@ -238,8 +238,8 @@ Ice .. note:: - OMERO |version| supports 3.4 and 3.5 on UNIX and UNIX-like platforms, - but you must install the correct version of OMERO.server (see + OMERO |version| supports 3.5 and 3.4 on UNIX and UNIX-like platforms. + You must install the correct version of OMERO.server (see :downloads:`Downloads <>`). If possible, install one of the following packages: From 6d136e0fe503dc743bf893206780cf7a565c389a Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Fri, 2 May 2014 11:29:18 +0100 Subject: [PATCH 09/10] Java.txt: Correct indentation --- omero/developers/Java.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/omero/developers/Java.txt b/omero/developers/Java.txt index 22bdca0579..590b3446a2 100644 --- a/omero/developers/Java.txt +++ b/omero/developers/Java.txt @@ -3,7 +3,7 @@ OMERO Java language bindings Using the :zeroc:`Ice Java language mapping :zerocdoc:`Hello World ` from ZeroC_, - OMERO provides access to your data within an +OMERO provides access to your data within an :doc:`/developers/server-blitz` server from Java code. Using the ``omero_client.jar`` From 6383c4cf11c16ef2aceca2f20de9be9af91f5f8b Mon Sep 17 00:00:00 2001 From: Roger Leigh Date: Mon, 5 May 2014 09:55:34 +0100 Subject: [PATCH 10/10] Java: correct broken Ice link --- omero/developers/Java.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omero/developers/Java.txt b/omero/developers/Java.txt index 590b3446a2..dec735a407 100644 --- a/omero/developers/Java.txt +++ b/omero/developers/Java.txt @@ -1,8 +1,8 @@ OMERO Java language bindings ============================ -Using the :zeroc:`Ice Java language mapping -:zerocdoc:`Hello World ` from ZeroC_, +Using the :zerocdoc:`Ice Java language mapping +` from ZeroC_, OMERO provides access to your data within an :doc:`/developers/server-blitz` server from Java code.