This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ff0ac22 Polish and cleanup documentation
ff0ac22 is described below
commit ff0ac22619f581002e56aa6764a032ee759a2940
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Aug 11 12:42:44 2021 +0200
Polish and cleanup documentation
---
docs/user-manual/modules/ROOT/pages/jndi.adoc | 22 -------------
docs/user-manual/modules/faq/nav.adoc | 1 -
...ption-javaxnamingnoinitialcontextexception.adoc | 36 ----------------------
...how-does-camel-look-up-beans-and-endpoints.adoc | 4 +--
docs/user-manual/modules/faq/pages/index.adoc | 1 -
5 files changed, 1 insertion(+), 63 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/jndi.adoc
b/docs/user-manual/modules/ROOT/pages/jndi.adoc
deleted file mode 100644
index 2237a51..0000000
--- a/docs/user-manual/modules/ROOT/pages/jndi.adoc
+++ /dev/null
@@ -1,22 +0,0 @@
-[[JNDI-JNDI]]
-= JNDI
-
-Camel will use JNDI as the default xref:registry.adoc[Registry]
-implementation if you do not use xref:components::spring-summary.adoc[Spring].
This means
-that using a DefaultCamelContext will try and create a
-https://www.javadoc.io/doc/org.apache.camel/camel-core-engine/current/org/apache/camel/impl/JndiRegistry.html[JndiRegistry]
-which uses the JNDI InitialContext as the registry.
-
-This means you need to configure some JNDI provider to be able to use
-this. This is described in this
-xref:faq:exception-javaxnamingnoinitialcontextexception.adoc[FAQ entry],
-but essentially you just need to create a file called `jndi.properties` on
-the classpath and configure it with the JNDI provider you wish.
-
-You can use the Camel JNDI provider by using the following
-`jndi.properties` file:
-
-[source,java]
-----
-java.naming.factory.initial =
org.apache.camel.util.jndi.CamelInitialContextFactory
-----
diff --git a/docs/user-manual/modules/faq/nav.adoc
b/docs/user-manual/modules/faq/nav.adoc
index 621538d..6c8ac3c 100644
--- a/docs/user-manual/modules/faq/nav.adoc
+++ b/docs/user-manual/modules/faq/nav.adoc
@@ -70,7 +70,6 @@
** xref:how-do-the-timer-and-quartz-endpoints-compare.adoc[How do the Timer
and Quartz endpoints compare?]
** xref:why-does-my-jms-route-only-consume-one-message-at-once.adoc[Why does
my JMS route only consume one message at once?]
** xref:exception-beandefinitionstoreexception.adoc[Exception -
BeanDefinitionStoreException]
-** xref:exception-javaxnamingnoinitialcontextexception.adoc[Exception -
javax.naming.NoInitialContextException]
** xref:exception-orgapachecamelnosuchendpointexception.adoc[Exception -
org.apache.camel.NoSuchEndpointException]
** xref:exception-orgxmlsaxsaxparseexception.adoc[Exception -
org.xml.sax.SAXParseException]
** xref:memory-leak-when-adding-and-removing-routes-at-runtime.adoc[Memory
leak when adding and removing routes at runtime]
diff --git
a/docs/user-manual/modules/faq/pages/exception-javaxnamingnoinitialcontextexception.adoc
b/docs/user-manual/modules/faq/pages/exception-javaxnamingnoinitialcontextexception.adoc
deleted file mode 100644
index db4e95e..0000000
---
a/docs/user-manual/modules/faq/pages/exception-javaxnamingnoinitialcontextexception.adoc
+++ /dev/null
@@ -1,36 +0,0 @@
-[[Exception-javax.naming.NoInitialContextException-Exceptionjavax.naming.NoInitialContextException]]
-= Exception: `javax.naming.NoInitialContextException`
-
-If you try to use Camel without xref:ROOT:spring.adoc[Spring] using code
-something like this:
-
-[source,java]
-----
-CamelContext context = new DefaultCamelContext();
-context.addRoutes(new MyRouteBuilder());
-
-context.start();
-----
-
-You might get an exception like this:
-
-----
- [java] Caused by: javax.naming.NoInitialContextException: Need to specify
class name in environment or system property, or as an applet parameter, or in
an application resource file: java.naming.factory.initial
- [java] at
javax.naming.spi.NamingManager.getInitialContext(NamingManager.java:645)
- [java] at
javax.naming.InitialContext.getDefaultInitCtx(InitialContext.java:247)
- [java] at
javax.naming.InitialContext.getURLOrDefaultInitCtx(InitialContext.java:284)
- [java] at javax.naming.InitialContext.lookup(InitialContext.java:351)
- [java] at
org.apache.camel.impl.JndiRegistry.lookup(JndiRegistry.java:51)
-----
-
-This is because if you are not using Spring then the default
-xref:ROOT:registry.adoc[Registry] implementation uses
xref:ROOT:jndi.adoc[JNDI].
-
-A simple workaround for this is to specify a JNDI provider. An easy fix
-is to create a file called `jndi.properties` on the classpath and give
-it this content...
-
-[source,java]
-----
-java.naming.factory.initial =
org.apache.camel.util.jndi.CamelInitialContextFactory
-----
diff --git
a/docs/user-manual/modules/faq/pages/how-does-camel-look-up-beans-and-endpoints.adoc
b/docs/user-manual/modules/faq/pages/how-does-camel-look-up-beans-and-endpoints.adoc
index 299f281..29b033c 100644
---
a/docs/user-manual/modules/faq/pages/how-does-camel-look-up-beans-and-endpoints.adoc
+++
b/docs/user-manual/modules/faq/pages/how-does-camel-look-up-beans-and-endpoints.adoc
@@ -9,9 +9,7 @@ referring to any xref:ROOT:component.adoc[Component] or
xref:ROOT:endpoint.adoc[Endpoint].
Camel uses the xref:ROOT:registry.adoc[Registry] to resolve names when
-looking up beans or components or endpoints. Typically this will be
-xref:ROOT:spring.adoc[Spring]; though you can use Camel without Spring in
-which case it will use the xref:ROOT:jndi.adoc[JNDI] registry implementation.
+looking up beans or components or endpoints.
Lots of test cases in the camel-core module don't use Spring (as
camel-core explicitly doesn't depend on spring) - though test cases in
diff --git a/docs/user-manual/modules/faq/pages/index.adoc
b/docs/user-manual/modules/faq/pages/index.adoc
index 039f9f8..4402f58 100644
--- a/docs/user-manual/modules/faq/pages/index.adoc
+++ b/docs/user-manual/modules/faq/pages/index.adoc
@@ -124,7 +124,6 @@ Questions on using the
xref:components::jms-component.adoc[JMS] endpoints in Cam
Common Problems that people have when riding the Camel
* xref:exception-beandefinitionstoreexception.adoc[Exception -
BeanDefinitionStoreException]
-* xref:exception-javaxnamingnoinitialcontextexception.adoc[Exception -
javax.naming.NoInitialContextException]
* xref:exception-orgapachecamelnosuchendpointexception.adoc[Exception -
org.apache.camel.NoSuchEndpointException]
* xref:exception-orgxmlsaxsaxparseexception.adoc[Exception -
org.xml.sax.SAXParseException]
* xref:memory-leak-when-adding-and-removing-routes-at-runtime.adoc[Memory leak
when adding and removing routes at runtime]
