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 8F8FA9C20 for ; Tue, 10 Apr 2012 08:37:47 +0000 (UTC) Received: (qmail 13312 invoked by uid 500); 10 Apr 2012 08:37:47 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 13144 invoked by uid 500); 10 Apr 2012 08:37:44 -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 13124 invoked by uid 99); 10 Apr 2012 08:37:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2012 08:37:43 +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, 10 Apr 2012 08:37:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 29C9A238896F; Tue, 10 Apr 2012 08:37:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1311635 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/ Date: Tue, 10 Apr 2012 08:37:20 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120410083720.29C9A238896F@eris.apache.org> Author: ay Date: Tue Apr 10 08:37:19 2012 New Revision: 1311635 URL: http://svn.apache.org/viewvc?rev=1311635&view=rev Log: Merged revisions 1310076 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1310076 | ay | 2012-04-05 23:31:25 +0200 (Thu, 05 Apr 2012) | 1 line [CXF-4084] Http Blueprint (Destination) ........ Added: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java - copied unchanged from r1310076, cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpDestinationBPBeanDefinitionParser.java Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java Propchange: cxf/branches/2.5.x-fixes/ ('svn:mergeinfo' removed) Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java?rev=1311635&r1=1311634&r2=1311635&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java (original) +++ cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/HttpBPHandler.java Tue Apr 10 08:37:19 2012 @@ -56,7 +56,10 @@ public class HttpBPHandler implements Na if ("conduit".equals(s)) { return new HttpConduitBPBeanDefinitionParser().parse(element, context); + } else if ("destination".equals(s)) { + return new HttpDestinationBPBeanDefinitionParser().parse(element, context); } + return null; }