Author: michiel
Date: 2009-06-04 17:20:49 +0200 (Thu, 04 Jun 2009)
New Revision: 35736
Modified:
mmbase/trunk/applications/cloudcontext/src/main/resources/META-INF/tags/mm/security/verifyEmail.tagx
Log:
WTF..
Modified:
mmbase/trunk/applications/cloudcontext/src/main/resources/META-INF/tags/mm/security/verifyEmail.tagx
===================================================================
---
mmbase/trunk/applications/cloudcontext/src/main/resources/META-INF/tags/mm/security/verifyEmail.tagx
2009-06-04 15:06:24 UTC (rev 35735)
+++
mmbase/trunk/applications/cloudcontext/src/main/resources/META-INF/tags/mm/security/verifyEmail.tagx
2009-06-04 15:20:49 UTC (rev 35736)
@@ -1,4 +1,3 @@
-<<<<<<< .mine
<jsp:root
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
@@ -33,32 +32,3 @@
</jsp:root>
-=======
-<jsp:root
- xmlns:c="http://java.sun.com/jsp/jstl/core";
- xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
- xmlns:jsp="http://java.sun.com/JSP/Page";
- version="2.0">
- <jsp:directive.tag
- display-name="HTML"
- description="The HTML tag defines the basic HTML structure of this site
- " />
- <jsp:directive.attribute name="signature" required="true" />
- <div>
- bla bla bla bla ${signature}
- <mm:cloud method="delegate" authenticate="class" jspvar="cloud">
-
- <jsp:scriptlet>
- org.mmbase.bridge.Node node =
org.mmbase.datatypes.VerifyEmailProcessor.validate(cloud,
pageScope.getAttribute("signature"));
- pageScope.setAttribute("usernode", node);
- </jsp:scriptlet>
- bla bla
- <mm:node referid="usernode">
- <jsp:doBody />
- </mm:node>
- </mm:cloud>
- </div>
-</jsp:root>
-
-
->>>>>>> .r35734
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
