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 2006/06/23 11:46:03 UTC
svn commit: r416653 - in /lenya/trunk/src:
impl/java/org/apache/lenya/workflow/impl/
java/org/apache/lenya/cms/cocoon/acting/
java/org/apache/lenya/cms/cocoon/components/modules/input/
java/org/apache/lenya/cms/cocoon/transformation/ java/org/apache/le...
Author: andreas
Date: Fri Jun 23 02:45:56 2006
New Revision: 416653
URL: http://svn.apache.org/viewvc?rev=416653&view=rev
Log:
Moved workflow implementation code to workflow-impl module
Added:
lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
lenya/trunk/src/java/org/apache/lenya/cms/workflow/LenyaVersion.java
lenya/trunk/src/modules-core/workflow-impl/
lenya/trunk/src/modules-core/workflow-impl/config/
lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/
lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/workflow-input-module.xconf
lenya/trunk/src/modules-core/workflow-impl/config/sitemap/
lenya/trunk/src/modules-core/workflow-impl/config/sitemap/actions.xmap
lenya/trunk/src/modules-core/workflow-impl/config/sitemap/transformers.xmap
lenya/trunk/src/modules-core/workflow-impl/java/
lenya/trunk/src/modules-core/workflow-impl/java/src/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java (props changed)
- copied unchanged from r416590, lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/components/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/components/modules/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/components/modules/input/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java (props changed)
- copied unchanged from r416648, lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java (props changed)
- copied unchanged from r416648, lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/workflow/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/workflow/usecases/
- copied from r416590, lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/workflow/usecases/History.java
- copied unchanged from r416652, lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/History.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
- copied unchanged from r416652, lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/InvokeWorkflow.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/
- copied from r416590, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/AbstractCondition.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/AbstractCondition.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/ActionImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/ActionImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/BooleanVariableAssignmentImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/BooleanVariableAssignmentImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/BooleanVariableCondition.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/BooleanVariableCondition.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/BooleanVariableImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/BooleanVariableImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/ConditionFactory.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/ConditionFactory.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/TransitionImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/TransitionImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/VersionImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/VersionImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/WorkflowBuilder.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/WorkflowBuilder.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/WorkflowEngineImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/WorkflowEngineImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/WorkflowImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/WorkflowImpl.java
lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java
- copied unchanged from r416652, lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/WorkflowManagerImpl.java
lenya/trunk/src/modules-core/workflow-impl/module.xml
Removed:
lenya/trunk/src/impl/java/org/apache/lenya/workflow/impl/
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
lenya/trunk/src/java/org/apache/lenya/cms/workflow/usecases/
lenya/trunk/src/webapp/lenya/config/cocoon-xconf/input-modules/workflow.xconf
Modified:
lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap
lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap
Added: lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java?rev=416653&view=auto
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java (added)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/DocumentWorkflowable.java Fri Jun 23 02:45:56 2006
@@ -0,0 +1,250 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.apache.lenya.cms.workflow;
+
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Locale;
+
+import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.logger.AbstractLogEnabled;
+import org.apache.avalon.framework.logger.Logger;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.lenya.ac.Identity;
+import org.apache.lenya.cms.metadata.LenyaMetaData;
+import org.apache.lenya.cms.metadata.MetaData;
+import org.apache.lenya.cms.publication.Document;
+import org.apache.lenya.cms.publication.DocumentException;
+import org.apache.lenya.cms.publication.ResourceType;
+import org.apache.lenya.cms.repository.Session;
+import org.apache.lenya.workflow.Version;
+import org.apache.lenya.workflow.Workflow;
+import org.apache.lenya.workflow.Workflowable;
+
+/**
+ * Workflowable around a CMS document.
+ *
+ * @version $Id: DocumentWorkflowable.java 416648 2006-06-23 09:15:28Z andreas $
+ */
+class DocumentWorkflowable extends AbstractLogEnabled implements Workflowable {
+
+ /**
+ * Ctor.
+ * @param manager The service manager.
+ * @param session The repository session.
+ * @param document The document.
+ * @param logger The logger.
+ */
+ public DocumentWorkflowable(ServiceManager manager, Session session, Document document,
+ Logger logger) {
+ this.document = document;
+ this.session = session;
+ this.manager = manager;
+ ContainerUtil.enableLogging(this, logger);
+ }
+
+ private Session session;
+
+ private ServiceManager manager;
+
+ /**
+ * @return The service manager.
+ */
+ public ServiceManager getServiceManager() {
+ return this.manager;
+ }
+
+ /**
+ * @return The repository session.
+ */
+ public Session getSession() {
+ return session;
+ }
+
+ private Document document;
+
+ protected Document getDocument() {
+ return this.document;
+ }
+
+ /**
+ * @return The name of the workflow schema.
+ */
+ protected String getWorkflowSchema() {
+ String workflowName = null;
+ try {
+ ResourceType doctype = document.getResourceType();
+ if (doctype != null) {
+ workflowName = document.getPublication().getWorkflowSchema(doctype);
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return workflowName;
+ }
+
+ private Version[] versions = null;
+
+ private long lastModified = 0;
+
+ /**
+ * @see org.apache.lenya.workflow.Workflowable#getVersions()
+ */
+ public Version[] getVersions() {
+ try {
+ MetaData meta = this.document.getMetaDataManager().getLenyaMetaData();
+ if (this.versions == null || meta.getLastModified() > this.lastModified) {
+ String[] versionStrings = meta.getValues(LenyaMetaData.ELEMENT_WORKFLOW_VERSION);
+ this.versions = new Version[versionStrings.length];
+ for (int i = 0; i < versionStrings.length; i++) {
+ String string = versionStrings[i];
+ int spaceIndex = string.indexOf(" ");
+ String numberString = string.substring(0, spaceIndex);
+ int number = Integer.parseInt(numberString);
+ String versionString = string.substring(spaceIndex + 1);
+ Version version = decodeVersion(versionString);
+ this.versions[number] = version;
+ }
+ this.lastModified = meta.getLastModified();
+ }
+ } catch (DocumentException e) {
+ throw new RuntimeException();
+ }
+ return this.versions;
+ }
+
+ /**
+ * @see org.apache.lenya.workflow.Workflowable#getLatestVersion()
+ */
+ public Version getLatestVersion() {
+ Version version = null;
+ Version[] versions = getVersions();
+ if (versions.length > 0) {
+ version = versions[versions.length - 1];
+ }
+ return version;
+ }
+
+ /**
+ * @see org.apache.lenya.workflow.Workflowable#newVersion(org.apache.lenya.workflow.Workflow,
+ * org.apache.lenya.workflow.Version)
+ */
+ public void newVersion(Workflow workflow, Version version) {
+ Version[] newVersions = new Version[getVersions().length + 1];
+ for (int i = 0; i < getVersions().length; i++) {
+ newVersions[i] = getVersions()[i];
+ }
+
+ int number = newVersions.length - 1;
+ newVersions[number] = version;
+
+ String string = number + " " + encodeVersion(workflow, version);
+ try {
+ MetaData meta = this.document.getMetaDataManager().getLenyaMetaData();
+ meta.addValue(LenyaMetaData.ELEMENT_WORKFLOW_VERSION, string);
+ } catch (DocumentException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected String encodeVersion(Workflow workflow, Version version) {
+
+ String string = "event:" + version.getEvent();
+ string += " state:" + version.getState();
+
+ Identity identity = getSession().getIdentity();
+ string += " user:" + identity.getUser().getId();
+ string += " machine:" + identity.getMachine().getIp();
+
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss");
+ string += " date:" + format.format(new Date());
+
+ String names[] = workflow.getVariableNames();
+ for (int i = 0; i < names.length; i++) {
+ String value = Boolean.toString(version.getValue(names[i]));
+ string += " var:" + names[i] + "=" + value;
+ }
+ return string;
+ }
+
+ protected Version decodeVersion(String string) {
+
+ String event = null;
+ String state = null;
+ String user = null;
+ String machine = null;
+ Date date = null;
+ Map variables = new HashMap();
+
+ String[] parts = string.split(" ");
+ for (int i = 0; i < parts.length; i++) {
+ String[] steps = parts[i].split(":", 2);
+ if (steps[0].equals("event")) {
+ event = steps[1];
+ } else if (steps[0].equals("state")) {
+ state = steps[1];
+ } else if (steps[0].equals("user")) {
+ user = steps[1];
+ } else if (steps[0].equals("date")) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss", Locale.US);
+ date = sdf.parse(steps[1], new ParsePosition(0));
+ } else if (steps[0].equals("machine")) {
+ machine = steps[1];
+ } else if (steps[0].equals("var")) {
+ String[] nameValue = steps[1].split("=");
+ variables.put(nameValue[0], nameValue[1]);
+ }
+ }
+
+
+
+ Version version = new LenyaVersion(event, state);
+ for (Iterator i = variables.keySet().iterator(); i.hasNext();) {
+ String name = (String) i.next();
+ String value = (String) variables.get(name);
+ version.setUserId(user);
+ version.setDate(date);
+ version.setIPAddress(machine);
+ version.setValue(name, Boolean.valueOf(value).booleanValue());
+ }
+ return version;
+ }
+
+ /**
+ * @see org.apache.lenya.workflow.Workflowable#getWorkflowSchemaURI()
+ */
+ public String getWorkflowSchemaURI() {
+ String uri = null;
+ String schema = getWorkflowSchema();
+ if (schema != null) {
+
+ if (schema.indexOf("://") != -1) {
+ return schema;
+ } else {
+ uri = this.document.getPublication().getSourceURI() + "/config/workflow/" + schema;
+ uri = uri.substring("lenya://".length());
+ uri = "context://" + uri;
+ }
+ }
+ return uri;
+ }
+
+}
Added: lenya/trunk/src/java/org/apache/lenya/cms/workflow/LenyaVersion.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/workflow/LenyaVersion.java?rev=416653&view=auto
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/workflow/LenyaVersion.java (added)
+++ lenya/trunk/src/java/org/apache/lenya/cms/workflow/LenyaVersion.java Fri Jun 23 02:45:56 2006
@@ -0,0 +1,131 @@
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+/* $Id: VersionImpl.java 372568 2006-01-26 16:51:38Z andreas $ */
+
+package org.apache.lenya.cms.workflow;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lenya.workflow.Version;
+
+/**
+ * A version of the workflow history.
+ */
+public class LenyaVersion implements Version {
+
+ private String event;
+ private String state;
+ private Map variableValues = new HashMap();
+
+ /**
+ * @see org.apache.lenya.workflow.Version#getEvent()
+ */
+ public String getEvent() {
+ return this.event;
+ }
+
+ /**
+ * @see org.apache.lenya.workflow.Version#getState()
+ */
+ public String getState() {
+ return this.state;
+ }
+
+ private Date date;
+ private String userId;
+ private String ipAddress;
+
+ /**
+ * Returns the date.
+ * @return A string.
+ */
+ public Date getDate() {
+ return this.date;
+ }
+
+ /**
+ * Sets the date.
+ * @param _date A date.
+ */
+ public void setDate(Date _date) {
+ this.date = _date;
+ }
+
+ /**
+ * Returns the user ID.
+ * @return A string.
+ */
+ public String getUserId() {
+ return this.userId;
+ }
+
+ /**
+ * Sets the user ID.
+ * @param _userId A user ID.
+ */
+ public void setUserId(String _userId) {
+ this.userId = _userId;
+ }
+
+ /**
+ * Returns the ip address.
+ * @return A string.
+ */
+ public String getIPAddress() {
+ return this.ipAddress;
+ }
+
+ /**
+ * Sets the ip address.
+ * @param _ipaddress A ip address.
+ */
+ public void setIPAddress(String _ipaddress){
+ this.ipAddress = _ipaddress;
+ }
+
+ /**
+ * Ctor.
+ * @param _event The event that caused the version change.
+ * @param _state The destination state.
+ */
+ public LenyaVersion(String _event, String _state) {
+ this.event = _event;
+ this.state = _state;
+ }
+
+ /**
+ * @see org.apache.lenya.workflow.Version#getValue(java.lang.String)
+ */
+ public boolean getValue(String variableName) {
+ Boolean value = (Boolean) this.variableValues.get(variableName);
+ if (value == null) {
+ throw new RuntimeException("No value set for variable [" + variableName + "]");
+ }
+ return value.booleanValue();
+ }
+
+ /**
+ * @see org.apache.lenya.workflow.Version#setValue(java.lang.String, boolean)
+ */
+ public void setValue(String variableName, boolean value) {
+ this.variableValues.put(variableName, Boolean.valueOf(value));
+ }
+
+}
Added: lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/workflow-input-module.xconf
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/workflow-input-module.xconf?rev=416653&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/workflow-input-module.xconf (added)
+++ lenya/trunk/src/modules-core/workflow-impl/config/cocoon-xconf/workflow-input-module.xconf Fri Jun 23 02:45:56 2006
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Id: usecases-workflow-deactivate.xconf 348547 2005-11-23 20:13:01Z chestnut $ -->
+<!--
+ This file defines the publication specific use-cases
+-->
+
+ <xconf xpath="/cocoon/input-modules" unless="/cocoon/input-modules/component-instance[@name = 'workflow']">
+ <component-instance logger="core.modules.input.workflow" name="workflow"
+ class="org.apache.lenya.cms.cocoon.components.modules.input.WorkflowModule"/>
+ </xconf>
Added: lenya/trunk/src/modules-core/workflow-impl/config/sitemap/actions.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/config/sitemap/actions.xmap?rev=416653&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/config/sitemap/actions.xmap (added)
+++ lenya/trunk/src/modules-core/workflow-impl/config/sitemap/actions.xmap Fri Jun 23 02:45:56 2006
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id: actions.xmap 280060 2005-09-11 01:56:31Z chestnut $ -->
+
+<xmap xpath="/sitemap/components/actions" unless="/sitemap/components/actions/action[@name = 'workflow']">
+ <map:action name="workflow" logger="sitemap.action.workflow" src="org.apache.lenya.cms.cocoon.acting.WorkflowInvokerAction"/>
+</xmap>
\ No newline at end of file
Added: lenya/trunk/src/modules-core/workflow-impl/config/sitemap/transformers.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/config/sitemap/transformers.xmap?rev=416653&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/config/sitemap/transformers.xmap (added)
+++ lenya/trunk/src/modules-core/workflow-impl/config/sitemap/transformers.xmap Fri Jun 23 02:45:56 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<xmap xpath="/sitemap/components/transformers"
+ unless="/sitemap/components/transformers/transformer[@name = 'workflowmenu']"
+ xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+ <map:transformer name="workflowmenu" logger="lenya.sitemap.transformer.workflowmenu" src="org.apache.lenya.cms.cocoon.transformation.WorkflowMenuTransformer"/>
+</xmap>
\ No newline at end of file
Propchange: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/acting/WorkflowInvokerAction.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/components/modules/input/WorkflowModule.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: lenya/trunk/src/modules-core/workflow-impl/java/src/org/apache/lenya/cms/cocoon/transformation/WorkflowMenuTransformer.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: lenya/trunk/src/modules-core/workflow-impl/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow-impl/module.xml?rev=416653&view=auto
==============================================================================
--- lenya/trunk/src/modules-core/workflow-impl/module.xml (added)
+++ lenya/trunk/src/modules-core/workflow-impl/module.xml Fri Jun 23 02:45:56 2006
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2005 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Id: publication.xml 374687 2006-02-03 15:24:55Z michi $ -->
+
+<module xmlns="http://apache.org/lenya/module/1.0">
+ <id>org.apache.lenya.modules.workflow-impl</id>
+ <package>org.apache.lenya.modules</package>
+ <version>0.1-dev</version>
+ <name>Workflow implementation</name>
+ <lenya-version>@lenya.version@</lenya-version>
+ <description>Workflow implementation</description>
+</module>
Modified: lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap?rev=416653&r1=416652&r2=416653&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/actions.xmap Fri Jun 23 02:45:56 2006
@@ -26,6 +26,5 @@
<map:action name="set-header" logger="sitemap.action.set-header" src="org.apache.cocoon.acting.HttpHeaderAction"/>
<map:action name="resource-exists" logger="sitemap.action.resource-exists" src="org.apache.cocoon.acting.ResourceExistsAction"/>
<map:action name="resource-exists-enhanced" logger="sitemap.action.resource-exists-enhanced" src="org.apache.lenya.cms.cocoon.acting.ResourceExistsAction"/>
- <map:action name="workflow" logger="sitemap.action.workflow" src="org.apache.lenya.cms.cocoon.acting.WorkflowInvokerAction"/>
<map:action name="session-propagator" logger="sitemap.action.session-propagator" src="org.apache.cocoon.acting.SessionPropagatorAction"/>
</xmap>
Modified: lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap
URL: http://svn.apache.org/viewvc/lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap?rev=416653&r1=416652&r2=416653&view=diff
==============================================================================
--- lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap (original)
+++ lenya/trunk/src/webapp/lenya/config/sitemap/transformers.xmap Fri Jun 23 02:45:56 2006
@@ -21,7 +21,6 @@
<map:transformer name="link-rewrite" logger="lenya.sitemap.transformer.link-rewrite" src="org.apache.lenya.cms.cocoon.transformation.LinkRewritingTransformer"/>
<map:transformer name="usecasemenu" logger="lenya.sitemap.transformer.usecasemenu" src="org.apache.lenya.cms.cocoon.transformation.UsecaseMenuTransformer"/>
- <map:transformer name="workflowmenu" logger="lenya.sitemap.transformer.workflowmenu" src="org.apache.lenya.cms.cocoon.transformation.WorkflowMenuTransformer"/>
<map:transformer name="i18n" logger="sitemap.transformer.i18n" src="org.apache.cocoon.transformation.I18nTransformer">
<catalogues default="cmsui">
<catalogue id="cmsui" name="cmsui" location="cocoon://i18n-catalogue/"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org