Skip to content

Generated sources regen #5964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oscerd merged 1 commit into from
Aug 19, 2021
Merged

Generated sources regen #5964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ...amel-catalog/src/generated/resources/org/apache/camel/catalog/docs/log-eip.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,6 @@ You can specify a marker name in the DSL
</route>
----

== Using log DSL in OSGi

When using log DSL inside OSGi (e.g., in Karaf), the underlying logging mechanisms are provided by PAX logging. It searches for a bundle which invokes org.slf4j.LoggerFactory.getLogger() method and associates the bundle with the logger instance. Passing only logger name to log DSL results in associating camel-core bundle with the logger instance created.

In some scenarios it is required that the bundle associated with logger should be the bundle which contains route definition. This is possible using provided logger instance both for Java DSL and Spring DSL (see the examples above).

== Masking sensitive information like password

You can enable security masking for logging by setting `logMask` flag to `true`.
Expand Down
25 changes: 0 additions & 25 deletions ...catalog/src/generated/resources/org/apache/camel/catalog/docs/rollback-eip.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,31 +116,6 @@ from("activemq:queue:foo").policy(requirenew).to("activemq:queue:bar");
from("activemq:queue:foo").policy(notsupported).to("activemq:queue:bar");
----

=== OSGi Blueprint

If you are using xref:latest@manual:ROOT:using-osgi-blueprint-with-camel.adoc[OSGi
Blueprint] then you most likely have to explicit declare a policy and
refer to the policy from the transacted in the route.

[source,xml]
--------------------------------------------------------
<bean id="required" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="propagationBehaviorName" value="PROPAGATION_REQUIRED"/>
</bean>
--------------------------------------------------------

And then refer to "required" from the route:

[source,xml]
--------------------------------------------------------
<route>
<from uri="activemq:queue:foo"/>
<transacted ref="required"/>
<to uri="activemq:queue:bar"/>
</route>
--------------------------------------------------------

== Database Sample

In this sample we want to ensure that two endpoints is under transaction
Expand Down
27 changes: 0 additions & 27 deletions ...src/generated/resources/org/apache/camel/catalog/docs/transactional-client.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,33 +106,6 @@ from("activemq:queue:foo").policy(notsupported)
.to("activemq:queue:bar");
----

[[TransactionalClient-OSGiBlueprint]]
== OSGi Blueprint

If you are using
xref:latest@manual:ROOT:using-osgi-blueprint-with-camel.adoc[OSGi Blueprint]
then you most likely have to explicit declare a policy and
refer to the policy from the transacted in the route.

[source,xml]
----
<bean id="required" class="org.apache.camel.spring.spi.SpringTransactionPolicy">
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="propagationBehaviorName" value="PROPAGATION_REQUIRED"/>
</bean>
----

And then refer to "required" from the route:

[source,xml]
----
<route>
<from uri="activemq:queue:foo"/>
<transacted ref="required"/>
<to uri="activemq:queue:bar"/>
</route>
----

[[TransactionalClient-DatabaseSample]]
== Database Sample

Expand Down