This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 723e5d4 Delete documentation of the Scala DSL which was removed in
Camel 3.
723e5d4 is described below
commit 723e5d4d4880a0c815849c2232081d1026b09e18
Author: Pascal Schumacher <pascalschumac...@gmx.net>
AuthorDate: Thu Sep 12 11:28:40 2019 +0200
Delete documentation of the Scala DSL which was removed in Camel 3.
---
.../modules/ROOT/pages/camel-maven-archetypes.adoc | 11 ----
docs/user-manual/modules/ROOT/pages/dsl.adoc | 2 -
.../ROOT/pages/error-handling-in-camel.adoc | 2 +-
.../faq/how-does-camel-compare-to-synapse.adoc | 4 +-
.../ROOT/pages/faq/using-camel-core-testsjar.adoc | 3 +-
.../modules/ROOT/pages/faq/what-is-camel.adoc | 6 +-
...se-when-or-otherwise-in-a-java-camel-route.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/index.adoc | 1 -
.../ROOT/pages/scala-dsl-getting-started.adoc | 66 --------------------
.../ROOT/pages/scala-dsl-supported-languages.adoc | 29 ---------
docs/user-manual/modules/ROOT/pages/scala-dsl.adoc | 72 ----------------------
.../spring-boot/components-starter/README.adoc | 1 -
12 files changed, 8 insertions(+), 191 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
b/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
index 12c1719..d820a96 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-maven-archetypes.adoc
@@ -24,13 +24,6 @@ there is a component missing in Camel that you want to
create yourself.
new Maven project for Camel routes in the Java Container using CDI to
configure components, endpoints and beans
-|camel-archetype-[line-through]*component-scala*
-|[line-through]*Deprecated. Camel 2.10:* This archetype is used for
-creating a new Maven project for Camel xref:components::index.adoc[Components]
-using Scala. Use this if there is a component missing in Camel that you
-want to create yourself. Removed from Camel 2.16
-onwards.
-
|[line-through]*camel-archetype-cxf-code-first-blueprint*
|[line-through]*Deprecated. Camel 2.12.2:* This archetype is used
creating a new Maven project for Camel with
xref:components::cxf-component.adoc[CXF] exposing
@@ -54,10 +47,6 @@ a new Maven project for Camel using Groovy DSL.
|camel-archetype-java |This archetype is used to create a new Maven
project for Camel routes using Java DSL.
-|camel-archetype-scala |This archetype is used to create a new Maven
-projects for building Camel routes in the xref:scala-dsl.adoc[Scala
-DSL].
-
|camel-archetype-scr |This archetype is used to create a new Maven
project for building Camel routes using OSGI SCR Declarative Services
diff --git a/docs/user-manual/modules/ROOT/pages/dsl.adoc
b/docs/user-manual/modules/ROOT/pages/dsl.adoc
index f311d65..925d4a0 100644
--- a/docs/user-manual/modules/ROOT/pages/dsl.adoc
+++ b/docs/user-manual/modules/ROOT/pages/dsl.adoc
@@ -15,8 +15,6 @@ DSL in OSGi Blueprint XML files
REST style in either Java or XML.
* xref:groovy-dsl.adoc[Groovy DSL] - A Groovy based DSL using Groovy
programming language
-* xref:scala-dsl.adoc[Scala DSL] - A Scala based DSL using Scala
-programming language
* xref:bean-integration.adoc[Annotation DSL] - Use annotations in Java
beans.
* https://github.com/koolio/kool/tree/master/kool-camel[Kotlin DSL] -
diff --git a/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
b/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
index f3a0f66..157497e 100644
--- a/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/error-handling-in-camel.adoc
@@ -98,7 +98,7 @@ Camel supports 2 scopes that is determined by the DSL in use:
|DSL |Scope 1 |Scope 2 |Note
|XML DSL |CamelContext |route |Scope 2 takes precedence over scope 1
-|Java/Scala DSL |RouteBuilder |route |Scope 2 takes precedence over
+|Java DSL |RouteBuilder |route |Scope 2 takes precedence over
scope 1
|=======================================================================
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
index 59fc82c..c8baf1b 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/how-does-camel-compare-to-synapse.adoc
@@ -22,8 +22,8 @@ http://www.nabble.com/Apache-f90.html[very popular too].
* Camel is designed from the ground up around
xref:enterprise-integration-patterns.adoc[Enterprise Integration
Patterns] -- having an EIP pattern language implemented in
-xref:dsl.adoc[Java], xref:components::spring.adoc[Spring XML],
-xref:scala-dsl.adoc[Scala] and xref:groovy-dsl.adoc[Groovy].
+xref:dsl.adoc[Java], xref:components::spring.adoc[Spring XML]
+and xref:groovy-dsl.adoc[Groovy].
* Camel is designed to work with pretty much all kinds of
xref:transport.adoc[transport] as well as working with any
xref:data-format.adoc[Data Format]. When we first looked at Synapse it
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
b/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
index 9181911..9da9824 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/using-camel-core-testsjar.adoc
@@ -3,8 +3,7 @@
The `camel-core-tests.jar` is *not* for usage for Camel end users. This
JAR is only used internally by Camel itself when it tests the same unit
-tests using different DSL such as Spring XML, Blueprint XML, Scala DSL,
-etc.
+tests using different DSL such as Spring XML, Blueprint XML, etc.
End users who need a test kit should use `camel-test`
JARs instead. See more here xref:testing.adoc[Testing].
diff --git a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
index 2d7ce08..962577a 100644
--- a/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
+++ b/docs/user-manual/modules/ROOT/pages/faq/what-is-camel.adoc
@@ -9,9 +9,9 @@ Camel empowers you to define routing and mediation rules in a
variety of
domain-specific languages, including a Java-based xref:dsl.adoc[Fluent
API], xref:spring.adoc[Spring] or
xref:using-osgi-blueprint-with-camel.adoc[Blueprint]
-xref:xml-configuration.adoc[XML Configuration] files, and a
-xref:scala-dsl.adoc[Scala DSL]. This means you get smart completion of
-routing rules in your IDE, whether in a Java, Scala or XML editor.
+xref:xml-configuration.adoc[XML Configuration] files.
+This means you get smart completion of
+routing rules in your IDE, whether in a Java or XML editor.
Apache Camel uses xref:uris.adoc[URIs] to work directly with any kind of
xref:transport.adoc[Transport] or messaging model such as
diff --git
a/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
b/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
index cd1e705..f0c2581 100644
---
a/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
+++
b/docs/user-manual/modules/ROOT/pages/faq/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc
@@ -56,7 +56,7 @@ from("direct:start")
But the code will still not compile. The reason is we have stretched how
far we can take the good old Java language in terms of
xref:dsl.adoc[DSL]. In a more modern language such as
-xref:scala-dsl.adoc[Scala] or xref:groovy-dsl.adoc[Groovy] you would be able
+Scala or xref:groovy-dsl.adoc[Groovy] you would be able
to let it be stack based, so the `.end()` will pop the last type of the
stack, and you would return back to the scope of the
xref:content-based-router-eip.adoc[Content Based Router]. However that's not
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc
b/docs/user-manual/modules/ROOT/pages/index.adoc
index 25192ba..a18351b 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -127,7 +127,6 @@ camel routes without them knowing
* xref:using-osgi-blueprint-with-camel.adoc[Blueprint DSL]
* xref:rest-dsl.adoc[Rest DSL]
* xref:groovy-dsl.adoc[Groovy DSL]
-* xref:scala-dsl.adoc[Scala DSL]
* xref:bean-integration.adoc[Annotation DSL]
* Kotlin DSL
diff --git a/docs/user-manual/modules/ROOT/pages/scala-dsl-getting-started.adoc
b/docs/user-manual/modules/ROOT/pages/scala-dsl-getting-started.adoc
deleted file mode 100644
index 6182871..0000000
--- a/docs/user-manual/modules/ROOT/pages/scala-dsl-getting-started.adoc
+++ /dev/null
@@ -1,66 +0,0 @@
-= Scala DSL - Getting Started
-
-Just like the Java DSL, the Scala DSL has a RouteBuilder
-class (`org.apache.camel.scala.dsl.builder.RouteBuilder`) that you can
-extend to implement your own routes. This example shows two very simple
-routes:
-
-[source,java]
-----------------------------------------------------------
-class MyRouteBuilder extends RouteBuilder {
- "direct:a" --> "mock:a"
- "direct:b" to "mock:b"
-}
-----------------------------------------------------------
-
-INFO: From *Camel 2.15* onwards use
-org.apache.camel.scala.dsl.builder.ScalaRouteBuilder and pass in the
-CamelContext in the constructor, which will be used by the builder. The
-old class RouteBuilder is deprecated.
-
-
-If you compare this to the Java DSL, you notice:
-
-* there is no configure() method to override
-* a route starts directly with a URI instead of `from(uri)`
-* `→` is just an alias for `to`
-
-[[ScalaDSL-GettingStarted-SettingtherouteID]]
-Setting the route ID
---------------------
-
-To assign the unique ID to the Scala route, insert the `routeId` method
-invocation after the "from" part of the DSL.
-
-[source,java]
------------------------------------------
- "direct:a" routeId "route-b" to "mock:b"
------------------------------------------
-
-[[ScalaDSL-GettingStarted-CreatinganewCamelScalaproject]]
-Creating a new Camel Scala project
-----------------------------------
-
-Camel offers Maven archetypes that
-allow you to quickly setup a new project.
-
-To do this, you can execute the following Maven goal from the command
-line (using Maven 3.0.3 or better):
-
-[source,java]
-----------------------
-mvn archetype:generate
-----------------------
-
-This runs Maven interactively - just type `camel` and press <Enter> to
-filter for Camel-related archetypes. +
- From the list, pick the number for `camel-archetype-scala`, then fill
-in the remaining details (such as the Camel version, _et cetera_).
-
-The generated project has a "readme" file with more instructions, and is
-ready to compile and run from Maven using:
-
-[source,java]
----------------------
-mvn compile exec:java
----------------------
diff --git
a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
b/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
deleted file mode 100644
index a1e01a2..0000000
--- a/docs/user-manual/modules/ROOT/pages/scala-dsl-supported-languages.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-= Scala DSL - Supported languages
-
-Support for other languages inside the Scala DSL
-routes is delivered through traits. The
-`org.apache.camel.scala.dsl.languages` package currently offers traits
-to support XPath. To use any given language, you can mix-in the trait
-when creating your `RouteBuilder`.
-
-You can use any of the supported Camel Languages in
-the Scala DSL; see below for a couple of examples:
-
-[[ScalaDSL-Supportedlanguages-Using]]
-Using xref:components::xpath-language.adoc[XPath]
-
-With the XPath trait, you have an additional method available on an
-`Exchange` to do XPath queries against the message. Just look at this
-Splitter example, where the `xpath` method is used in a
-`Exchange ⇒ Any*` function literal
-
-[source,java]
-----------------------------------------------------------
-"direct:b" ==> {
- as(classOf[Document])
- split(xpath("/persons/person")) {
- to("mock:b")
- to("mock:c")
- }
-}
-----------------------------------------------------------
diff --git a/docs/user-manual/modules/ROOT/pages/scala-dsl.adoc
b/docs/user-manual/modules/ROOT/pages/scala-dsl.adoc
deleted file mode 100644
index ff7a144..0000000
--- a/docs/user-manual/modules/ROOT/pages/scala-dsl.adoc
+++ /dev/null
@@ -1,72 +0,0 @@
-[[ScalaDSL-AbouttheScalaDSL]]
-= About the Scala DSL
-
-http://www.scala-lang.org/[Scala] is a general purpose programming
-language designed to express common programming patterns in a concise,
-elegant, and type-safe way. It integrates very well with the Java
-platform. Our Scala DSL implementation is built on top of the existing
-Java-based DSL, but it adds Scala syntax sugar to make
-building routes even more convenient.
-
-[[ScalaDSL-Documentation]]
-== Documentation
-
-* Scala DSL - Getting Started gives
-you basic information on how to use the Scala DSL.
-* Scala DSL - EIP shows you the Scala DSL
-syntax for every EIP supported. Scala DSL supports
-every EIP from the Java DSL.
-* xref:scala-dsl-supported-languages.adoc[Scala DSL - Supported
-languages] explains the usage of traits to add support for other
-languages (e.g. XPath)
-
-[[ScalaDSL-References]]
-== References
-
-* At http://www.eu.apachecon.com[ApacheCon Europe 2008] there was a Fast
-Feather talk that introduced some of the basic Scala language concepts
-that are being used for building the Scala DSL.
-http://www.anova.be/files/camel-scala.pdf[Here are the presentation
-slides] .
-* Here's a
-http://davsclaus.blogspot.se/2011/12/apache-camel-little-scala-dsl-example.html[blog
-post] demonstrating the Message Filter EIP
-within the Scala DSL, as well as how to use
-Camel's test kit to test the example.
-
-[[ScalaDSL-Dependencies]]
-== Dependencies
-
-To use the Scala DSL in your camel routes you need to add the a
-dependency on *camel-scala* which implements the Scala DSL.
-
-If you use maven you could just add the following to your pom.xml,
-substituting the version number for the latest & greatest release (see
-the download page for the latest versions).
-
-[source,xml]
-----------------------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-scala</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----------------------------------------------------------
-
-Starting from version 2.11 Camel Scala DSL is compiled against Scala
-2.10. If you plan to use Scala 2.9 with Camel 2.11, add the following to
-your pom.xml file instead.
-
-[source,xml]
-----------------------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-scala_2.9</artifactId>
- <version>2.11.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-----------------------------------------------------------
-
-Support for Scala 2.9 is deprecated and will be removed starting from
-the Camel 2.12 and 3.0.
diff --git a/platforms/spring-boot/components-starter/README.adoc
b/platforms/spring-boot/components-starter/README.adoc
index d0ee29b..a09b2b1 100644
--- a/platforms/spring-boot/components-starter/README.adoc
+++ b/platforms/spring-boot/components-starter/README.adoc
@@ -20,7 +20,6 @@ The following components do not have a starter because of
compatibility issues:
* **camel-eventadmin** (intended for OSGi only)
* **camel-ibatis** (`camel-mybatis-starter` is included)
* **camel-paxlogging** (intended for OSGi only)
-* **camel-scala**
* **camel-scr** (intended for OSGi only)
* **camel-spark-rest**
* **camel-swagger** (`camel-swagger-java-starter` is included)
