[jbpm-commits] JBoss JBPM SVN: r3212 - in projects/spec/trunk/modules: ri/src/main/java/org/jboss/bpm/ri/service and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-12-05 04:05:33 -0500 (Fri, 05 Dec 2008)
New Revision: 3212

Modified:
   projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java
   projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java
Log:
Revert back to ObjectName getProcessDefinition()

Modified: projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java	2008-12-05 08:58:17 UTC (rev 3211)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jboss/bpm/test/cts/service/process/ProcessDefinitionServiceTest.java	2008-12-05 09:05:33 UTC (rev 3212)
@@ -81,10 +81,10 @@
     ProcessEngine engine = procDef.getProcessEngine();
     ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class);
     
-    procDef = procDefService.registerProcessDefinition(procDef);
-    assertNotNull("Registered ProcessDefinition not null", procDef);
+    ObjectName procDefID = procDefService.registerProcessDefinition(procDef);
+    assertNotNull("Registered ProcessDefinition not null", procDefID);
     
-    boolean success = procDefService.unregisterProcessDefinition(procDef.getKey());
+    boolean success = procDefService.unregisterProcessDefinition(procDefID);
     assertTrue("ProcessDefinition unregistered", success);
   }
 }

Modified: projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java	2008-12-05 08:58:17 UTC (rev 3211)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/service/ProcessDefinitionServiceImpl.java	2008-12-05 09:05:33 UTC (rev 3212)
@@ -73,7 +73,7 @@
   }
 
   @Override
-  public ProcessDefinition registerProcessDefinition(ProcessDefinition procDef)
+  public ObjectName registerProcessDefinition(ProcessDefinition procDef)
   {
     if (getProcessDefinition(procDef.getKey()) != null)
       throw new IllegalStateException("Process definition already registered: " + procDef);
@@ -88,7 +88,7 @@
     ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef;
     procDefImpl.register(procDef);
 
-    return procDef;
+    return procDef.getKey();
   }
 
   @Override