You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/12/05 11:32:33 UTC
[camel] branch master updated (05878f3 -> c1e0ae6)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 05878f3 CAMEL-15804: Fixed test
new 5392ce8 Upgrade spring security
new 8c977d0 Upgrade jetty
new c1e0ae6 CAMEL-15704: camel-csimple - Compiled simple language.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/catalog/docs/csimple-language.adoc | 49 ++++++++++++++++++++++
.../modules/languages/pages/csimple-language.adoc | 49 ++++++++++++++++++++++
.../modules/languages/pages/csimple-language.adoc | 49 ++++++++++++++++++++++
parent/pom.xml | 4 +-
4 files changed, 149 insertions(+), 2 deletions(-)
[camel] 03/03: CAMEL-15704: camel-csimple - Compiled simple
language.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c1e0ae6f25a2f0a2763a3f981818b73bbefb557c
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 5 12:32:05 2020 +0100
CAMEL-15704: camel-csimple - Compiled simple language.
---
.../camel/catalog/docs/csimple-language.adoc | 49 ++++++++++++++++++++++
.../modules/languages/pages/csimple-language.adoc | 49 ++++++++++++++++++++++
.../modules/languages/pages/csimple-language.adoc | 49 ++++++++++++++++++++++
3 files changed, 147 insertions(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
index 2108f7f..e447b63 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/csimple-language.adoc
@@ -207,6 +207,55 @@ For example the following scripts cannot compile:
${bodyAs(MyUser)?.address?.zip} > 10000
----
+== Auto imports
+
+The csimple language will automatic import from:
+
+[source,java]
+----
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.*;
+import org.apache.camel.*;
+import org.apache.camel.util.*;
+----
+
+== Configuration file
+
+You can configure the csimple language in the `camel-csimple.properties` file which is loaded from the root classpath.
+
+For example you can add additional imports in the `camel-csimple.properties` file by adding:
+
+[source,properties]
+----
+import com.foo.MyUser;
+import com.bar.*;
+import static com.foo.MyHelper.*;
+----
+
+You can also add aliases (key=value) where an alias will be used as a shorthand replacement in the code.
+
+[source,properties]
+----
+echo()=${bodyAs(String)} ${bodyAs(String)}
+----
+
+Which allows to use _echo()_ in the csimple language script such as:
+
+[source,java]
+----
+from("direct:hello")
+ .transform(csimple("Hello echo()"))
+ .log("You said ${body}");
+----
+
+The _echo()_ alias will be replaced with its value resulting in a script as:
+
+[source,java]
+----
+ .transform(csimple("Hello ${bodyAs(String)} ${bodyAs(String)}"))
+----
+
== More documentation
See the xref:simple-language.adoc[Simple] language as csimple has the same set of functions as simple language.
diff --git a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
index 2108f7f..e447b63 100644
--- a/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
+++ b/core/camel-core-languages/src/main/docs/modules/languages/pages/csimple-language.adoc
@@ -207,6 +207,55 @@ For example the following scripts cannot compile:
${bodyAs(MyUser)?.address?.zip} > 10000
----
+== Auto imports
+
+The csimple language will automatic import from:
+
+[source,java]
+----
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.*;
+import org.apache.camel.*;
+import org.apache.camel.util.*;
+----
+
+== Configuration file
+
+You can configure the csimple language in the `camel-csimple.properties` file which is loaded from the root classpath.
+
+For example you can add additional imports in the `camel-csimple.properties` file by adding:
+
+[source,properties]
+----
+import com.foo.MyUser;
+import com.bar.*;
+import static com.foo.MyHelper.*;
+----
+
+You can also add aliases (key=value) where an alias will be used as a shorthand replacement in the code.
+
+[source,properties]
+----
+echo()=${bodyAs(String)} ${bodyAs(String)}
+----
+
+Which allows to use _echo()_ in the csimple language script such as:
+
+[source,java]
+----
+from("direct:hello")
+ .transform(csimple("Hello echo()"))
+ .log("You said ${body}");
+----
+
+The _echo()_ alias will be replaced with its value resulting in a script as:
+
+[source,java]
+----
+ .transform(csimple("Hello ${bodyAs(String)} ${bodyAs(String)}"))
+----
+
== More documentation
See the xref:simple-language.adoc[Simple] language as csimple has the same set of functions as simple language.
diff --git a/docs/components/modules/languages/pages/csimple-language.adoc b/docs/components/modules/languages/pages/csimple-language.adoc
index 8337311..18d6da3 100644
--- a/docs/components/modules/languages/pages/csimple-language.adoc
+++ b/docs/components/modules/languages/pages/csimple-language.adoc
@@ -209,6 +209,55 @@ For example the following scripts cannot compile:
${bodyAs(MyUser)?.address?.zip} > 10000
----
+== Auto imports
+
+The csimple language will automatic import from:
+
+[source,java]
+----
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.stream.*;
+import org.apache.camel.*;
+import org.apache.camel.util.*;
+----
+
+== Configuration file
+
+You can configure the csimple language in the `camel-csimple.properties` file which is loaded from the root classpath.
+
+For example you can add additional imports in the `camel-csimple.properties` file by adding:
+
+[source,properties]
+----
+import com.foo.MyUser;
+import com.bar.*;
+import static com.foo.MyHelper.*;
+----
+
+You can also add aliases (key=value) where an alias will be used as a shorthand replacement in the code.
+
+[source,properties]
+----
+echo()=${bodyAs(String)} ${bodyAs(String)}
+----
+
+Which allows to use _echo()_ in the csimple language script such as:
+
+[source,java]
+----
+from("direct:hello")
+ .transform(csimple("Hello echo()"))
+ .log("You said ${body}");
+----
+
+The _echo()_ alias will be replaced with its value resulting in a script as:
+
+[source,java]
+----
+ .transform(csimple("Hello ${bodyAs(String)} ${bodyAs(String)}"))
+----
+
== More documentation
See the xref:simple-language.adoc[Simple] language as csimple has the same set of functions as simple language.
[camel] 02/03: Upgrade jetty
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8c977d0c481baf9850b7f323aa80c7415d3d6ec0
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 5 12:26:39 2020 +0100
Upgrade jetty
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ad884b..e8cfb8a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -308,7 +308,7 @@
<jedis-client-version>3.3.0</jedis-client-version>
<jersey-version>2.28</jersey-version>
<jetcd-version>0.5.4</jetcd-version>
- <jetty9-version>9.4.32.v20200930</jetty9-version>
+ <jetty9-version>9.4.35.v20201120</jetty9-version>
<jetty-version>${jetty9-version}</jetty-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
[camel] 01/03: Upgrade spring security
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5392ce8774986aabb1c6ecdad23d68faea303542
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Dec 5 12:08:28 2020 +0100
Upgrade spring security
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ce287b6..7ad884b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -513,7 +513,7 @@
<spring-version-range>[5,6)</spring-version-range>
<spring-version>${spring5-version}</spring-version>
<spring5-version>5.3.1</spring5-version>
- <spring-security-version>5.4.1</spring-security-version>
+ <spring-security-version>5.4.2</spring-security-version>
<spring-ws-version>3.0.10.RELEASE</spring-ws-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.7</squareup-okhttp-version>