Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 15702 invoked from network); 15 Aug 2008 15:51:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Aug 2008 15:51:51 -0000 Received: (qmail 16741 invoked by uid 500); 15 Aug 2008 15:51:50 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 16680 invoked by uid 500); 15 Aug 2008 15:51:50 -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 16671 invoked by uid 99); 15 Aug 2008 15:51:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2008 08:51:50 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Aug 2008 15:51:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 994562388988; Fri, 15 Aug 2008 08:51:00 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r686258 - in /cocoon/trunk/subprojects/cocoon-jnet/src: changes/changes.xml main/java/org/apache/cocoon/jnet/URLHandlerFactoryCollector.java Date: Fri, 15 Aug 2008 15:51:00 -0000 To: cvs@cocoon.apache.org From: gkossakowski@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080815155100.994562388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gkossakowski Date: Fri Aug 15 08:50:59 2008 New Revision: 686258 URL: http://svn.apache.org/viewvc?rev=686258&view=rev Log: Splitted installURLHandlers into different public methods so URLHandlerFactoryCollector can be used directly from Java code and not only as AOP advice. Modified: cocoon/trunk/subprojects/cocoon-jnet/src/changes/changes.xml cocoon/trunk/subprojects/cocoon-jnet/src/main/java/org/apache/cocoon/jnet/URLHandlerFactoryCollector.java Modified: cocoon/trunk/subprojects/cocoon-jnet/src/changes/changes.xml URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-jnet/src/changes/changes.xml?rev=686258&r1=686257&r2=686258&view=diff ============================================================================== --- cocoon/trunk/subprojects/cocoon-jnet/src/changes/changes.xml (original) +++ cocoon/trunk/subprojects/cocoon-jnet/src/changes/changes.xml Fri Aug 15 08:50:59 2008 @@ -27,6 +27,12 @@ Changes Cocoon JNet + + + Splitted installURLHandlers into different public methods so URLHandlerFactoryCollector + can be used directly from Java code and not only as AOP advice. + + Initial creation. Modified: cocoon/trunk/subprojects/cocoon-jnet/src/main/java/org/apache/cocoon/jnet/URLHandlerFactoryCollector.java URL: http://svn.apache.org/viewvc/cocoon/trunk/subprojects/cocoon-jnet/src/main/java/org/apache/cocoon/jnet/URLHandlerFactoryCollector.java?rev=686258&r1=686257&r2=686258&view=diff ============================================================================== --- cocoon/trunk/subprojects/cocoon-jnet/src/main/java/org/apache/cocoon/jnet/URLHandlerFactoryCollector.java (original) +++ cocoon/trunk/subprojects/cocoon-jnet/src/main/java/org/apache/cocoon/jnet/URLHandlerFactoryCollector.java Fri Aug 15 08:50:59 2008 @@ -33,21 +33,28 @@ public Object installURLHandlers(ProceedingJoinPoint proceedingJoinPoint) throws Throwable { try { - if (!this.urlStreamHandlerInstalled) { - URLStreamHandlerFactoryInstaller.setURLStreamHandlerFactory(new DynamicURLStreamHandlerFactory()); - this.urlStreamHandlerInstalled = true; - } - - for (Iterator i = this.urlHandlerFactories.values().iterator(); i.hasNext();) { - URLStreamHandlerFactory streamHandlerFactory = (URLStreamHandlerFactory) i.next(); - DynamicURLStreamHandlerFactory.push(streamHandlerFactory); - } - + pushUrlHandlerFactories(); return proceedingJoinPoint.proceed(); } finally { - for (Iterator i = this.urlHandlerFactories.values().iterator(); i.hasNext(); i.next()) { - DynamicURLStreamHandlerFactory.pop(); - } + popUrlHandlerFactories(); + } + } + + public void pushUrlHandlerFactories() throws Exception { + if (!this.urlStreamHandlerInstalled) { + URLStreamHandlerFactoryInstaller.setURLStreamHandlerFactory(new DynamicURLStreamHandlerFactory()); + this.urlStreamHandlerInstalled = true; + } + + for (Iterator i = this.urlHandlerFactories.values().iterator(); i.hasNext();) { + URLStreamHandlerFactory streamHandlerFactory = (URLStreamHandlerFactory) i.next(); + DynamicURLStreamHandlerFactory.push(streamHandlerFactory); + } + } + + public void popUrlHandlerFactories() { + for (Iterator i = this.urlHandlerFactories.values().iterator(); i.hasNext(); i.next()) { + DynamicURLStreamHandlerFactory.pop(); } }