Author: davsclaus
Date: Thu Jan 31 12:27:31 2013
New Revision: 1440929

URL: http://svn.apache.org/viewvc?rev=1440929&view=rev
Log:
CAMEL-4629: Languages can now load script from external resource, such as file 
or classpath.

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadScriptFromClasspathTest.java
      - copied, changed from r1440896, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java?rev=1440929&r1=1440928&r2=1440929&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/language/LanguageComponent.java
 Thu Jan 31 12:27:31 2013
@@ -34,6 +34,8 @@ import org.apache.camel.util.ResourceHel
  */
 public class LanguageComponent extends DefaultComponent {
 
+    public static final String RESOURCE = "resource:";
+
     protected Endpoint createEndpoint(String uri, String remaining, 
Map<String, Object> parameters) throws Exception {
         String name = ObjectHelper.before(remaining, ":");
         String script = ObjectHelper.after(remaining, ":");
@@ -49,10 +51,14 @@ public class LanguageComponent extends D
 
         Expression expression = null;
         String resourceUri = null;
-        if (script != null) {
-            if (ResourceHelper.hasScheme(script)) {
+        String resource = script;
+        if (resource != null) {
+            if (resource.startsWith(RESOURCE)) {
+                resource = resource.substring(RESOURCE.length());
+            }
+            if (ResourceHelper.hasScheme(resource)) {
                 // the script is a uri for a resource
-                resourceUri = script;
+                resourceUri = resource;
             } else {
                 // the script is provided as text in the uri, so decode to 
utf-8
                 expression = 
language.createExpression(URLDecoder.decode(script, "UTF-8"));

Copied: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadScriptFromClasspathTest.java
 (from r1440896, 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java)
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadScriptFromClasspathTest.java?p2=camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadScriptFromClasspathTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java&r1=1440896&r2=1440929&rev=1440929&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromClasspathTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/language/LanguageResourceLoadScriptFromClasspathTest.java
 Thu Jan 31 12:27:31 2013
@@ -16,21 +16,12 @@
  */
 package org.apache.camel.component.language;
 
-import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
 
 /**
  * @version 
  */
-public class LanguageLoadScriptFromClasspathTest extends ContextTestSupport {
-
-    public void testLanguage() throws Exception {
-        getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
-
-        template.sendBody("direct:start", "World");
-
-        assertMockEndpointsSatisfied();
-    }
+public class LanguageResourceLoadScriptFromClasspathTest extends 
LanguageLoadScriptFromClasspathTest {
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
@@ -40,7 +31,7 @@ public class LanguageLoadScriptFromClass
                 // START SNIPPET: e1
                 from("direct:start")
                     // load the script from the classpath
-                    
.to("language:simple:classpath:org/apache/camel/component/language/mysimplescript.txt")
+                    
.to("language:simple:resource:classpath:org/apache/camel/component/language/mysimplescript.txt")
                     .to("mock:result");
                 // END SNIPPET: e1
             }


Reply via email to