Changeset 1676 for branches

Timestamp:

06/26/07 12:36:30 (18 months ago)

Author:

callan

Message:

Merging changes from r1673:1675 (#743) into the milestone:3.0-Beta2 branch.

Location:

branches/3.0-Beta2/components

Files:

• blitz/resources/OMERO/API.ice (modified) (1 diff)
• tools/WebAdmin/WEB-INF/web.xml (modified) (1 diff)

branches/3.0-Beta2/components/blitz/resources/OMERO/API.ice

@@ -269 +269 @@
     interface ThumbnailStore extends ServiceInterface
       {
-        void setPixelsId(long pixelsId) throws ServerError;
+        bool setPixelsId(long pixelsId) throws ServerError;
         void setRenderingDefId(long renderingDefId) throws ServerError;
         Ice::ByteSeq getThumbnail(int sizeX, int sizeY) throws ServerError;

branches/3.0-Beta2/components/tools/WebAdmin/WEB-INF/web.xml

@@ -71 +71 @@
         <context-param>
                 <param-name>defaultServerHost</param-name>
-                <param-value>warlock.openmicroscopy.org.uk</param-value>
+                <param-value>localhost</param-value>
         </context-param>
         <context-param>