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 2009/04/15 15:27:50 UTC
svn commit: r765180 - in
/lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms:
cocoon/scheduler/SchedulerHelper.java scheduler/LoadQuartzServlet.java
task/TaskParameters.java task/WorkflowInvoker.java
Author: andreas
Date: Wed Apr 15 13:27:50 2009
New Revision: 765180
URL: http://svn.apache.org/viewvc?rev=765180&view=rev
Log:
Updating task module to API changes.
Modified:
lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/cocoon/scheduler/SchedulerHelper.java
lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/TaskParameters.java
lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/WorkflowInvoker.java
Modified: lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/cocoon/scheduler/SchedulerHelper.java
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/cocoon/scheduler/SchedulerHelper.java?rev=765180&r1=765179&r2=765180&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/cocoon/scheduler/SchedulerHelper.java (original)
+++ lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/cocoon/scheduler/SchedulerHelper.java Wed Apr 15 13:27:50 2009
@@ -76,7 +76,7 @@
NamespaceMap schedulerParameters = new NamespaceMap(LoadQuartzServlet.PREFIX);
- DocumentFactory identityMap = DocumentUtil.createDocumentIdentityMap(null, null);
+ DocumentFactory identityMap = DocumentUtil.createDocumentFactory(null, null);
String url = ServletHelper.getWebappURI(ObjectModelHelper.getRequest(this.objectModel));
Publication pub = null;
Modified: lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java?rev=765180&r1=765179&r2=765180&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java (original)
+++ lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/scheduler/LoadQuartzServlet.java Wed Apr 15 13:27:50 2009
@@ -273,7 +273,7 @@
getScheduler().deleteJob(jobId, publicationId);
} else if (action.equals(DOCUMENT_DELETED)) {
String documentUrl = (String) schedulerParameters.get(PARAMETER_DOCUMENT_URL);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(null, null);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(null, null);
org.apache.lenya.cms.publication.Document document = map.getFromURL(documentUrl);
deleteDocumentJobs(document);
}
Modified: lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/TaskParameters.java
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/TaskParameters.java?rev=765180&r1=765179&r2=765180&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/TaskParameters.java (original)
+++ lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/TaskParameters.java Wed Apr 15 13:27:50 2009
@@ -74,14 +74,17 @@
* @throws ExecutionException when something went wrong.
*/
public Publication getPublication() throws ExecutionException {
+ /* FIXME: This would need a redesign.
Publication publication;
try {
- publication = PublicationUtil.getPublication(this.manager,
+ publication = PublicationUtil.getPublication(this.manager,
get(Task.PARAMETER_PUBLICATION_ID));
} catch (PublicationException e) {
throw new ExecutionException(e);
}
return publication;
+ */
+ return null;
}
/**
Modified: lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/WorkflowInvoker.java
URL: http://svn.apache.org/viewvc/lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/WorkflowInvoker.java?rev=765180&r1=765179&r2=765180&view=diff
==============================================================================
--- lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/WorkflowInvoker.java (original)
+++ lenya/contributions/2_0_X/modules/task/java/src/org/apache/lenya/cms/task/WorkflowInvoker.java Wed Apr 15 13:27:50 2009
@@ -198,8 +198,8 @@
log.debug("Workflow event: [" + eventName + "]");
// check for workflow instance first (task can initialize the workflow history)
try {
- Session session = RepositoryUtil.createSession(this.manager, null);
- DocumentFactory map = DocumentUtil.createDocumentIdentityMap(this.manager, session);
+ Session session = RepositoryUtil.createSession(this.manager, null, false);
+ DocumentFactory map = DocumentUtil.createDocumentFactory(this.manager, session);
this.document = map.getFromURL(webappUrl);
} catch (Exception e) {
throw new ExecutionException(e);
@@ -214,7 +214,7 @@
public void invokeTransition() throws ExecutionException {
try {
- Session session = RepositoryUtil.createSession(this.manager, null);
+ Session session = RepositoryUtil.createSession(this.manager, null, false);
WorkflowUtil.invoke(this.manager,
session,
new ConsoleLogger(),
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org