joerg 2004/03/01 12:11:18
Modified: src/blocks/workflow/java/org/apache/cocoon/xml
NamespaceHelper.java DocumentHelper.java
src/blocks/workflow/java/org/apache/cocoon/workflow/impl
WorkflowInstanceImpl.java ConditionFactory.java
SynchronizedWorkflowInstancesImpl.java
AbstractCondition.java History.java
BooleanVariableInstanceImpl.java
BooleanVariableAssignmentImpl.java EventImpl.java
WorkflowImpl.java BooleanVariableImpl.java
ActionImpl.java StateImpl.java
BooleanVariableCondition.java TransitionImpl.java
WorkflowBuilder.java Version.java
src/blocks/workflow/java/org/apache/cocoon/workflow
Condition.java Transition.java
WorkflowInstance.java State.java Action.java
Workflow.java BooleanVariableInstance.java
Situation.java BooleanVariable.java
SynchronizedWorkflowInstances.java
BooleanVariableAssignment.java
WorkflowException.java WorkflowListener.java
Log:
Cocoon license, fixed Javadoc (had still the old packages, removed the
packages where they are not necessary)
Revision Changes Path
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/xml/NamespaceHelper.java
Index: NamespaceHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/xml/NamespaceHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamespaceHelper.java 1 Mar 2004 12:30:54 -0000 1.1
+++ NamespaceHelper.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.xml;
@@ -65,7 +60,7 @@
/**
* A NamespaceHelper object simplifies the creation of elements in a certain
* namespace. All elements are owned by a document that is passed to the
- * [EMAIL PROTECTED] #NamespaceHelper(Document, String, String)} constructor
or created
+ * [EMAIL PROTECTED] #NamespaceHelper(String, String, Document)} constructor
or created
* using the [EMAIL PROTECTED] #NamespaceHelper(String, String, String)}
constructor.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Andreas Hartmann</a>
1.2 +5 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/xml/DocumentHelper.java
Index: DocumentHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/xml/DocumentHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentHelper.java 1 Mar 2004 12:30:54 -0000 1.1
+++ DocumentHelper.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,5 +1,4 @@
/*
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -23,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -45,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.xml;
@@ -274,7 +270,7 @@
*
* @throws ParserConfigurationException if an error occurs
*
- * @see DOMImplementation.createDocumentType(String, String, String)
+ * @see org.w3c.dom.DOMImplementation#createDocumentType(String, String,
String)
*/
public DocumentType createDocumentType(String qualifiedName, String
publicId, String systemId)
throws ParserConfigurationException {
1.2 +8 -13
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/WorkflowInstanceImpl.java
Index: WorkflowInstanceImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/WorkflowInstanceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowInstanceImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ WorkflowInstanceImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -298,7 +293,7 @@
}
/**
- * @see
org.apache.lenya.workflow.WorkflowInstance#getValue(java.lang.String)
+ * @see WorkflowInstance#getValue(java.lang.String)
*/
public boolean getValue(String variableName) throws WorkflowException {
BooleanVariable variable =
getWorkflowImpl().getVariable(variableName);
@@ -323,7 +318,7 @@
private List listeners = new ArrayList();
/**
- * @see
org.apache.lenya.workflow.WorkflowInstance#addWorkflowListener(org.apache.lenya.workflow.WorkflowListener)
+ * @see WorkflowInstance#addWorkflowListener(WorkflowListener)
*/
public void addWorkflowListener(WorkflowListener listener) {
if (!listeners.contains(listener)) {
@@ -332,14 +327,14 @@
}
/**
- * @see
org.apache.lenya.workflow.WorkflowInstance#removeWorkflowListener(org.apache.lenya.workflow.WorkflowListener)
+ * @see WorkflowInstance#removeWorkflowListener(WorkflowListener)
*/
public void removeWorkflowListener(WorkflowListener listener) {
listeners.remove(listener);
}
/**
- * @see
org.apache.lenya.workflow.WorkflowInstance#isSynchronized(org.apache.lenya.workflow.Situation,
org.apache.lenya.workflow.Event)
+ * @see WorkflowInstance#isSynchronized(Event)
*/
public boolean isSynchronized(Event event) throws WorkflowException {
Transition nextTransition = getNextTransition(event);
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/ConditionFactory.java
Index: ConditionFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/ConditionFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ConditionFactory.java 1 Mar 2004 12:30:49 -0000 1.1
+++ ConditionFactory.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
1.2 +5 -10
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/SynchronizedWorkflowInstancesImpl.java
Index: SynchronizedWorkflowInstancesImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/SynchronizedWorkflowInstancesImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SynchronizedWorkflowInstancesImpl.java 1 Mar 2004 12:30:49 -0000
1.1
+++ SynchronizedWorkflowInstancesImpl.java 1 Mar 2004 20:11:17 -0000
1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -115,7 +110,7 @@
/**
* Returns all executable events.
- * @see
org.apache.lenya.workflow.WorkflowInstance#getExecutableEvents(org.apache.lenya.workflow.Situation)
+ * @see WorkflowInstance#getExecutableEvents(Situation)
*/
public Event[] getExecutableEvents(Situation situation) throws
WorkflowException {
if (log.isDebugEnabled()) {
@@ -182,7 +177,7 @@
/**
* Invokes an event on all documents.
- * @see
org.apache.lenya.workflow.WorkflowInstance#invoke(org.apache.lenya.workflow.Situation,
org.apache.lenya.workflow.Event)
+ * @see WorkflowInstance#invoke(Situation, Event)
*/
public void invoke(Situation situation, Event event) throws
WorkflowException {
1.2 +6 -11
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/AbstractCondition.java
Index: AbstractCondition.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/AbstractCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractCondition.java 1 Mar 2004 12:30:49 -0000 1.1
+++ AbstractCondition.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -69,7 +64,7 @@
private String expression;
/**
- * @see
org.apache.lenya.workflow.impl.AbstractCondition#setExpression(java.lang.String)
+ * @see Condition#setExpression(String)
*/
public void setExpression(String expression) throws WorkflowException {
this.expression = expression.trim();
@@ -84,7 +79,7 @@
}
/**
- * @see java.lang.Object#toString()
+ * @see Object#toString()
*/
public String toString() {
return getExpression();
1.2 +4 -13
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/History.java
Index: History.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/History.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- History.java 1 Mar 2004 12:30:49 -0000 1.1
+++ History.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -133,10 +128,6 @@
/**
* Creates a new history object for a workflow instance.
- * @param instance
- * @param file
- * @param x
- * @throws WorkflowException
*/
protected History() {
}
1.2 +6 -11
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableInstanceImpl.java
Index: BooleanVariableInstanceImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableInstanceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariableInstanceImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ BooleanVariableInstanceImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -72,14 +67,14 @@
}
/**
- * @see org.apache.lenya.cms.workflow.BooleanVariableInstance#getValue()
+ * @see BooleanVariableInstance#getValue()
*/
public boolean getValue() {
return value;
}
/**
- * @see
org.apache.lenya.cms.workflow.BooleanVariableInstance#setValue(boolean)
+ * @see BooleanVariableInstance#setValue(boolean)
*/
public void setValue(boolean variableValue) {
value = variableValue;
1.2 +5 -10
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableAssignmentImpl.java
Index: BooleanVariableAssignmentImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableAssignmentImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariableAssignmentImpl.java 1 Mar 2004 12:30:49 -0000
1.1
+++ BooleanVariableAssignmentImpl.java 1 Mar 2004 20:11:17 -0000
1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -83,7 +78,7 @@
private boolean value;
/**
- * @see org.apache.lenya.workflow.BooleanVariableAssignment#execute()
+ * @see BooleanVariableAssignment#execute(WorkflowInstance)
*/
public void execute(WorkflowInstance instance) throws WorkflowException {
WorkflowInstanceImpl impl = (WorkflowInstanceImpl) instance;
1.2 +9 -14
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/EventImpl.java
Index: EventImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/EventImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ EventImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -84,8 +79,8 @@
return getName();
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
+ /**
+ * @see Object#equals(Object)
*/
public boolean equals(Object otherObject) {
boolean equals = false;
@@ -100,15 +95,15 @@
return equals;
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
+ /**
+ * @see Object#hashCode()
*/
public int hashCode() {
return getName().hashCode();
}
/**
- * @see org.apache.lenya.cms.workflow.Event#getName()
+ * @see Event#getName()
*/
public String getName() {
return name;
1.2 +5 -10
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/WorkflowImpl.java
Index: WorkflowImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/WorkflowImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ WorkflowImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -238,7 +233,7 @@
}
/**
- * @see org.apache.lenya.workflow.Workflow#getVariableNames()
+ * @see Workflow#getVariableNames()
*/
public String[] getVariableNames() {
BooleanVariableImpl[] variables = getVariables();
1.2 +6 -11
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableImpl.java
Index: BooleanVariableImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariableImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ BooleanVariableImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -80,7 +75,7 @@
private String name;
/**
- * @see org.apache.lenya.cms.workflow.BooleanVariable#getName()
+ * @see BooleanVariable#getName()
*/
public String getName() {
return name;
@@ -89,7 +84,7 @@
private boolean initialValue;
/**
- * @see org.apache.lenya.workflow.BooleanVariable#getInitialValue()
+ * @see BooleanVariable#getInitialValue()
*/
public boolean getInitialValue() {
return initialValue;
1.2 +6 -11
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/ActionImpl.java
Index: ActionImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/ActionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ ActionImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -87,14 +82,14 @@
}
/**
- * @see java.lang.Object#toString()
+ * @see Object#toString()
*/
public String toString() {
return getId();
}
/**
- * @see
org.apache.lenya.workflow.Action#execute(org.apache.lenya.workflow.WorkflowInstance)
+ * @see Action#execute(WorkflowInstance)
*/
public void execute(WorkflowInstance instance) throws WorkflowException {
}
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/StateImpl.java
Index: StateImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/StateImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StateImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ StateImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
1.2 +6 -11
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableCondition.java
Index: BooleanVariableCondition.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/BooleanVariableCondition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariableCondition.java 1 Mar 2004 12:30:49 -0000 1.1
+++ BooleanVariableCondition.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
@@ -90,7 +85,7 @@
}
/**
- * @see
org.apache.lenya.workflow.Condition#setExpression(java.lang.String)
+ * @see org.apache.cocoon.workflow.Condition#setExpression(String)
*/
public void setExpression(String expression) throws WorkflowException {
super.setExpression(expression);
@@ -110,7 +105,7 @@
}
/**
- * @see
org.apache.lenya.workflow.Condition#isComplied(org.apache.lenya.workflow.Situation)
+ * @see org.apache.cocoon.workflow.Condition#isComplied(Situation,
WorkflowInstance)
*/
public boolean isComplied(Situation situation, WorkflowInstance
instance) throws WorkflowException {
if (log.isDebugEnabled()) {
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/TransitionImpl.java
Index: TransitionImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/TransitionImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransitionImpl.java 1 Mar 2004 12:30:49 -0000 1.1
+++ TransitionImpl.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/WorkflowBuilder.java
Index: WorkflowBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/WorkflowBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowBuilder.java 1 Mar 2004 12:30:49 -0000 1.1
+++ WorkflowBuilder.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/Version.java
Index: Version.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/impl/Version.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Version.java 1 Mar 2004 12:30:49 -0000 1.1
+++ Version.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow.impl;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Condition.java
Index: Condition.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Condition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Condition.java 1 Mar 2004 12:30:54 -0000 1.1
+++ Condition.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Transition.java
Index: Transition.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Transition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Transition.java 1 Mar 2004 12:30:54 -0000 1.1
+++ Transition.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/WorkflowInstance.java
Index: WorkflowInstance.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/WorkflowInstance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowInstance.java 1 Mar 2004 12:30:53 -0000 1.1
+++ WorkflowInstance.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/State.java
Index: State.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/State.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- State.java 1 Mar 2004 12:30:54 -0000 1.1
+++ State.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Action.java
Index: Action.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Action.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Action.java 1 Mar 2004 12:30:54 -0000 1.1
+++ Action.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Workflow.java
Index: Workflow.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Workflow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Workflow.java 1 Mar 2004 12:30:53 -0000 1.1
+++ Workflow.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/BooleanVariableInstance.java
Index: BooleanVariableInstance.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/BooleanVariableInstance.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariableInstance.java 1 Mar 2004 12:30:54 -0000 1.1
+++ BooleanVariableInstance.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Situation.java
Index: Situation.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/Situation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Situation.java 1 Mar 2004 12:30:53 -0000 1.1
+++ Situation.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/BooleanVariable.java
Index: BooleanVariable.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/BooleanVariable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariable.java 1 Mar 2004 12:30:54 -0000 1.1
+++ BooleanVariable.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +5 -10
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/SynchronizedWorkflowInstances.java
Index: SynchronizedWorkflowInstances.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/SynchronizedWorkflowInstances.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SynchronizedWorkflowInstances.java 1 Mar 2004 12:30:53 -0000
1.1
+++ SynchronizedWorkflowInstances.java 1 Mar 2004 20:11:17 -0000
1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
@@ -90,13 +85,13 @@
/**
* Returns all executable events.
- * @see
org.apache.lenya.workflow.WorkflowInstance#getExecutableEvents(org.apache.lenya.workflow.Situation)
+ * @see WorkflowInstance#getExecutableEvents(Situation)
*/
Event[] getExecutableEvents(Situation situation) throws
WorkflowException;
/**
* Invokes an event on all documents.
- * @see
org.apache.lenya.workflow.WorkflowInstance#invoke(org.apache.lenya.workflow.Situation,
org.apache.lenya.workflow.Event)
+ * @see WorkflowInstance#invoke(Situation, Event)
*/
void invoke(Situation situation, Event event) throws WorkflowException;
}
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/BooleanVariableAssignment.java
Index: BooleanVariableAssignment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/BooleanVariableAssignment.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BooleanVariableAssignment.java 1 Mar 2004 12:30:53 -0000 1.1
+++ BooleanVariableAssignment.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/WorkflowException.java
Index: WorkflowException.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/WorkflowException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowException.java 1 Mar 2004 12:30:54 -0000 1.1
+++ WorkflowException.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
1.2 +4 -9
cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/WorkflowListener.java
Index: WorkflowListener.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/workflow/java/org/apache/cocoon/workflow/WorkflowListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkflowListener.java 1 Mar 2004 12:30:53 -0000 1.1
+++ WorkflowListener.java 1 Mar 2004 20:11:17 -0000 1.2
@@ -1,6 +1,4 @@
/*
-$Id$
-<License>
============================================================================
The Apache Software License, Version 1.1
@@ -24,7 +22,7 @@
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.
- 4. The names "Apache Lenya" and "Apache Software Foundation" must not be
+ 4. The names "Apache Cocoon" and "Apache Software Foundation" must not be
used to endorse or promote products derived from this software without
prior written permission. For written permission, please contact
[EMAIL PROTECTED]
@@ -46,12 +44,9 @@
This software consists of voluntary contributions made by many individuals
on behalf of the Apache Software Foundation and was originally created by
- Michael Wechner <[EMAIL PROTECTED]>. For more information on the Apache
Soft-
- ware Foundation, please see <http://www.apache.org/>.
+ Stefano Mazzocchi <[EMAIL PROTECTED]>. For more information on the Apache
+ Software Foundation, please see <http://www.apache.org/>.
- Lenya includes software developed by the Apache Software Foundation, W3C,
- DOM4J Project, BitfluxEditor, Xopus, and WebSHPINX.
-</License>
*/
package org.apache.cocoon.workflow;
