CAMEL-14276: Move camel-core-osgi-activator to components
diff --git a/components/camel-osgi-activator/pom.xml b/components/camel-osgi-activator/pom.xml
index 61d79d4f..41fcdd8 100644
--- a/components/camel-osgi-activator/pom.xml
+++ b/components/camel-osgi-activator/pom.xml
@@ -32,7 +32,7 @@
<packaging>jar</packaging>
<name>Camel :: OSGi Activator</name>
- <description>Camel OSGi Activator</description>
+ <description>Camel OSGi Activator for running Camel routes from other bundles</description>
<properties>
<camel.osgi.activator>org.apache.camel.osgi.activator.CamelRoutesActivator</camel.osgi.activator>
diff --git a/components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc b/components/camel-osgi-activator/src/main/docs/osgi-activator.adoc
similarity index 90%
rename from components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc
rename to components/camel-osgi-activator/src/main/docs/osgi-activator.adoc
index 2f7f00d..f4fe423 100644
--- a/components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc
+++ b/components/camel-osgi-activator/src/main/docs/osgi-activator.adoc
@@ -1,10 +1,11 @@
-= camel-osgi-activator
+[[OsgiActivator]]
+= OSGi Camel Routes Activator
*Since Camel 3.1*
A small OSGi activator for starting an OSGi Apache Camel Project.
-The bundle starts a shared CamelContext and registers any `RouteBuilder`s instances
+The bundle starts a shared CamelContext and registers any RouteBuilder instances
(discovered via the OSGi Service Registry), from any other bundles that gets installed.
And when the bundles gets uninstalled then the routes are stopped and removed from the shared CamelContext.
@@ -24,7 +25,7 @@
Register an Apache Camel RouteBuilder as an OSGi service.
-Using annotations
+Using OSGi annotations:
[source,java]
----
@@ -38,7 +39,7 @@
}
----
-Or Manually
+Or Manually:
[source,java]
----
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index ac0527c..aab755b 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -272,7 +272,7 @@
* xref:openstack.adoc[Openstack Component]
* xref:opentracing.adoc[OpenTracing Component]
* xref:optaplanner-component.adoc[OptaPlanner Component]
-* xref:camel-osgi-activator.adoc[camel-osgi-activator]
+* xref:osgi-activator.adoc[OSGi Camel Routes Activator]
* xref:paho-component.adoc[Paho Component]
* xref:paxlogging-component.adoc[OSGi PAX Logging Component]
* xref:pdf-component.adoc[PDF Component]
diff --git a/docs/components/modules/ROOT/pages/camel-osgi-activator.adoc b/docs/components/modules/ROOT/pages/camel-osgi-activator.adoc
deleted file mode 100644
index c0aa95c..0000000
--- a/docs/components/modules/ROOT/pages/camel-osgi-activator.adoc
+++ /dev/null
@@ -1,40 +0,0 @@
-= camel-osgi-activator
-:page-source: components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc
-
-A small bundle for starting an OSGi Apache Camel Project.
-
-The bundle starts the CamelContext and registering RouteBuilders from any bundle.
-
-== Install bundle
-
-Register an Apache Camel RouteBuilder as an OSGi service.
-
-Using annotations
-
-[source,java]
-----
-@Component(service = RouteBuilder.class)
-public class MyRouteBuilder extends RouteBuilder {
- @Override
- public void configure() throws Exception {
- from("timer:test?fixedRate=true&period=1000")
- .log("Hello");
- }
-}
-----
-
-Or Manually
-
-[source,java]
-----
-public void start(BundleContext context) throws Exception {
- context.registerService(RouteBuilder.class, new MyRouteBuilder(), null);
-}
-----
-
-And it's automatically added or removed to the context from any bundle!
-
-[source,text]
-----
-Route: route1 started and consuming from: timer://test?fixedRate=true&period=1000
-----
diff --git a/components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc b/docs/components/modules/ROOT/pages/osgi-activator.adoc
similarity index 85%
copy from components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc
copy to docs/components/modules/ROOT/pages/osgi-activator.adoc
index 2f7f00d..00438d2 100644
--- a/components/camel-osgi-activator/src/main/docs/camel-osgi-activator.adoc
+++ b/docs/components/modules/ROOT/pages/osgi-activator.adoc
@@ -1,10 +1,12 @@
-= camel-osgi-activator
+[[OsgiActivator]]
+= OSGi Camel Routes Activator
+:page-source: components/camel-osgi-activator/src/main/docs/osgi-activator.adoc
*Since Camel 3.1*
A small OSGi activator for starting an OSGi Apache Camel Project.
-The bundle starts a shared CamelContext and registers any `RouteBuilder`s instances
+The bundle starts a shared CamelContext and registers any RouteBuilder instances
(discovered via the OSGi Service Registry), from any other bundles that gets installed.
And when the bundles gets uninstalled then the routes are stopped and removed from the shared CamelContext.
@@ -24,7 +26,7 @@
Register an Apache Camel RouteBuilder as an OSGi service.
-Using annotations
+Using OSGi annotations:
[source,java]
----
@@ -38,7 +40,7 @@
}
----
-Or Manually
+Or Manually:
[source,java]
----
