svn commit: [jahia] r17666 - in /branches/JAHIA-5-0-SP-BRANCH/core/src: java/org/jahia/views/engines/versioning/actions/ContentVersioningAction.java webapp/views/engines/versioning/pages/sitemap.jsp

[knguyen]

Author: knguyen
Date: Wed Jun 20 14:53:38 2007
New Revision: 17666

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17666&repname=
=3Djahia
Log:
JAHIA-1999: remove aquire locks from versioning engine

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engines/vers=
ioning/actions/ContentVersioningAction.java
    branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/sitemap.jsp

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engine=
s/versioning/actions/ContentVersioningAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/views/engines/versioning/actions/ContentVer=
sioningAction.java&rev=3D17666&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engines/vers=
ioning/actions/ContentVersioningAction.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/views/engines/vers=
ioning/actions/ContentVersioningAction.java Wed Jun 20 14:53:38 2007
@@ -1025,12 +1025,11 @@
         } finally {
             if (  versViewHelper !=3D null && versViewHelper.isRestoringPa=
ge() ){
                 try {
-                    releaseTreeLocks(engineCommonData.getParamBean());
+                   releaseTreeLocks(engineCommonData.getParamBean());
                 } catch ( Throwable t ){
                 }
             }
             try {
-                // this is required in the case that we never locked the t=
ree
                 releaseActionLock(engineCommonData.getParamBean());
             } catch ( Throwable t) {
             }
@@ -1763,6 +1762,9 @@
      */
     protected boolean acquireTreeLocks(ProcessingContext jParams, ActionMe=
ssages messages)
             throws JahiaException {
+        //@todo: have locks optimized or remove them.
+        return true;
+        /*
         ArrayList acquiredPageLocks =3D new ArrayList();
         if (jParams.settings().areLocksActivated()) {
             JahiaUser user =3D jParams.getUser();
@@ -1832,10 +1834,14 @@
         }
         jParams.getSessionState().setAttribute(ContentVersioningAction.SES=
SION_VERSIONING_LOCK_LIST, acquiredPageLocks);
         return true;
+        */
     }
 =

     protected void releaseTreeLocks(ProcessingContext jParams)
             throws JahiaException {
+        //@todo: have locks optimized or remove it
+        return;
+        /*
         if (jParams.settings().areLocksActivated()) {
             ArrayList acquiredPageLocks =3D (ArrayList) jParams.getSession=
State().getAttribute(ContentVersioningAction.SESSION_VERSIONING_LOCK_LIST);
             if (acquiredPageLocks =3D=3D null) {
@@ -1855,7 +1861,7 @@
                 htmlCache.invalidatePageEntries(Integer.toString(curPageID=
));
             }
             jParams.getSessionState().removeAttribute(ContentVersioningAct=
ion.SESSION_VERSIONING_LOCK_LIST);
-        }
+        }*/
     }
 =

     protected void releaseActionLock(ProcessingContext jParams)

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versio=
ning/pages/sitemap.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/versioning/pages/sitemap.jsp&rev=3D17=
666&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/sitemap.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/versioning/p=
ages/sitemap.jsp Wed Jun 20 14:53:38 2007
@@ -178,7 +178,7 @@
         <td align=3D"left" valign=3D"top" colspan=3D"3">
             <b><jahia:engineResourceBundle resourceName=3D"org.jahia.engin=
es.version.pagesSelection"/>&nbsp;:</b>
             <p>
-                <span class=3D"error">N.B:&nbsp;<jahia:engineResourceBundl=
e resourceName=3D"org.jahia.engines.version.lockedPages"/></span>
+                <!--span class=3D"error">N.B:&nbsp;<jahia:engineResourceBu=
ndle resourceName=3D"org.jahia.engines.version.lockedPages"/></span-->
             </p>
             <%
                 // Restore specific

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list