You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2003/10/26 18:29:55 UTC
cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/task DefaultTaskWrapper.java WorkflowInvoker.java
andreas 2003/10/26 09:29:55
Modified: src/java/org/apache/lenya/cms/task DefaultTaskWrapper.java
WorkflowInvoker.java
Log:
improved logging
Revision Changes Path
1.9 +22 -5 cocoon-lenya/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java
Index: DefaultTaskWrapper.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/DefaultTaskWrapper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DefaultTaskWrapper.java 22 Oct 2003 16:32:55 -0000 1.8
+++ DefaultTaskWrapper.java 26 Oct 2003 17:29:55 -0000 1.9
@@ -237,9 +237,9 @@
throw new ExecutionException("No task id provided!");
}
- log.debug("-----------------------------------");
- log.debug(" Executing task [" + taskId + "]");
- log.debug("-----------------------------------");
+ log.info("===================================");
+ log.info(" Executing task [" + taskId + "]");
+ log.info("-----------------------------------");
if (!wrapperParameters.isComplete()) {
@@ -275,15 +275,29 @@
throw new ExecutionException(e);
}
+ log.debug("-----------------------------------");
+ log.debug(" Triggering workflow");
+ log.debug("-----------------------------------");
+
//FIXME The new workflow is set before the end of the transition because the document id
// and so the document are sometimes changing during the transition (ex archiving , ...)
workflowInvoker.invokeTransition();
+ log.debug("-----------------------------------");
+ log.debug(" Triggering task");
+ log.debug("-----------------------------------");
+
task.execute(publication.getServletContext().getAbsolutePath());
+ log.debug("-----------------------------------");
+ log.debug(" Triggering notification");
+ log.debug("-----------------------------------");
Notifier notifier = new Notifier(manager, getParameters());
notifier.sendNotification(getTaskParameters());
+ log.debug("-----------------------------------");
+ log.debug(" Executing task finished.");
+ log.debug("===================================\n\n");
}
/**
@@ -317,8 +331,11 @@
NamespaceHelper taskHelper =
new NamespaceHelper(Task.NAMESPACE, Task.DEFAULT_PREFIX, document);
Element element = taskHelper.createElement(ELEMENT_TASK);
+
+ List keys = new ArrayList(getParameters().keySet());
+ Collections.sort(keys);
- for (Iterator i = getParameters().keySet().iterator(); i.hasNext();) {
+ for (Iterator i = keys.iterator(); i.hasNext();) {
String key = (String) i.next();
Element parameterElement = taskHelper.createElement(ELEMENT_PARAMETER);
parameterElement.setAttribute(ATTRIBUTE_NAME, key);
1.7 +8 -4 cocoon-lenya/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java
Index: WorkflowInvoker.java
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/task/WorkflowInvoker.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WorkflowInvoker.java 21 Oct 2003 09:51:55 -0000 1.6
+++ WorkflowInvoker.java 26 Oct 2003 17:29:55 -0000 1.7
@@ -72,10 +72,11 @@
public static final String USER_ID = "user-id";
public static final String MACHINE = "machine";
public static final String EVENT = "event";
- public static final String EVENT_REQUEST_PARAMETER = "lenya.event";
public static final String PREFIX = "workflow";
+ public static final String EVENT_REQUEST_PARAMETER = "workflow.event";
+
/**
* Ctor.
*
@@ -232,8 +233,6 @@
public void invokeTransition() throws ExecutionException {
if (doTransition) {
- log.debug("Invoking transition.");
-
try {
WorkflowFactory factory = WorkflowFactory.newInstance();
SynchronizedWorkflowInstances instance =
@@ -244,6 +243,8 @@
Event event = null;
Event[] events = instance.getExecutableEvents(situation);
+ log.debug("Resolved executable events.");
+
for (int i = 0; i < events.length; i++) {
if (events[i].getName().equals(getEventName())) {
event = events[i];
@@ -251,7 +252,10 @@
}
assert event != null;
+
+ log.debug("Invoking transition.");
instance.invoke(situation, event);
+ log.debug("Invoking transition completed.");
} catch (Exception e) {
throw new ExecutionException(e);
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org