You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by ro...@apache.org on 2004/10/30 23:59:57 UTC
svn commit: rev 56084 - in incubator/lenya/trunk/src/webapp/lenya/pubs/default/config: ac ac/policies/archive ac/policies/trash workflow
Author: roku
Date: Sat Oct 30 14:59:57 2004
New Revision: 56084
Added:
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/archive/
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/archive/subtree-policy.acml
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/trash/
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/trash/subtree-policy.acml
Modified:
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/usecase-policies.xml
incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/workflow/workflow.xml
Log:
Fixed
http://issues.apache.org/bugzilla/show_bug.cgi?id=31987
Added: incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/archive/subtree-policy.acml
==============================================================================
--- (empty file)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/archive/subtree-policy.acml Sat Oct 30 14:59:57 2004
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<!-- $Id: subtree-policy.acml 42702 2004-03-13 12:34:18Z gregor $ -->
+
+<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
+
+ <group id="editor">
+ <role id="edit"/>
+ </group>
+
+ <group id="reviewer">
+ <role id="review"/>
+ </group>
+
+</policy>
Added: incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/trash/subtree-policy.acml
==============================================================================
--- (empty file)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/policies/trash/subtree-policy.acml Sat Oct 30 14:59:57 2004
@@ -0,0 +1,30 @@
+<?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.
+-->
+
+<!-- $Id: subtree-policy.acml 42702 2004-03-13 12:34:18Z gregor $ -->
+
+<policy xmlns="http://apache.org/cocoon/lenya/ac/1.0">
+
+ <group id="editor">
+ <role id="edit"/>
+ </group>
+
+ <group id="reviewer">
+ <role id="review"/>
+ </group>
+
+</policy>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/usecase-policies.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/usecase-policies.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/ac/usecase-policies.xml Sat Oct 30 14:59:57 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: usecase-policies.xml,v 1.6 2004/06/28 08:42:12 andreas Exp $ -->
+<!-- $Id$ -->
<usecases xmlns="http://apache.org/cocoon/lenya/ac/1.0">
<usecase id="create">
@@ -25,6 +25,9 @@
<role id="edit"/>
</usecase>
<usecase id="delete">
+ <role id="edit"/>
+ </usecase>
+ <usecase id="restore">
<role id="edit"/>
</usecase>
Modified: incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/workflow/workflow.xml
==============================================================================
--- incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/workflow/workflow.xml (original)
+++ incubator/lenya/trunk/src/webapp/lenya/pubs/default/config/workflow/workflow.xml Sat Oct 30 14:59:57 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: workflow.xml,v 1.10 2004/03/13 12:34:18 gregor Exp $ -->
+<!-- $Id$ -->
<workflow xmlns="http://apache.org/cocoon/lenya/workflow/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -72,5 +72,15 @@
<event id="archive"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">edit</condition>
<assign variable="is_live" value="false"/>
- </transition>
+ </transition>
+
+ <transition source="archive" destination="authoring">
+ <event id="restore"/>
+ <condition class="org.apache.lenya.cms.workflow.RoleCondition">edit</condition>
+ </transition>
+
+ <transition source="trash" destination="authoring">
+ <event id="restore"/>
+ <condition class="org.apache.lenya.cms.workflow.RoleCondition">edit</condition>
+ </transition>
</workflow>
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org