From b43983634e614a9e67e5f3e523b00939761044b8 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 25 Jan 2010 12:01:00 +0100 Subject: [PATCH] ticket:1260 - Ice changes necessary for Ice 3.4 --- components/blitz/resources/omero/API.ice | 3 +- components/blitz/resources/omero/ServerErrors.ice | 4 +- .../src/ome/services/blitz/impl/ProjectionI.java | 4 +- .../ome/services/blitz/impl/RenderingEngineI.java | 4 +- .../ome/services/blitz/impl/SharedResourcesI.java | 4 +- .../services/blitz/util/CommonsLoggingAdapter.java | 4 + components/server/ivy.xml | 1 + .../src/ome/services/sharing/FreezeShareStore.java | 180 -------------------- 8 files changed, 14 insertions(+), 190 deletions(-) delete mode 100644 components/server/src/ome/services/sharing/FreezeShareStore.java diff --git a/components/blitz/resources/omero/API.ice b/components/blitz/resources/omero/API.ice index f7fd02e..e0efa1f 100644 --- a/components/blitz/resources/omero/API.ice +++ b/components/blitz/resources/omero/API.ice @@ -1081,7 +1081,6 @@ module omero { * * @see omero::grid::SharedResources **/ - ["deprecated:The SharedResources API is experimental"] omero::grid::SharedResources* sharedResources() throws ServerError; // General methods ------------------------------------------------ @@ -1168,7 +1167,7 @@ module omero { * * Specifically, the bit representing the 0-based index will be 1: * - * if (retval & 1< + diff --git a/components/server/src/ome/services/sharing/FreezeShareStore.java b/components/server/src/ome/services/sharing/FreezeShareStore.java deleted file mode 100644 index 7e7802c..0000000 --- a/components/server/src/ome/services/sharing/FreezeShareStore.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright 2008 Glencoe Software, Inc. All rights reserved. - * Use is subject to license terms supplied in LICENSE.txt - */ - -package ome.services.sharing; - -import java.io.File; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import ome.api.IShare; -import ome.model.IObject; -import ome.model.meta.Share; -import ome.services.sharing.data.ShareData; -import ome.services.sharing.data.ShareItem; -import ome.services.sharing.data.ShareItems; -import ome.services.sharing.data.ShareMap; - -import org.springframework.util.Assert; - -/** - * Entry to the Ice code generated data/ directory. - * - * @author Josh Moore, josh at glencoesoftware.com - * @since 3.0-Beta4 - * @see IShare - */ -public class FreezeShareStore extends ShareStore { - - final protected String envRoot; - - final protected String envMap; - - final protected String envItems; - - final protected File envLocation; - - final protected Freeze.Connection conn; - - // Initialization/Destruction - // ========================================================================= - - public FreezeShareStore(String root, File location) { - Assert.notNull(root); - Assert.notNull(location); - this.envRoot = root; - this.envMap = root + "Map"; - this.envItems = root + "Items"; - this.envLocation = location; - conn = Freeze.Util.createConnection(ic, envLocation.getAbsolutePath()); - } - - @Override - public void doInit() { - ShareMap map = new ShareMap(conn, envMap, true); - map.close(); - ShareItems items = new ShareItems(conn, envItems, true); - items.close(); - } - - // Overrides - // ========================================================================= - - @Override - public Long totalShares() { - ShareMap map = new ShareMap(conn, envMap, false); - try { - int mapsize = map.size(); - return Long.valueOf(mapsize); - } finally { - map.close(); - } - } - - @Override - public Long totalSharedItems() { - ShareItems items = new ShareItems(conn, envItems, false); - try { - int itemssize = items.size(); - return Long.valueOf(itemssize); - } finally { - items.close(); - } - } - - @Override - public boolean doContains(long sessionId, Class kls, - long objId) { - throw new UnsupportedOperationException("NYI"); - } - - @Override - public void doClose() { - if (conn != null) { - Ice.Communicator ic = conn.getCommunicator(); - try { - conn.close(); - } catch (Exception e) { - log.error("Error closing store", e); - } - } - } - - // User Methods - // ========================================================================= - - @Override - public void doSet(Share share, ShareData data, List items) { - Freeze._TransactionOperationsNC tx = conn.beginTransaction(); - ShareMap map = new ShareMap(conn, envMap, false); - ShareItems shareItems = new ShareItems(conn, envItems, false); - try { - map.put(data.id, data); - for (ShareItem shareItem : items) { - shareItems.put(shareItem.type + ":_" + shareItem.id, shareItem); - } - } catch (Exception e) { - tx.rollback(); - tx = null; - throw new RuntimeException(e); - } finally { - if (tx != null) { - tx.commit(); - } - } - } - - @Override - public ShareData get(long id) { - throw new UnsupportedOperationException(); - } - - @Override - public List getShares(long userId, boolean own, boolean active) { - throw new UnsupportedOperationException(); - } - - @Override - public Set keys() { - ShareMap map = new ShareMap(conn, envMap, false); - return map.keySet(); - } - - // Helper Methods - // ========================================================================= - - private List asItems(long share, - List items, List members, List guests) { - List shareItems = new ArrayList(items.size()); - for (T item : items) { - ShareItem shareItem = new ShareItem(); - shareItem.share = share; - shareItem.id = item.getId(); - shareItem.type = item.getClass().getName(); - shareItem.members = new ArrayList(members); - shareItem.guests = new ArrayList(guests); - shareItems.add(shareItem); - } - return shareItems; - } - - private Map> map(List items) { - Map> map = new HashMap>(); - for (T t : items) { - String kls = t.getClass().getName(); - List ids = map.get(kls); - if (ids == null) { - ids = new ArrayList(); - map.put(kls, ids); - } - ids.add(t.getId()); - } - return map; - } - -} -- 1.7.3.4