Changeset 1362

Timestamp:

03/14/07 07:45:37 (21 months ago)

Author:

jmoore

Message:

• #614 Initial work for License integration with OmeroBlitz
  
• tools/licenses now depends on blitz and ice
  
• Added omero.api.ServiceInterface
  
• Added ServiceFactory.getByName() and ServantDefinition for loading unknown services
  
• Added session messages so others can hook into creation
  
• Added first license exception
  
• Also fixed dropped exceptions on login in OMERO::client
  

Location:

trunk/components

Files:

• blitz/resources/slice/API.ice (modified) (13 diffs)
• blitz/resources/slice/Error.ice (modified) (2 diffs)
• blitz/src/cpp/OMERO/client.cpp (modified) (2 diffs)
• blitz/src/cpp/OMERO/client.h (modified) (1 diff)
• blitz/src/ome/services/icy/fire/SessionManagerI.java (modified) (6 diffs)
• blitz/src/ome/services/icy/impl/ServiceFactoryI.java (modified) (7 diffs)
• blitz/src/ome/services/icy/util/AbstractSessionMessage.java (added)
• blitz/src/ome/services/icy/util/CreateSessionMessage.java (added)
• blitz/src/ome/services/icy/util/DestroySessionMessage.java (added)
• blitz/src/ome/services/icy/util/ServantDefinition.java (added)
• blitz/src/ome/services/icy/util/UnregisterServantMessage.java (modified) (4 diffs)
• tools/licenses/.classpath (modified) (1 diff)
• tools/licenses/classpath.xml (modified) (4 diffs)
• tools/licenses/resources/ome/services/blitz-ome.services.licenses.ILicense.xml (added)
• tools/licenses/resources/slice (added)
• tools/licenses/resources/slice/LicensesAPI.ice (added)
• tools/licenses/src/ome/services/licenses/LicenseSessionListener.java (added)

trunk/components/blitz/resources/slice/API.ice

@@ -38 +38 @@
     sequence<string> StringSet;
 
-    interface IAdmin
+    interface ServiceInterface
+    {
+    };
+
+    interface IAdmin extends ServiceInterface
     {
     
@@ -82 +86 @@
     };  
 
-    interface IConfig
+    interface IConfig extends ServiceInterface
     {
       nonmutating string getVersion() throws ServerError;
@@ -92 +96 @@
 
 
-    interface IPixels
+    interface IPixels extends ServiceInterface
     {
       nonmutating omero::model::Pixels retrievePixDescription(long pixId) throws ServerError;
@@ -106 +110 @@
     dictionary<int, int> CountMap;
 
-    interface IPojos
+    interface IPojos extends ServiceInterface
     {
       nonmutating IObjectList loadContainerHierarchy(string rootType, omero::api::LongList rootIds, omero::sys::ParamMap options) throws ServerError;
@@ -127 +131 @@
     };
 
-    interface IQuery
+    interface IQuery extends ServiceInterface
     {
       nonmutating omero::model::IObject get(string klass, long id) throws ServerError;
@@ -141 +145 @@
     };
 
-    interface ITypes
+    interface ITypes extends ServiceInterface
     {
       omero::model::IObject createEnumeration(omero::model::IObject newEnum) throws ServerError;
@@ -148 +152 @@
     };
 
-    interface IUpdate
+    interface IUpdate extends ServiceInterface
     { 
       void saveObject(omero::model::IObject obj) throws ServerError;
@@ -157 +161 @@
     };
 
-    interface RawFileStore
+    interface RawFileStore extends ServiceInterface
     {
       void setFileId(long fileId) throws ServerError;
@@ -164 +168 @@
     };
 
-    interface RawPixelsStore
+    interface RawPixelsStore extends ServiceInterface
     {
       void setPixelsId(long pixelsId) throws ServerError;
@@ -189 +193 @@
     };
 
-    interface RenderingEngine
+    interface RenderingEngine extends ServiceInterface
     {
       omero::romio::RGBBuffer render(omero::romio::PlaneDef def) throws ServerError;
@@ -227 +231 @@
     };
 
-    interface ThumbnailStore 
+    interface ThumbnailStore extends ServiceInterface
     {
       void setPixelsId(long pixelsId) throws ServerError;
@@ -240 +244 @@
     };
 
-    interface SimpleCallback {
+    interface SimpleCallback 
+    {
       void call();
     };
@@ -260 +265 @@
       ThumbnailStore* createThumbnailStore();
 
+      ServiceInterface* getByName(string name) throws ServerError;
       void setCallback(SimpleCallback* callback);
       void close();

trunk/components/blitz/resources/slice/Error.ice

@@ -10 +10 @@
 #define OMERO_ERROR_ICE
 
+#include <Glacier2/Session.ice>
+
 module omero
 {
@@ -17 +19 @@
         string serverExceptionClass;
         string message;
+    };
+
+    exception SessionCreationException extends Glacier2::CannotCreateSessionException
+    {
     };
     

trunk/components/blitz/src/cpp/OMERO/client.cpp

@@ -39 +39 @@
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(prx);
     Glacier2::SessionPrx session;
-    try
-      {
-        session = router->createSession(username, password);
-      }
-    catch(const Glacier2::PermissionDeniedException& ex)
-      {
-        cout << "permission denied:\n" << ex.reason << endl;
-      }
-    catch(const Glacier2::CannotCreateSessionException& ex)
-      {
-        cout << "cannot create session:\n" << ex.reason << endl;
-      }
+    session = router->createSession(username, password);
     sf = omero::api::ServiceFactoryPrx::checkedCast(session);
-    
+
   }
   
@@ -99 +88 @@
   }
 
+  Ice::ObjectPrx client::getByName(const string& name, const ::Ice::Context& ctx) {
+    return sf->getByName(name, ctx);
+  }
+
   void client::setCallback(const ::omero::api::SimpleCallbackPrx& cb, const ::Ice::Context& ctx) {
     sf->setCallback(cb, ctx);

trunk/components/blitz/src/cpp/OMERO/client.h

@@ -74 +74 @@
     omero::api::RenderingEnginePrx createRenderingEngine(const ::Ice::Context& ctx);
     omero::api::ThumbnailStorePrx createThumbnailStore(const ::Ice::Context& ctx);
+    Ice::ObjectPrx getByName(const std::string& name, const ::Ice::Context& ctx);
+
     /*
      * Closes the session AND all proxies created by it.

trunk/components/blitz/src/ome/services/icy/fire/SessionManagerI.java

@@ -9 +9 @@
 
 import java.util.List;
+import java.util.Map;
 
+import ome.conditions.InternalException;
 import ome.logic.HardWiredInterceptor;
 import ome.security.SecuritySystem;
+import ome.services.icy.config.IceFacetFactoryBean;
+import ome.services.icy.util.CreateSessionMessage;
 import ome.system.OmeroContext;
 import ome.system.Principal;
 import ome.system.Roles;
+import ome.util.messages.MessageException;
 import omero.constants.EVENT;
 import omero.constants.GROUP;
@@ -21 +26 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+
+import Glacier2.CannotCreateSessionException;
 
 public final class SessionManagerI extends Glacier2._SessionManagerDisp
@@ -46 +54 @@
             }
         }
+        
     }
     
@@ -54 +63 @@
 
     public Glacier2.SessionPrx create(String userId,
-            Glacier2.SessionControlPrx control, Ice.Current current) {
+            Glacier2.SessionControlPrx control, Ice.Current current) 
+        throws CannotCreateSessionException {
 
         Roles roles = securitySystem.getSecurityRoles();
@@ -72 +82 @@
         session.setInterceptors(CPTORS);
 
+        Ice.Identity id = new Ice.Identity();
+        id.category = "";
+        id.name = Ice.Util.generateUUID();
+        Ice.ObjectPrx _prx = current.adapter.add(session,id);
+        Glacier2.SessionPrx prx = Glacier2.SessionPrxHelper.uncheckedCast(_prx);
+        
         if (log.isDebugEnabled()) {
             log.debug(String.format("Created session %s for user %s", session,
@@ -77 +93 @@
         }
 
-        return Glacier2.SessionPrxHelper.uncheckedCast(current.adapter
-                .addWithUUID(session));
+        CreateSessionMessage msg = new CreateSessionMessage(this,id.name,principal);
+        try {
+            context.publishMessage(msg);
+        } catch (CannotCreateSessionException ccse) {
+            throw ccse;
+        } catch (Throwable t) {
+            // FIXME this copying should be a part of ome.conditions.*
+            InternalException ie = new InternalException(t.getMessage());
+            ie.setStackTrace(t.getStackTrace());
+            throw ie;
+        }
+        return prx;
     }
     

trunk/components/blitz/src/ome/services/icy/impl/ServiceFactoryI.java

@@ -8 +8 @@
 package ome.services.icy.impl;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Collections;
 import java.util.HashSet;
@@ -26 +28 @@
 import ome.api.ServiceInterface;
 import ome.api.ThumbnailStore;
+import ome.conditions.InternalException;
 import ome.logic.HardWiredInterceptor;
 import ome.services.icy.fire.AopContextInitializer;
 import ome.services.icy.fire.Session;
+import ome.services.icy.util.DestroySessionMessage;
+import ome.services.icy.util.ServantDefinition;
 import ome.services.icy.util.ServantHelper;
 import ome.services.icy.util.UnregisterServantMessage;
@@ -35 +40 @@
 import ome.system.ServiceFactory;
 import omeis.providers.re.RenderingEngine;
+import omero.ServerError;
 import omero.api.IAdminPrx;
 import omero.api.IAdminPrxHelper;
@@ -53 +59 @@
 import omero.api.RenderingEnginePrx;
 import omero.api.RenderingEnginePrxHelper;
+import omero.api.ServiceInterfacePrx;
+import omero.api.ServiceInterfacePrxHelper;
 import omero.api.SimpleCallbackPrx;
 import omero.api.ThumbnailStorePrx;
@@ -85 +93 @@
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
+
+import Ice.Current;
+import Ice.ObjectPrx;
 
 /**
@@ -325 +337 @@
     // =========================================================================
 
+    public ServiceInterfacePrx getByName(String name, Current current) throws ServerError {
+        Ice.Identity id = getIdentity(current, name);
+        String key = Ice.Util.identityToString(id);
+
+        Ice.ObjectPrx prx = servantProxy(id, current);
+        if (prx == null) {
+            ServantDefinition sd = (ServantDefinition) context.getBean(name);
+            Object servant;
+            try {
+                Object ops = createServantDelegate(sd.getOperationsClass(), sd
+                        .getServiceClass(), key);
+                Constructor ctor = sd.getTieClass().getConstructor(
+                        sd.getOperationsClass());
+                servant = ctor.newInstance(ops);
+                prx = registerServant(sd.getOperationsClass().cast(servant), current, id);
+            } catch (Exception e) {
+                // FIXME
+                omero.InternalException ie = new omero.InternalException();
+                ie.message = e.getMessage();
+                throw ie;
+            }            
+        }
+        return ServiceInterfacePrxHelper.uncheckedCast(prx);
+    }
+    
     public void setCallback(SimpleCallbackPrx callback, Ice.Current current) {
         throw new UnsupportedOperationException();
@@ -344 +381 @@
         }
         close(current);
+        DestroySessionMessage msg = new DestroySessionMessage(this,current.id.name,principal);
+        try {
+            context.publishMessage(msg);
+        } catch (Throwable t) {
+            // FIXME
+            InternalException ie = new InternalException(t.getMessage());
+            ie.setStackTrace(t.getStackTrace());
+        }
     }
 

trunk/components/blitz/src/ome/services/icy/util/UnregisterServantMessage.java

@@ +1 @@
+/*
+ *   $Id$
+ *
+ *   Copyright (c) 2007 Glencoe Software Inc. All rights reserved.
+ *   Use is subject to license terms supplied in LICENSE.txt
+ */
+
 package ome.services.icy.util;
 
@@ -13 +20 @@
 import ome.system.OmeroContext;
 import ome.util.Filterable;
+import ome.util.messages.InternalMessage;
 import omero.RType;
 import omero.ServerError;
@@ -20 +28 @@
 
 /**
- * Provides helper methods so that servant implementations need not extend a
- * particular {@link Class}.
- * 
  * @author josh
  * 
  */
-public class UnregisterServantMessage extends ApplicationEvent {
+public class UnregisterServantMessage extends InternalMessage {
+
+    private static final long serialVersionUID = 3409582093802L;
 
     String key;
@@ -33 +40 @@
     public UnregisterServantMessage(Object source, String serviceKey, Ice.Current current) {
         super(source);
-        this.key = key;
+        this.key = serviceKey;
         this.curr = current;
     }

trunk/components/tools/licenses/.classpath

@@ -41 +41 @@
         <classpathentry exported="true" kind="var" path="M2_REPO/omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
         <classpathentry exported="true" kind="var" path="M2_REPO/omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <classpathentry exported="true" kind="var" path="M2_REPO/omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/>
+        <classpathentry exported="true" kind="var" path="M2_REPO/omero/ice/3.1.1/ice-3.1.1.jar"/>
         <classpathentry exported="true" kind="var" path="M2_REPO/omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/>
         <classpathentry exported="true" kind="var" path="M2_REPO/org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>

trunk/components/tools/licenses/classpath.xml

@@ -59 +59 @@
         <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
         <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <file name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/>
+        <file name="omero/ice/3.1.1/ice-3.1.1.jar"/>
         <file name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/>
         <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
@@ -103 +105 @@
         <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
         <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <include name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/>
+        <include name="omero/ice/3.1.1/ice-3.1.1.jar"/>
         <include name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/>
         <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
@@ -150 +154 @@
         <file name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
         <file name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <file name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/>
+        <file name="omero/ice/3.1.1/ice-3.1.1.jar"/>
         <file name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/>
         <file name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>
@@ -199 +205 @@
         <include name="omero/romio/3.0-TRUNK/romio-3.0-TRUNK.jar"/>
         <include name="omero/server/3.0-TRUNK/server-3.0-TRUNK.jar"/>
+        <include name="omero/blitz/3.0-TRUNK/blitz-3.0-TRUNK.jar"/>
+        <include name="omero/ice/3.1.1/ice-3.1.1.jar"/>
         <include name="omero/client/3.0-TRUNK/client-3.0-TRUNK.jar"/>
         <include name="org/acegisecurity/acegi-security/1.0.0-RC1/acegi-security-1.0.0-RC1.jar"/>