svn commit: r1534354 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm: IServiceDescription.java ServiceDescription.java

[challngr]

Author: challngr
Date: Mon Oct 21 19:59:34 2013
New Revision: 1534354

URL: http://svn.apache.org/r1534354
Log:
UIMA-3364 Fix restart and defrag problems with non-preemptive shares.

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java
    
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java?rev=1534354&r1=1534353&r2=1534354&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IServiceDescription.java
 Mon Oct 21 19:59:34 2013
@@ -47,6 +47,15 @@ public interface IServiceDescription
        public void setId(ADuccId id);
 
     /**
+     * Get the owner of the service
+     */
+    public String getUser();
+    /**
+     * Set the owner of the service
+     */
+    public void   setUser(String u);
+
+    /**
      * This returns the set of DUCC Ids for all the service instances which 
      * implement this service.  If the list is empty, no known implementors of 
the service
      * are being managed by DUCC.

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java?rev=1534354&r1=1534353&r2=1534354&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java
 Mon Oct 21 19:59:34 2013
@@ -69,6 +69,7 @@ public class ServiceDescription
 
     // for submitted service, the registered service id
     private ADuccId id;
+    private String  user;                 // the owner of the service
     private boolean deregistered;         // still known but trying to shutdown
 
     // number of registered instances
@@ -87,6 +88,16 @@ public class ServiceDescription
                this.id = id;
        }
 
+    public String getUser()
+    {
+        return user;
+    }
+
+    public void setUser(String user)
+    {
+        this.user = user;
+    }
+
        public ArrayList<ADuccId> getImplementors() {
                return implementors;
        }
@@ -256,7 +267,9 @@ public class ServiceDescription
             case Registered:
                 sb.append(" as ID ");
                 sb.append(id);
-                sb.append(" instances[");
+                sb.append(" Owner[");
+                sb.append(user);
+                sb.append("] instances[");
                 sb.append(Integer.toString(instances));
                 sb.append("] linger[");
                 sb.append(Long.toString(linger));