svn commit: r1072598 - in /lenya/branches/BRANCH_2_0_X/src: impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java impl/test/webtest/tests.xml modules/notification/usecases/messageList.jx

Author: rainer
Date: Sun Feb 20 13:59:33 2011
New Revision: 1072598

URL: http://svn.apache.org/viewvc?rev=1072598&view=rev
Log:
Merging changes from 2.0.4 release back into 2.0.X trunk.

Modified:
    lenya/branches/BRANCH_2_0_X/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
    lenya/branches/BRANCH_2_0_X/src/impl/test/webtest/tests.xml
    lenya/branches/BRANCH_2_0_X/src/modules/notification/usecases/messageList.jx   (contents, props changed)

Modified: lenya/branches/BRANCH_2_0_X/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java?rev=1072598&r1=1072597&r2=1072598&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java (original)
+++ lenya/branches/BRANCH_2_0_X/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java Sun Feb 20 13:59:33 2011
@@ -788,7 +788,7 @@ public class DocumentManagerImpl extends
          * @see org.apache.lenya.cms.publication.util.DocumentVisitor#visitDocument(org.apache.lenya.cms.publication.Document)
          */
         public void visitDocument(Document document) throws PublicationException {
-            getDocumentManager().deleteAllLanguageVersions(document);
+            getDocumentManager().delete(document);
         }
 
     }

Modified: lenya/branches/BRANCH_2_0_X/src/impl/test/webtest/tests.xml
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/impl/test/webtest/tests.xml?rev=1072598&r1=1072597&r2=1072598&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/impl/test/webtest/tests.xml (original)
+++ lenya/branches/BRANCH_2_0_X/src/impl/test/webtest/tests.xml Sun Feb 20 13:59:33 2011
@@ -25,7 +25,7 @@
 
 <project name="Lenya webtest tests" default="tests">
 
-  <taskdef file="${webtest.home}/webtestTaskdefs.properties">
+  <taskdef file="${webtest.home}/webtest.xml">
     <classpath>
       <fileset dir="${webtest.home}" includes="**/lib/*.jar"/>
     </classpath>
@@ -35,4 +35,4 @@
   
   &default;
   
-</project>
\ No newline at end of file
+</project>

Modified: lenya/branches/BRANCH_2_0_X/src/modules/notification/usecases/messageList.jx
URL: http://svn.apache.org/viewvc/lenya/branches/BRANCH_2_0_X/src/modules/notification/usecases/messageList.jx?rev=1072598&r1=1072597&r2=1072598&view=diff
==============================================================================
--- lenya/branches/BRANCH_2_0_X/src/modules/notification/usecases/messageList.jx (original)
+++ lenya/branches/BRANCH_2_0_X/src/modules/notification/usecases/messageList.jx Sun Feb 20 13:59:33 2011
@@ -72,12 +72,7 @@
               <jx:formatDate pattern="yyyy-MM-dd HH:mm:ss" value="${message.getMessage().getTime()}"/>
             </td>
             <td style="text-align: center;">
-              <form method="POST">
-                <input type="hidden" name="lenya.usecase" value="${usecase.getName()}"/>
-                <input type="hidden" name="lenya.continuation" value="${continuation.id}"/>
-                <input type="hidden" name="deleteMessageId" value="${message.getId()}"/>
-                <input type="image" src="/modules/gui/icons/sweetie/base/16-square-red-delete.png" name="submit" value="Delete" i18n:attr="value"/>
-              </form>
+              <a href="?lenya.usecase=notification.deleteMessage&amp;messageId=${message.getId()}"><img src="/modules/gui/icons/sweetie/base/16-square-red-delete.png" alt="Delete"/></a>
             </td>
           </tr>
         </jx:forEach>
@@ -85,4 +80,4 @@
     </table>
   </div>
   
-</jx:template>
\ No newline at end of file
+</jx:template>

Propchange: lenya/branches/BRANCH_2_0_X/src/modules/notification/usecases/messageList.jx
------------------------------------------------------------------------------
    svn:eol-style = native