svn commit: r1172760 - in /camel/branches/camel-2.8.x: ./ tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/ tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/

[dkulp]

Author: dkulp
Date: Mon Sep 19 19:20:21 2011
New Revision: 1172760

URL: http://svn.apache.org/viewvc?rev=1172760&view=rev
Log:
Merged revisions 1149509 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1149509 | ningjiang | 2011-07-22 05:22:15 -0400 (Fri, 22 Jul 2011) | 1 line
  
  CAMEL-4259 Add blueprint integration test for CXF endpoint
........

Added:
    
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
      - copied unchanged from r1149509, 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouterTest.java
    
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml
      - copied unchanged from r1149509, 
camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBlueprintRouter.xml
Modified:
    camel/branches/camel-2.8.x/   (props changed)

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.