svn commit: r768302 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/processor/interceptor/ components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/ tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/

[ni...@apache.org]

Author: ningjiang
Date: Fri Apr 24 13:20:22 2009
New Revision: 768302

URL: http://svn.apache.org/viewvc?rev=768302&view=rev
Log:
CAMEL-1559 Added the file which I missed in last commit

Added:
    camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform_with_headers.xquery
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java?rev=768302&r1=768301&r2=768302&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/HandleFault.java Fri Apr 24 13:20:22 2009
@@ -34,10 +34,10 @@
     }
 
     /**
-     * A helper method to return the StreamCaching instance
+     * A helper method to return the HandleFault instance
      * for a given {@link org.apache.camel.CamelContext} if one is enabled
      *
-     * @param context the camel context the stream cache is connected to
+     * @param context the camel context the handlefault intercept strategy is connected to
      * @return the stream cache or null if none can be found
      */
     public static HandleFault getHandleFault(CamelContext context) {

Added: camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform_with_headers.xquery
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform_with_headers.xquery?rev=768302&view=auto
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform_with_headers.xquery (added)
+++ camel/trunk/components/camel-saxon/src/test/resources/org/apache/camel/component/xquery/transform_with_headers.xquery Fri Apr 24 13:20:22 2009
@@ -0,0 +1,4 @@
+declare variable $in.headers.foo as xs:string external;
+<transformed sender="{$in.headers.foo}" subject="{mail/subject}">
+{.}
+</transformed>
\ No newline at end of file

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java?rev=768302&r1=768301&r2=768302&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTest.java Fri Apr 24 13:20:22 2009
@@ -40,6 +40,7 @@
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.mavenConfiguration;
 import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.MavenUtils.asInProject;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.logProfile;
@@ -93,7 +94,11 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
     
             // lets deploy the bundles we need
-            mavenBundleAsInProject("org.apache.camel", "camel-core"),
+            //mavenBundleAsInProject("org.apache.camel", "camel-core"),
+            
+            scanFeatures( "file:src/test/resources/features-2.0-SNAPSHOT-features.xml",
+                          "camel-core"),
+               
             
             knopflerfish(), felix(), equinox());