Merging changes from 2.0.4 release back into 2.0.X trunk.
git-svn-id: https://svn.apache.org/repos/asf/lenya/branches/BRANCH_2_0_X@1072598 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java b/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
index fed0c51..b82e2f2 100644
--- a/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
+++ b/src/impl/java/org/apache/lenya/cms/publication/DocumentManagerImpl.java
@@ -788,7 +788,7 @@
* @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);
}
}
diff --git a/src/impl/test/webtest/tests.xml b/src/impl/test/webtest/tests.xml
index 33ac5f1..35f6446 100644
--- a/src/impl/test/webtest/tests.xml
+++ b/src/impl/test/webtest/tests.xml
@@ -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>
diff --git a/src/modules/notification/usecases/messageList.jx b/src/modules/notification/usecases/messageList.jx
index b80cff4..44bc64a 100644
--- a/src/modules/notification/usecases/messageList.jx
+++ b/src/modules/notification/usecases/messageList.jx
@@ -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&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>
