Merge branch 'modules'2.3

7 files changed, 13 insertions, 10 deletions

diff --git a/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java b/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java
index 4b0ae4c..d5f62a0 100644
--- a/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java
+++ b/source/com/c2kernel/lifecycle/chooser/ActivityChooser.java
@@ -56,7 +56,7 @@ public class ActivityChooser extends JFrame
     {

         super(title);

         mMessage = message;

-        img = Resource.getImageResource("graph/newvertex_large.png").getImage();

+        img = Resource.findImage("graph/newvertex_large.png").getImage();

         setIconImage(img);

         mParent = parent;

         mhashmap = hashmap;

diff --git a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
index da59efd..132fdcf 100644
--- a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
+++ b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java
@@ -38,7 +38,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 					new ActivityChooser(

 						Language.translate("Please enter a Type for the new activityDef"),

 						Language.translate("New " + vertexTypeId + " Activity"),

-						Resource.getImageResource("graph/newvertex_large.png").getImage(),

+						Resource.findImage("graph/newvertex_large.png").getImage(),

 						this,

 						mhm);

 				a.setVisible(true);

@@ -68,7 +68,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 						Language.translate("Please type a Name"),

 						Language.translate("New " + vertexTypeId + " Activity"),

 						JOptionPane.QUESTION_MESSAGE,

-						Resource.getImageResource("graph/newvertex_large.png"),

+						Resource.findImage("graph/newvertex_large.png"),

 						null,

 						null);

 			act = (ActivityDef) mCompositeActivityDef.search(mCompositeActivityDef.getID() + "/" + newName);

diff --git a/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java b/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java
index 58964aa..4c69f15 100644
--- a/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java
+++ b/source/com/c2kernel/lifecycle/gui/view/CompActDefOutcomeHandler.java
@@ -45,8 +45,8 @@ public class CompActDefOutcomeHandler
     extends JPanel

     implements OutcomeHandler {

 

-    protected JButton mLoadButton = new JButton(Resource.getImageResource("graph/load.png"));

-    protected JButton mLayoutButton = new JButton(Resource.getImageResource("graph/autolayout.png"));

+    protected JButton mLoadButton = new JButton(Resource.findImage("graph/load.png"));

+    protected JButton mLayoutButton = new JButton(Resource.findImage("graph/autolayout.png"));

     protected JButton[] mOtherToolBarButtons = { mLayoutButton, mLoadButton };

 

     protected CompositeActivityDef mCompActDef = null;

diff --git a/source/com/c2kernel/lifecycle/instance/Activity.java b/source/com/c2kernel/lifecycle/instance/Activity.java
index 226f0af..8a07d15 100644
--- a/source/com/c2kernel/lifecycle/instance/Activity.java
+++ b/source/com/c2kernel/lifecycle/instance/Activity.java
@@ -600,7 +600,7 @@ public class Activity extends WfVertex
 		event = auditEvent(transitionID, agent);

 		if (event != null)

 			eventID = event.getID();

-		if (Boolean.TRUE.equals(getProperties().get("AlwaysUseOutcome")) || transitionID == Transitions.DONE || transitionID == Transitions.COMPLETE)

+		if (transitionID == Transitions.DONE || transitionID == Transitions.COMPLETE)

 			storeOutcome(eventID, requestData);

 		EntityPath entityPath = getItemEntityPath();

 		TransactionManager storage = Gateway.getStorage();

diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
index 0b6c9e4..39e7ee9 100644
--- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
+++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java
@@ -36,7 +36,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 					new ActivityChooser(

 						Language.translate("Please enter a Type for the new activity"),

 						Language.translate("New " + vertexTypeId + " Activity"),

-						Resource.getImageResource("graph/newvertex_large.png").getImage(),

+						Resource.findImage("graph/newvertex_large.png").getImage(),

 						this,

 						mhm);

 				a.setVisible(true);

@@ -69,7 +69,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 					Language.translate("Activity name not unique. Please give another."),

 					Language.translate("New " + vertexTypeId + " Activity"),

 					JOptionPane.QUESTION_MESSAGE,

-					Resource.getImageResource("graph/newvertex_large.png"),

+					Resource.findImage("graph/newvertex_large.png"),

 					null,

 					null);

 			if (newName.equals(""))

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
index 96371dd..aa30677 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/CreateNewAgent.java
@@ -33,15 +33,17 @@ public class CreateNewAgent extends PredefinedStep
                InvalidDataException

     {

         checkAccessRights(agent);

-

+        String redactedRequestData;

         try {

             NewAgent newAgent = (NewAgent)CastorXMLUtility.unmarshall(requestData);

             newAgent.create(agent.getSysKey());

+            newAgent.password = "REDACTED";

+            redactedRequestData = CastorXMLUtility.marshall(newAgent);

         } catch (Exception ex) {

             Logger.error(ex);

             throw new InvalidDataException("Error creating agent", "");

         }

 

-        sendEventStoreOutcome(transitionID, requestData, agent);

+        sendEventStoreOutcome(transitionID, redactedRequestData, agent);

     }

 }

diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
index 5666a00..f155ced 100644
--- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
+++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/NewItem.java
@@ -24,6 +24,7 @@ import com.c2kernel.utils.Logger;
  *

  * @version $Revision: 1.8 $ $Date: 2006/03/03 13:52:21 $

  */

+

 public class NewItem  {

 

     public String name;