Changeset 29479

Timestamp:

01/21/08 18:29:15 (11 months ago)

Author:

dmihalache

Message:

NXP-1778: Can't make an approved document go back to project life cycle state

Files:

• org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/java/org/nuxeo/ecm/core/lifecycle/def (added)
• org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/java/org/nuxeo/ecm/core/lifecycle/def/LCDefaultListener.java (added)
• org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/resources/OSGI-INF/LifeCycleCoreExtensions.xml (modified) (1 diff)
• org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-versioning-core/src/main/resources/OSGI-INF/VersioningRuleContribs.xml (modified) (1 diff)

org.nuxeo.ecm.core/branches/1.4/nuxeo-core/src/main/resources/OSGI-INF/LifeCycleCoreExtensions.xml

@@ -84 +84 @@
-  </extension>
-
+
+  <require>org.nuxeo.ecm.core.listener.CoreEventListenerService</require>
+
+  <extension target="org.nuxeo.ecm.core.listener.CoreEventListenerService"
+    point="listener">
+
+    <listener name="geidelistener"
+      class="org.nuxeo.ecm.core.lifecycle.def.LCDefaultListener"
+      order="120" />
+  </extension>
+
+
-</component>

org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-versioning-core/src/main/resources/OSGI-INF/VersioningRuleContribs.xml

@@ -32 +32 @@
-      <option value="inc_major" />
-    </versioningRuleEdit>
+    
+    <!-- valid state -->
+    <versioningRuleEdit name="DocEditRule_if_in_valid_state"
+      action="ask_user" lifecycleState="approved">
+      <option value="inc_minor" />
+      <option value="inc_major" default="true"/>
+    </versioningRuleEdit>
-
-    <versioningRuleEdit name="sampleEditRuleAnyState" action="ask_user"