Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 88164 invoked from network); 17 Oct 2005 13:46:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Oct 2005 13:46:13 -0000 Received: (qmail 65403 invoked by uid 500); 17 Oct 2005 13:46:12 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 65352 invoked by uid 500); 17 Oct 2005 13:46:12 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 65341 invoked by uid 99); 17 Oct 2005 13:46:12 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 17 Oct 2005 06:46:12 -0700 Received: (qmail 87829 invoked by uid 65534); 17 Oct 2005 13:45:51 -0000 Message-ID: <20051017134551.87828.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r325891 - in /cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal: layout/renderer/aspect/impl/WindowAspect.java transformation/HTMLEventLinkTransformer.java Date: Mon, 17 Oct 2005 13:45:49 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Mon Oct 17 06:45:43 2005 New Revision: 325891 URL: http://svn.apache.org/viewcvs?rev=325891&view=rev Log: Include coplet instance id and ignore javascript links during rewriting Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?rev=325891&r1=325890&r2=325891&view=diff ============================================================================== --- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java (original) +++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java Mon Oct 17 06:45:43 2005 @@ -68,6 +68,7 @@ XMLUtils.startElement(contenthandler, config.tagName); } XMLUtils.createElement(contenthandler, "title", copletInstanceData.getTitle()); + XMLUtils.createElement(contenthandler , "instance-id", copletInstanceData.getId()); context.invokeNext( layout, service, contenthandler ); Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java?rev=325891&r1=325890&r2=325891&view=diff ============================================================================== --- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java (original) +++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java Mon Oct 17 06:45:43 2005 @@ -201,7 +201,8 @@ return true; } final String link = attributes.getValue("href"); - if ( link != null && link.startsWith("mailto:") ) { + if ( link != null + && (link.startsWith("mailto:") || link.startsWith("javascript:") ) ) { return true; } return false;