Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 90308 invoked from network); 9 Jun 2006 12:51:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 9 Jun 2006 12:51:11 -0000 Received: (qmail 48449 invoked by uid 500); 9 Jun 2006 12:51:09 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 48407 invoked by uid 500); 9 Jun 2006 12:51:09 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 48390 invoked by uid 99); 9 Jun 2006 12:51:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 05:51:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 05:51:08 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 9F6461A983A; Fri, 9 Jun 2006 05:50:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r413034 - in /portals/jetspeed-2/trunk: components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java src/webapp/WEB-INF/assembly/ajax.xml Date: Fri, 09 Jun 2006 12:50:48 -0000 To: jetspeed-dev@portals.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060609125048.9F6461A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ate Date: Fri Jun 9 05:50:47 2006 New Revision: 413034 URL: http://svn.apache.org/viewvc?rev=413034&view=rev Log: (optionally) providing the VelocityEngine used by AJAXServiceImpl through Spring, thereby also providing proper Velocity logging (JS2-543) See: http://issues.apache.org/jira/browse/JS2-543 Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java?rev=413034&r1=413033&r2=413034&view=diff ============================================================================== --- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java (original) +++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/ajax/AJAXServiceImpl.java Fri Jun 9 05:50:47 2006 @@ -49,8 +49,13 @@ public AJAXServiceImpl(Map serviceToBeans) { - this.serviceToBeans = serviceToBeans; - + this.serviceToBeans = serviceToBeans; + } + + public AJAXServiceImpl(Map serviceToBeans, VelocityEngine engine) + { + this.serviceToBeans = serviceToBeans; + this.engine = engine; } public AJAXResponse processRequest(AJAXRequest request) Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml?rev=413034&r1=413033&r2=413034&view=diff ============================================================================== --- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml (original) +++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/ajax.xml Fri Jun 9 05:50:47 2006 @@ -43,6 +43,21 @@ + + + + + + org.apache.jetspeed.webapp.logging.velocity.CommonsLoggingLog4JLogSystem + velocity + + + + + + false + + --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org