diff options
2 files changed, 6 insertions, 14 deletions
diff --git a/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java index 335fe2d..3f0ca46 100644 --- a/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java +++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/agent/CreateAgentFromDescription.java @@ -94,15 +94,12 @@ public class CreateAgentFromDescription extends CreateItemFromDescription throw new ObjectAlreadyExistsException("The agent name " +newName+ " exists already.");
} catch (ObjectNotFoundException ex) { }
- // generate new entity key
- Logger.msg(6, "CreateItemFromDescription - Requesting new agent path");
+ // generate new system key
+ Logger.msg(6, "CreateAgentFromDescription - Requesting new agent path");
AgentPath newAgentPath = new AgentPath(new ItemPath(), newName);
- // resolve the item factory
- Logger.msg(6, "CreateItemFromDescription - Resolving item factory");
-
// create the Item object
- Logger.msg(3, "CreateItemFromDescription - Creating Item");
+ Logger.msg(3, "CreateAgentFromDescription - Creating Agent");
CorbaServer factory = Gateway.getCorbaServer();
if (factory == null) throw new CannotManageException("This process cannot create new Items");
ActiveEntity newAgent = factory.createAgent(newAgentPath);
@@ -110,7 +107,7 @@ public class CreateAgentFromDescription extends CreateItemFromDescription // initialise it with its properties and workflow
- Logger.msg(3, "CreateItemFromDescription - Initializing Item");
+ Logger.msg(3, "CreateAgentFromDescription - Initializing Agent");
try {
newAgent.initialise(
diff --git a/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java index 53e545e..2b44bd8 100644 --- a/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java +++ b/src/main/java/org/cristalise/kernel/lifecycle/instance/predefined/item/CreateItemFromDescription.java @@ -84,13 +84,10 @@ public class CreateItemFromDescription extends PredefinedStep /* ITEM CREATION */
- // generate new entity key
+ // generate new item path with random uuid
Logger.msg(6, "CreateItemFromDescription - Requesting new item path");
ItemPath newItemPath = new ItemPath();
- // resolve the item factory
- Logger.msg(6, "CreateItemFromDescription - Resolving item factory");
-
// create the Item object
Logger.msg(3, "CreateItemFromDescription - Creating Item");
CorbaServer factory = Gateway.getCorbaServer();
@@ -113,7 +110,7 @@ public class CreateItemFromDescription extends PredefinedStep } catch (PersistencyException e) {
throw e;
} catch (Exception e) {
- throw new InvalidDataException("CreateAgentFromDescription: Problem initializing new Agent. See log: "+e.getMessage());
+ throw new InvalidDataException("CreateItemFromDescription: Problem initializing new Item. See log: "+e.getMessage());
}
// add its domain path
Logger.msg(3, "CreateItemFromDescription - Creating "+context);
@@ -172,8 +169,6 @@ public class CreateItemFromDescription extends PredefinedStep try {
CompositeActivityDef wfDef = (CompositeActivityDef)LocalObjectLoader.getActDef(wfDefName, wfDefVer);
return (CompositeActivity)wfDef.instantiate();
- } catch (ObjectNotFoundException ex) {
- throw new InvalidDataException("Workflow def '"+wfDefName+"'v"+wfDefVer+" not found");
} catch (ClassCastException ex) {
throw new InvalidDataException("Activity def '"+wfDefName+"' was not Composite");
}
|