Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0F22A97C8 for ; Tue, 22 Nov 2011 12:08:35 +0000 (UTC) Received: (qmail 36735 invoked by uid 500); 22 Nov 2011 12:08:35 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 36677 invoked by uid 500); 22 Nov 2011 12:08:34 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 36670 invoked by uid 99); 22 Nov 2011 12:08:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Nov 2011 12:08:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 22 Nov 2011 12:08:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DFEB323889DE for ; Tue, 22 Nov 2011 12:08:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1204943 - in /cxf/branches/2.4.x-fixes: ./ distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java Date: Tue, 22 Nov 2011 12:08:13 -0000 To: commits@cxf.apache.org From: gmazza@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111122120813.DFEB323889DE@eris.apache.org> Author: gmazza Date: Tue Nov 22 12:08:13 2011 New Revision: 1204943 URL: http://svn.apache.org/viewvc?rev=1204943&view=rev Log: Merged revisions 1204015 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1204015 | gmazza | 2011-11-19 11:31:38 -0500 (Sat, 19 Nov 2011) | 1 line stray commented-out line removed ........ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java?rev=1204943&r1=1204942&r2=1204943&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java (original) +++ cxf/branches/2.4.x-fixes/distribution/src/main/release/samples/groovy_spring_support/src/main/java/demo/spring/servlet/Server.java Tue Nov 22 12:08:13 2011 @@ -46,7 +46,6 @@ public class Server { WebAppContext webappcontext = new WebAppContext(); webappcontext.setContextPath("/"); -// webappcontext.setWar("src/main/webapp"); webappcontext.setWar("target/GroovySpringSupport.war"); HandlerCollection handlers = new HandlerCollection();