This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4078973eb78945a88744f081f3e1dcb9c87e81a
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Wed Apr 21 09:09:01 2021 +0200
Moving from master branch to main branch
---
.../modules/ROOT/pages/componentconfiguration.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/expression.adoc | 4 ++--
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/predicate.adoc | 4 ++--
docs/user-manual/modules/ROOT/pages/registry.adoc | 8 ++++----
docs/user-manual/modules/ROOT/pages/spring-example.adoc | 6 +++---
docs/user-manual/modules/ROOT/pages/spring-testing.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/testing.adoc | 14 +++++++-------
8 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
b/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
index a3ed3cb..3962f0d 100644
--- a/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
+++ b/docs/user-manual/modules/ROOT/pages/componentconfiguration.adoc
@@ -10,7 +10,7 @@ editting of Camel routes for example).
To get an idea for the kinds of things you can do with the
ComponentConfiguration API
-https://github.com/apache/camel/blob/master/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java#L72[check
+https://github.com/apache/camel/blob/main/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java#L72[check
out the test case].
For example given a Component object you can create a new configuration;
diff --git a/docs/user-manual/modules/ROOT/pages/expression.adoc
b/docs/user-manual/modules/ROOT/pages/expression.adoc
index f8fa2d1..61fa147 100644
--- a/docs/user-manual/modules/ROOT/pages/expression.adoc
+++ b/docs/user-manual/modules/ROOT/pages/expression.adoc
@@ -110,8 +110,8 @@ xref:components:languages:groovy-language.adoc[Groovy] |
|xref:components::sql-component.adoc[SQL] |
-|xref:components:languages:xpath-language.adoc[XPath]
|https://github.com/apache/camel/blob/master/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java[org.apache.camel.builder.xml.XPathBuilder]
+|xref:components:languages:xpath-language.adoc[XPath]
|https://github.com/apache/camel/blob/main/components/camel-xpath/src/main/java/org/apache/camel/language/xpath/XPathBuilder.java[org.apache.camel.builder.xml.XPathBuilder]
-|xref:components::xquery-component.adoc[XQuery]
|https://github.com/apache/camel/blob/master/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java[org.apache.camel.builder.saxon.XQueryBuilder]
+|xref:components::xquery-component.adoc[XQuery]
|https://github.com/apache/camel/blob/main/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java[org.apache.camel.builder.saxon.XQueryBuilder]
|=======================================================================
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc
b/docs/user-manual/modules/ROOT/pages/index.adoc
index e4c2301..7800c2e 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -29,7 +29,7 @@ For a deeper and better understanding of Apache Camel, an
xref:faq:what-is-camel
* xref:getting-started.adoc[Getting Started]
* xref:book-getting-started.adoc[Longer Getting Started Guide]
* xref:faq:index.adoc[FAQ]
-* https://github.com/apache/camel/blob/master/NOTICE.txt[Legal Notice]
+* https://github.com/apache/camel/blob/main/NOTICE.txt[Legal Notice]
== Documentation
diff --git a/docs/user-manual/modules/ROOT/pages/predicate.adoc
b/docs/user-manual/modules/ROOT/pages/predicate.adoc
index 9a0b722..6237f2f 100644
--- a/docs/user-manual/modules/ROOT/pages/predicate.adoc
+++ b/docs/user-manual/modules/ROOT/pages/predicate.adoc
@@ -173,9 +173,9 @@ xref:parameter-binding-annotations.adoc[Annotation Based
Expression Language].
You can easily write your own plugin predicate by implementing the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/Predicate.java[Predicate
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/Predicate.java[Predicate
interface].
There are also a number of helper builders available such as the
-https://github.com/apache/camel/blob/master/core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java[PredicateBuilder
+https://github.com/apache/camel/blob/main/core/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java[PredicateBuilder
class]
diff --git a/docs/user-manual/modules/ROOT/pages/registry.adoc
b/docs/user-manual/modules/ROOT/pages/registry.adoc
index 1eace73..0f36648 100644
--- a/docs/user-manual/modules/ROOT/pages/registry.adoc
+++ b/docs/user-manual/modules/ROOT/pages/registry.adoc
@@ -2,16 +2,16 @@
= Registry
Camel supports a pluggable
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/spi/Registry.java[Registry]
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/spi/Registry.java[Registry]
plugin strategy. This allows Camel to easily work with some kind of
registry like
-*
https://github.com/apache/camel/blob/master/core/camel-support/src/main/java/org/apache/camel/support/SimpleRegistry.java[SimpleRegistry]
+*
https://github.com/apache/camel/blob/main/core/camel-support/src/main/java/org/apache/camel/support/SimpleRegistry.java[SimpleRegistry]
which is a simple `java.util.Map` based registry.
-*
https://github.com/apache/camel/blob/master/core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java[JndiRegistry]
+*
https://github.com/apache/camel/blob/main/core/camel-core-engine/src/main/java/org/apache/camel/impl/JndiRegistry.java[JndiRegistry]
which uses the JNDI InitialContext as the registry
You can also access the Registry from the
CamelContext via the
-https://github.com/apache/camel/blob/master/core/camel-api/src/main/java/org/apache/camel/CamelContext.java#L690[camelContext.getRegistry()
+https://github.com/apache/camel/blob/main/core/camel-api/src/main/java/org/apache/camel/CamelContext.java#L690[camelContext.getRegistry()
method]
diff --git a/docs/user-manual/modules/ROOT/pages/spring-example.adoc
b/docs/user-manual/modules/ROOT/pages/spring-example.adoc
index 1ce2641..2c1ba15 100644
--- a/docs/user-manual/modules/ROOT/pages/spring-example.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring-example.adoc
@@ -19,7 +19,7 @@ mvn camel:run
What this does is boot up the Spring ApplicationContext defined in the
file
-https://github.com/apache/camel/blob/master/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[META-INF/spring/camel-context.xml]
+https://github.com/apache/camel/blob/main/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[META-INF/spring/camel-context.xml]
on the classpath. This is a regular Spring XML document which uses the
Camel link:xml-configuration.html[Xml Configuration] to configure a
link:camelcontext.html[CamelContext]. Notice how the <camelContext>
@@ -36,7 +36,7 @@ The packages attribute defines the comma separated list of
Java package
names which are recursively searched for Java classes on the classpath
which implement the xref:route-builder.adoc[RouteBuilder] interface. What
this means is that Camel will automatically detect our
-https://github.com/apache/camel/blob/master/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java[MyRouteBuilder
+https://github.com/apache/camel/blob/main/examples/camel-example-spring/src/main/java/org/apache/camel/example/spring/MyRouteBuilder.java[MyRouteBuilder
class] and automatically install its routes. Of course, in practice you
should not specify org.apache.camel (or a sub package of this) as the
package name because this will instruct Camel to search in its own
@@ -49,6 +49,6 @@ of XML bloat. Of course if you prefer you can create all of
your routes
in the xref:xml-configuration.adoc[Xml Configuration].
Also note at the end of this
-https://github.com/apache/camel/blob/master/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[XML
+https://github.com/apache/camel/blob/main/examples/camel-example-spring/src/main/resources/META-INF/spring/camel-context.xml[XML
example file] we explicitly configure the
xref:components::activemq-component.adoc[ActiveMQ]
component with details of how to connect to the broker.
diff --git a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
index 30a0aeb..6db8de1 100644
--- a/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/spring-testing.adoc
@@ -236,7 +236,7 @@ details on the registration of the mock endpoints. |Not
enabled |All endpoints a
|org.apache.camel.test.spring.MockEndpointsAndSkip |Class |Triggers the
auto-mocking of endpoints whose URIs match the provided
filter. The default filter is "*", which matches all endpoints.
- See
https://github.com/apache/camel/blob/master/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java[org.apache.camel.impl.InterceptSendToMockEndpointStrategy]
for more
+ See
https://github.com/apache/camel/blob/main/camel-core/src/main/java/org/apache/camel/impl/InterceptSendToMockEndpointStrategy.java[org.apache.camel.impl.InterceptSendToMockEndpointStrategy]
for more
details on the registration of the mock endpoints. This annotation will
also skip sending the message to matched endpoints as well. |Not enabled |All
endpoints are sniffed and recorded in a mock endpoint. The original
endpoint is not invoked.
diff --git a/docs/user-manual/modules/ROOT/pages/testing.adoc
b/docs/user-manual/modules/ROOT/pages/testing.adoc
index 5ffedcf..5885b23 100644
--- a/docs/user-manual/modules/ROOT/pages/testing.adoc
+++ b/docs/user-manual/modules/ROOT/pages/testing.adoc
@@ -76,7 +76,7 @@ injection annotations].
=== Camel Test Example
Here is the Camel Test
-https://github.com/apache/camel/blob/master/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java[example]:
+https://github.com/apache/camel/blob/main/core/camel-core/src/test/java/org/apache/camel/processor/FilterTest.java[example]:
[source,java]
----
@@ -91,7 +91,7 @@ overrides the `createRouteBuilder()` method.
=== CDI Test Example
Here is the CDI Testing
-https://github.com/apache/camel/blob/master/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java[example]:
+https://github.com/apache/camel/blob/main/components/camel-test-cdi/src/test/java/org/apache/camel/test/cdi/FilterTest.java[example]:
[source,java]
----
@@ -105,7 +105,7 @@ and the test classes that come with it.
=== Spring Test with XML Config Example
Here is the Spring Testing
-https://github.com/apache/camel/blob/master/components/camel-spring-xml/src/test/java/org/apache/camel/spring/patterns/FilterTest.java[example
+https://github.com/apache/camel/blob/main/components/camel-spring-xml/src/test/java/org/apache/camel/spring/patterns/FilterTest.java[example
using XML Config]:
[source,java]
@@ -121,7 +121,7 @@ sending to an endpoint that is then reused in another test
method).
Also notice the use of `@ContextConfiguration` to indicate that by
default we should look for the
-https://github.com/apache/camel/blob/master/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml[`FilterTest-context.xml`
+https://github.com/apache/camel/blob/main/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml[`FilterTest-context.xml`
on the classpath] to configure the test case which looks like this:
[source,xml]
@@ -133,7 +133,7 @@
include::{examplesdir}/components/camel-spring-xml/src/test/resources/org/apache
=== Spring Test with Java Config Example
Here is the Spring Testing
-https://github.com/apache/camel/blob/master/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java[example
+https://github.com/apache/camel/blob/main/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/patterns/FilterTest.java[example
using Java Config]:
[source,java]
@@ -159,7 +159,7 @@ register the RouteBuilder we create.
Since *Camel 2.11.0* you can use the `CamelSpringJUnit4ClassRunner` with
`CamelSpringDelegatingTestContextLoader` like
-https://github.com/apache/camel/blob/master/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java[example
+https://github.com/apache/camel/blob/main/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/test/CamelSpringDelegatingTestContextLoaderTest.java[example
using Java Config with `CamelSpringJUnit4ClassRunner`]:
Since *Camel 2.18.0* `CamelSpringJUnit4ClassRunner` is deprecated. you can use
the `CamelSpringRunner`
@@ -173,7 +173,7 @@
include::{examplesdir}/components/camel-spring-javaconfig/src/test/java/org/apac
=== Spring Test with XML Config and Declarative Configuration Example
Here is a Camel test support enhanced xref:spring-testing.adoc[Spring
-Testing]
https://github.com/apache/camel/blob/master/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java[example
+Testing]
https://github.com/apache/camel/blob/main/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringRunnerPlainTest.java[example
using XML Config and pure Spring Test based configuration of the Camel
Context]:
