[jbpm-commits] JBoss JBPM SVN: r3102 - in jbpm3/trunk/modules/integration: api/src/main/java/org/jbpm/integration/model and 1 other directories.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-11-26 09:07:55 -0500 (Wed, 26 Nov 2008)
New Revision: 3102

Modified:
   jbpm3/trunk/modules/integration/api/deploy.sh
   jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java
   jbpm3/trunk/modules/integration/jboss42/deploy.sh
Log:
More spec integration

Modified: jbpm3/trunk/modules/integration/api/deploy.sh
===================================================================
--- jbpm3/trunk/modules/integration/api/deploy.sh	2008-11-26 14:07:30 UTC (rev 3101)
+++ jbpm3/trunk/modules/integration/api/deploy.sh	2008-11-26 14:07:55 UTC (rev 3102)
@@ -1,3 +1,4 @@
 #! /bin/bash
 
+rm $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans/jbpm-integration-api*.jar
 cp target/jbpm-integration-api-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-integration.beans

Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java
===================================================================
--- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java	2008-11-26 14:07:30 UTC (rev 3101)
+++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java	2008-11-26 14:07:55 UTC (rev 3102)
@@ -29,13 +29,12 @@
 import javax.management.ObjectName;
 
 import org.jbpm.api.Constants;
-import org.jbpm.api.NotImplementedException;
 import org.jbpm.api.client.ProcessEngine;
 import org.jbpm.api.client.Token;
 import org.jbpm.api.client.Token.TokenStatus;
 import org.jbpm.api.model.Node;
-import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.Process;
+import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.builder.ObjectNameFactory;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.api.runtime.Attachments.Key;
@@ -110,12 +109,12 @@
 
   public Date getEndDate()
   {
-    return oldProc.getEnd();
+    return oldProc != null ? oldProc.getEnd() : null;
   }
 
   public Date getStartDate()
   {
-    return oldProc.getStart();
+    return oldProc != null ? oldProc.getStart() : null;
   }
 
   //@Override
@@ -176,10 +175,7 @@
 
   public Token getRootToken()
   {
-    if (oldProc != null)
-      return new TokenImpl(this, oldProc.getRootToken());
-    else
-      return null;
+    return oldProc != null ? new TokenImpl(this, oldProc.getRootToken()) : null;
   }
 
   public Set<Token> getTokens()

Modified: jbpm3/trunk/modules/integration/jboss42/deploy.sh
===================================================================
--- jbpm3/trunk/modules/integration/jboss42/deploy.sh	2008-11-26 14:07:30 UTC (rev 3101)
+++ jbpm3/trunk/modules/integration/jboss42/deploy.sh	2008-11-26 14:07:55 UTC (rev 3102)
@@ -1,4 +1,5 @@
 #! /bin/bash
 
+rm $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar/jbpm-integration-jboss42*.jar
 cp target/jbpm-integration-jboss42-3.3.1-SNAPSHOT.jar $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar
 cp src/main/etc/par-deployer.xml $JBOSS422/server/default/deploy/jbpm/jbpm-service.sar