svn commit: r1311635 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/blueprint/

[ay]

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;
     }