[jbpm-commits] JBoss JBPM SVN: r2905 - in projects/gwt-console/trunk: war/src/main/java/org/jboss/bpm/console/client and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-11-13 07:27:38 -0500 (Thu, 13 Nov 2008)
New Revision: 2905

Modified:
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
Log:
More work on signaling

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java	2008-11-13 11:47:13 UTC (rev 2904)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java	2008-11-13 12:27:38 UTC (rev 2905)
@@ -168,16 +168,18 @@
    }
 
    @POST
-   @Path("tokens/{id}/signal/{signalName}")
+   @Path("tokens/{id}")
    @Produces("application/json")
    public Response signalToken(
      @PathParam("id")
      long id,
-     @PathParam("signalName")
+     @QueryParam("signal")     
      String signalName)
    {
+      log.debug("Signal token " + id + " -> " + signalName);
+      
       getExtensionDAO().signalToken(id, signalName);
-      return Response.ok().build();
+      return Response.ok().type("application/json").build();
    }
 
    /*@GET

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java	2008-11-13 11:47:13 UTC (rev 2904)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java	2008-11-13 12:27:38 UTC (rev 2905)
@@ -125,7 +125,7 @@
    {
       log.debug("Change instance (ID "+instanceId+") to state " +next);
       getProcessDAO().changeState(instanceId, next);
-      return Response.ok().build();
+      return Response.ok().type("application/json").build();
    }
 
    private Response createJsonResponse(Object wrapper)

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java	2008-11-13 11:47:13 UTC (rev 2904)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java	2008-11-13 12:27:38 UTC (rev 2905)
@@ -134,6 +134,6 @@
    public String getTokenSignalUrl(TokenReference tok, String signal)
    {
       String encodedSignal = URL.encode(signal);
-      return getBaseUrl() + "/rs/tokens/"+tok.getId()+"/signal/"+encodedSignal;      
+      return getBaseUrl() + "/rs/jbpm3/tokens/"+tok.getId()+"?signal="+encodedSignal;      
    }
 }

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java	2008-11-13 11:47:13 UTC (rev 2904)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java	2008-11-13 12:27:38 UTC (rev 2905)
@@ -29,6 +29,7 @@
 
 import java.util.Date;
 import java.util.Iterator;
+import java.util.Set;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -54,7 +55,9 @@
       JSONObject rootObject = root.isObject();
       
       JSONWrapper match = null;
-      Iterator it = rootObject.keySet().iterator();
+      Set<String> keySet = rootObject.keySet();
+
+      Iterator it = keySet.iterator();
       while(it.hasNext())
       {
          String s = (String)it.next();
@@ -70,9 +73,6 @@
          }
       }
 
-      if(null==match)
-         throw new IllegalArgumentException("No such element '" + name +"'");         
-
       return match;
    }