Merge branch 'apache:main' into main

mattcasters · Nov 27, 2024 · 57d7e14 · 57d7e14
2 parents 8fa4c35 + 7c105aa
commit 57d7e14
Show file tree

Hide file tree

Showing 20 changed files with 216 additions and 639 deletions.
diff --git a/docs/hop-tech-manual/modules/ROOT/nav.adoc b/docs/hop-tech-manual/modules/ROOT/nav.adoc
@@ -20,6 +20,7 @@ under the License.
 ** xref:hop-vs-kettle/hop-vs-kettle.adoc[Hop vs Kettle]
 ** xref:hop-vs-kettle/if-you-know-kettle.adoc[If you know Kettle]
 ** xref:hop-vs-kettle/import-kettle-projects.adoc[Upgrade Kettle to Hop]
+** xref:hop-vs-kettle/hop-import.adoc[Hop Import]
 * xref:logging/logging-architecture.adoc[Logging Architecture]
 ** xref:logging/udjc-logging.adoc[Logging from UDJC]
 ** xref:logging/logging-plugins.adoc[Logging Plugin Architecture]

diff --git a/...T/pages/plugins/import/kettle-import.adoc → .../ROOT/pages/hop-vs-kettle/hop-import.adoc b/...T/pages/plugins/import/kettle-import.adoc → .../ROOT/pages/hop-vs-kettle/hop-import.adoc
diff --git a/docs/hop-tech-manual/modules/ROOT/pages/hop-vs-kettle/import-kettle-projects.adoc b/docs/hop-tech-manual/modules/ROOT/pages/hop-vs-kettle/import-kettle-projects.adoc
@@ -91,4 +91,8 @@ When multiple database connections with the same name but different configuratio
 This file contains a list of all jobs and transformations, with the connections they use.
 
 
+== Import from the CLI
 
+The `hop-import.sh/bat` CLI tool lets you import Kettle/PDI projects from the command line.
+
+Check the xref:hop-vs-kettle/hop-import.adoc[hop-import] page for details.
diff --git a/docs/hop-user-manual/modules/ROOT/nav.adoc b/docs/hop-user-manual/modules/ROOT/nav.adoc
@@ -445,8 +445,6 @@ under the License.
 //::=END AUTO GENERATED LINKS PASSWORDS
 //::=START AUTO GENERATED LINKS
 //::=END AUTO GENERATED LINKS
-** xref:plugins/external-plugins.adoc[External Plugins]
-** xref:plugins/import/kettle-import.adoc[Kettle/PDI Import]
 * xref:samples/samples.adoc[Samples]
 * xref:technology/technology.adoc[Technology]
 ** xref:technology/azure/index.adoc[Azure]

diff --git a/docs/hop-user-manual/modules/ROOT/pages/hop-tools/hop-import.adoc b/docs/hop-user-manual/modules/ROOT/pages/hop-tools/hop-import.adoc
@@ -22,7 +22,7 @@ Hop Import is a command line tool to import and convert third party metadata to
 
 See also these plugins:
 
-* xref:plugins/import/kettle-import.adoc[Kettle Import]
+* xref:tech-manual:ROOT:hop-vs-kettle/hop-import.adoc[Kettle Import]
 
 == Usage
 

diff --git a/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms.adoc b/docs/hop-user-manual/modules/ROOT/pages/pipeline/transforms.adoc
@@ -45,12 +45,12 @@ The pages nested under this topic contain information on how to use the transfor
 * xref:pipeline/transforms/beambigqueryoutput.adoc[Beam BigQuery Output]
 * xref:pipeline/transforms/beamgcppublisher.adoc[Beam GCP Pub/Sub : Publish]
 * xref:pipeline/transforms/beamgcpsubscriber.adoc[Beam GCP Pub/Sub : Subscribe]
-* xref:pipeline/transforms/beaminput.adoc[Beam Input]
+* xref:pipeline/transforms/beamfileinput.adoc[Beam File Input]
+* xref:pipeline/transforms/beamfileoutput.adoc[Beam File Output]
 * xref:pipeline/transforms/beamkafkaconsume.adoc[Beam Kafka Consume]
 * xref:pipeline/transforms/beamkafkaproduce.adoc[Beam Kafka Produce]
 * xref:pipeline/transforms/beamkinesisconsume.adoc[Beam Kinesis Consume]
 * xref:pipeline/transforms/beamkinesisproduce.adoc[Beam Kinesis Produce]
-* xref:pipeline/transforms/beamoutput.adoc[Beam Output]
 * xref:pipeline/transforms/beamtimestamp.adoc[Beam Timestamp]
 * xref:pipeline/transforms/beamwindow.adoc[Beam Window]
 * xref:pipeline/transforms/blockingtransform.adoc[Blocking transform]

diff --git a/.../pages/pipeline/transforms/beaminput.adoc → ...es/pipeline/transforms/beamfileinput.adoc b/.../pages/pipeline/transforms/beaminput.adoc → ...es/pipeline/transforms/beamfileinput.adoc
@@ -16,16 +16,16 @@ under the License.
 ////
 :documentationPath: /pipeline/transforms/
 :language: en_US
-:description: The Beam Input transform reads files using a file definition with the Beam execution engine.
+:description: The Beam File Input transform reads files using a file definition with the Beam execution engine.
 
-= image:transforms/icons/beam-input.svg[Beam Input Icon, role="image-doc-icon"] Beam Input
+= image:transforms/icons/beam-input.svg[Beam Input Icon, role="image-doc-icon"] Beam File Input
 
 [%noheader,cols="3a,1a", role="table-no-borders" ]
 |===
 |
 == Description
 
-The Beam Input transform reads files using a file definition with the Beam execution engine.
+The Beam File Input transform reads files using a file definition with the Beam execution engine.
 
 |
 == Supported Engines

diff --git a/...pages/pipeline/transforms/beamoutput.adoc → ...s/pipeline/transforms/beamfileoutput.adoc b/...pages/pipeline/transforms/beamoutput.adoc → ...s/pipeline/transforms/beamfileoutput.adoc
@@ -16,16 +16,16 @@ under the License.
 ////
 :documentationPath: /pipeline/transforms/
 :language: en_US
-:description: The Beam Output transform writes files using a file definition with the Beam execution engine.
+:description: The Beam File Output transform writes files using a file definition with the Beam execution engine.
 
-= image:transforms/icons/beam-output.svg[Beam Output Icon, role="image-doc-icon"] Beam Output
+= image:transforms/icons/beam-output.svg[Beam Output Icon, role="image-doc-icon"] Beam File Output
 
 [%noheader,cols="3a,1a", role="table-no-borders" ]
 |===
 |
 == Description
 
-The Beam Output transform writes files using a file definition with the Beam execution engine.
+The Beam File Output transform writes files using a file definition with the Beam execution engine.
 |
 == Supported Engines
 [%noheader,cols="2,1a",frame=none, role="table-supported-engines"]

diff --git a/docs/hop-user-manual/modules/ROOT/pages/plugins/external-plugins.adoc b/docs/hop-user-manual/modules/ROOT/pages/plugins/external-plugins.adoc
diff --git a/docs/hop-user-manual/modules/ROOT/pages/plugins/projects.adoc b/docs/hop-user-manual/modules/ROOT/pages/plugins/projects.adoc