You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ne...@apache.org on 2007/02/23 17:02:34 UTC

svn commit: r510998 - in /lenya/trunk/src: modules-core/workflow/ modules-core/workflow/config/cocoon-xconf/ modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/ modules-core/workflow/usecases/ pubs/default/lenya/usecases/workflow/ pu...

Author: nettings
Date: Fri Feb 23 08:02:33 2007
New Revision: 510998

URL: http://svn.apache.org/viewvc?view=rev&rev=510998
Log:
refactoring: move submit/publish/reject/deactivate usecases from
pubs/default/modules/defaultusecases to modules-core/workflow.
FIXME: workflow now depends on notification, therefore notification
should be moved to modules-core.

Added:
    lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-deactivate.xconf
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-deactivate.xconf
    lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-publish.xconf
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-publish.xconf
    lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-reject.xconf
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-reject.xconf
    lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-submit.xconf
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-submit.xconf
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Reject.java
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Reject.java
    lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java
      - copied, changed from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Submit.java
    lenya/trunk/src/modules-core/workflow/usecases/deactivate.jx
      - copied unchanged from r510918, lenya/trunk/src/pubs/default/lenya/usecases/workflow/deactivate.jx
    lenya/trunk/src/modules-core/workflow/usecases/publish.jx
      - copied unchanged from r510918, lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx
    lenya/trunk/src/modules-core/workflow/usecases/reject.jx
      - copied unchanged from r510918, lenya/trunk/src/pubs/default/lenya/usecases/workflow/reject.jx
    lenya/trunk/src/modules-core/workflow/usecases/submit.jx
      - copied unchanged from r510918, lenya/trunk/src/pubs/default/lenya/usecases/workflow/submit.jx
Removed:
    lenya/trunk/src/pubs/default/lenya/usecases/workflow/deactivate.jx
    lenya/trunk/src/pubs/default/lenya/usecases/workflow/publish.jx
    lenya/trunk/src/pubs/default/lenya/usecases/workflow/reject.jx
    lenya/trunk/src/pubs/default/lenya/usecases/workflow/submit.jx
    lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-deactivate.xconf
    lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-publish.xconf
    lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-reject.xconf
    lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-submit.xconf
    lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java
    lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java
    lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Reject.java
    lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Submit.java
Modified:
    lenya/trunk/src/modules-core/workflow/module.xml

Copied: lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-deactivate.xconf (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-deactivate.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-deactivate.xconf?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-deactivate.xconf&r1=510918&p2=lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-deactivate.xconf&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-deactivate.xconf (original)
+++ lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-deactivate.xconf Fri Feb 23 08:02:33 2007
@@ -21,13 +21,13 @@
     This file defines the publication specific use-cases
 -->
 
-  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'default/workflow.deactivate']">
+  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'workflow.deactivate']">
 
-    <component-instance name="default/workflow.deactivate"
+    <component-instance name="workflow.deactivate"
                         logger="lenya.usecases.workflow"
-                        class="org.apache.lenya.defaultpub.cms.usecases.Deactivate">
-      <view template="usecases/workflow/deactivate.jx"/>
-      <event id="deactivate"/>
+                        class="org.apache.lenya.cms.workflow.usecases.Deactivate">
+      <view template="modules/workflow/usecases/deactivate.jx"/>
+      <event id="deactivate"/>
     </component-instance>
 
   </xconf>

Copied: lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-publish.xconf (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-publish.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-publish.xconf?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-publish.xconf&r1=510918&p2=lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-publish.xconf&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-publish.xconf (original)
+++ lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-publish.xconf Fri Feb 23 08:02:33 2007
@@ -21,13 +21,13 @@
     This file defines the publication specific use-cases
 -->
 
-  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'default/workflow.publish']">
+  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'workflow.publish']">
 
-    <component-instance name="default/workflow.publish"
+    <component-instance name="workflow.publish"
                         logger="lenya.usecases.workflow"
-                        class="org.apache.lenya.defaultpub.cms.usecases.Publish">
-      <view template="usecases/workflow/publish.jx"/>
-      <event id="publish"/>
+                        class="org.apache.lenya.cms.workflow.usecases.Publish">
+      <view template="modules/workflow/usecases/publish.jx"/>
+      <event id="publish"/>
     </component-instance>
 
   </xconf>

Copied: lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-reject.xconf (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-reject.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-reject.xconf?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-reject.xconf&r1=510918&p2=lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-reject.xconf&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-reject.xconf (original)
+++ lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-reject.xconf Fri Feb 23 08:02:33 2007
@@ -21,13 +21,13 @@
     This file defines the publication specific use-cases
 -->
 
-  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'default/workflow.reject']">
+  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'workflow.reject']">
                         
-    <component-instance name="default/workflow.reject"
+    <component-instance name="workflow.reject"
                         logger="lenya.usecases.workflow"
-                        class="org.apache.lenya.defaultpub.cms.usecases.Reject">
+                        class="org.apache.lenya.cms.workflow.usecases.Reject">
       <event id="reject"/>
-      <view template="usecases/workflow/reject.jx"/>
+      <view template="modules/workflow/usecases/reject.jx"/>
     </component-instance>
 
   </xconf>

Copied: lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-submit.xconf (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-submit.xconf)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-submit.xconf?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-submit.xconf&r1=510918&p2=lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-submit.xconf&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/config/cocoon-xconf/usecases-workflow-submit.xconf (original)
+++ lenya/trunk/src/modules-core/workflow/config/cocoon-xconf/usecases-workflow-submit.xconf Fri Feb 23 08:02:33 2007
@@ -21,13 +21,13 @@
     This file defines the publication specific use-cases
 -->
 
-  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'default/workflow.submit']">
+  <xconf xpath="/cocoon/usecases" unless="/cocoon/usecases/component-instance[@name = 'workflow.submit']">
 
-    <component-instance name="default/workflow.submit"
+    <component-instance name="workflow.submit"
                         logger="lenya.usecases.workflow"
-                        class="org.apache.lenya.defaultpub.cms.usecases.Submit">
+                        class="org.apache.lenya.cms.workflow.usecases.Submit">
       <event id="submit"/>
-      <view template="usecases/workflow/submit.jx"/>
+      <view template="modules/workflow/usecases/submit.jx"/>
     </component-instance>
 
   </xconf>

Copied: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java&r1=510918&p2=lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Deactivate.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Deactivate.java Fri Feb 23 08:02:33 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.lenya.defaultpub.cms.usecases;
+package org.apache.lenya.cms.workflow.usecases;
 
 import java.util.ArrayList;
 import java.util.HashSet;

Copied: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java&r1=510918&p2=lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Publish.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Publish.java Fri Feb 23 08:02:33 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.lenya.defaultpub.cms.usecases;
+package org.apache.lenya.cms.workflow.usecases;
 
 import java.text.DateFormat;
 import java.text.ParseException;

Copied: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Reject.java (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Reject.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Reject.java?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Reject.java&r1=510918&p2=lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Reject.java&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Reject.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Reject.java Fri Feb 23 08:02:33 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.lenya.defaultpub.cms.usecases;
+package org.apache.lenya.cms.workflow.usecases;
 
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.Request;

Copied: lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java (from r510918, lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Submit.java)
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java?view=diff&rev=510998&p1=lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Submit.java&r1=510918&p2=lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java&r2=510998
==============================================================================
--- lenya/trunk/src/pubs/default/modules/defaultusecases/java/src/org/apache/lenya/defaultpub/cms/usecases/Submit.java (original)
+++ lenya/trunk/src/modules-core/workflow/java/src/org/apache/lenya/cms/workflow/usecases/Submit.java Fri Feb 23 08:02:33 2007
@@ -15,7 +15,7 @@
  *  limitations under the License.
  *
  */
-package org.apache.lenya.defaultpub.cms.usecases;
+package org.apache.lenya.cms.workflow.usecases;
 
 import org.apache.cocoon.components.ContextHelper;
 import org.apache.cocoon.environment.Request;

Modified: lenya/trunk/src/modules-core/workflow/module.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/workflow/module.xml?view=diff&rev=510998&r1=510997&r2=510998
==============================================================================
--- lenya/trunk/src/modules-core/workflow/module.xml (original)
+++ lenya/trunk/src/modules-core/workflow/module.xml Fri Feb 23 08:02:33 2007
@@ -22,6 +22,8 @@
   <id>org.apache.lenya.modules.workflow</id>
   <export package="org.apache.lenya.cms.workflow.usecases"/>
   <depends module="org.apache.lenya.modules.usecase"/>
+  <depends module="org.apache.lenya.modules.linking"/>
+  <depends module="org.apache.lenya.modules.notification"/>
   <package>org.apache.lenya.modules</package>
   <version>0.1-dev</version>
   <name>Workflow implementation</name>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org