Fix loading of examples from CLI tools path

locationtech · Mar 22, 2024 · 0f98232 · 0f98232
1 parent 1a36768
commit 0f98232
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 75 deletions.
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/avro/ingest_avro.sh b/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/avro/ingest_avro.sh
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/csv/ingest_csv.sh b/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/csv/ingest_csv.sh
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/json/ingest_json.sh b/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/json/ingest_json.sh
diff --git a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/xml/ingest_xml.sh b/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/xml/ingest_xml.sh
diff --git a/geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml b/geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml
@@ -97,13 +97,6 @@
       <fileMode>0644</fileMode>
       <filtered>true</filtered>
     </fileSet>
-    <fileSet>
-      <directory>../geomesa-${tools.module}-tools/examples</directory>
-      <outputDirectory>examples</outputDirectory>
-      <directoryMode>755</directoryMode>
-      <fileMode>0644</fileMode>
-      <filtered>false</filtered>
-    </fileSet>
 
     <!-- common tools filesets -->
     <fileSet>
@@ -138,6 +131,16 @@
       <fileMode>0644</fileMode>
       <filtered>false</filtered>
     </fileSet>
+    <fileSet>
+      <directory>../../geomesa-tools/examples</directory>
+      <outputDirectory>conf/sfts/examples</outputDirectory>
+      <directoryMode>755</directoryMode>
+      <fileMode>0644</fileMode>
+      <filtered>false</filtered>
+      <includes>
+        <include>**/application.conf</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>./</directory>
       <outputDirectory>logs</outputDirectory>

diff --git a/geomesa-gt/geomesa-gt-tools/examples/ingest/avro/ingest_avro.sh b/geomesa-gt/geomesa-gt-tools/examples/ingest/avro/ingest_avro.sh
diff --git a/geomesa-gt/geomesa-gt-tools/examples/ingest/csv/ingest_csv.sh b/geomesa-gt/geomesa-gt-tools/examples/ingest/csv/ingest_csv.sh
diff --git a/geomesa-gt/geomesa-gt-tools/examples/ingest/json/ingest_json.sh b/geomesa-gt/geomesa-gt-tools/examples/ingest/json/ingest_json.sh
diff --git a/geomesa-gt/geomesa-gt-tools/examples/ingest/xml/ingest_xml.sh b/geomesa-gt/geomesa-gt-tools/examples/ingest/xml/ingest_xml.sh
diff --git a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/avro/ingest_avro.sh b/geomesa-hbase/geomesa-hbase-tools/examples/ingest/avro/ingest_avro.sh
diff --git a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/csv/ingest_csv.sh b/geomesa-hbase/geomesa-hbase-tools/examples/ingest/csv/ingest_csv.sh
diff --git a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/json/ingest_json.sh b/geomesa-hbase/geomesa-hbase-tools/examples/ingest/json/ingest_json.sh
diff --git a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/xml/ingest_xml.sh b/geomesa-hbase/geomesa-hbase-tools/examples/ingest/xml/ingest_xml.sh
diff --git a/geomesa-tools/conf/application.conf b/geomesa-tools/conf/application.conf
@@ -1,4 +1,4 @@
-include file("../examples/avro/application.conf")
-include file("../examples/csv/application.conf")
-include file("../examples/json/application.conf")
-include file("../examples/xml/application.conf")
+include "sfts/examples/avro/application.conf"
+include "sfts/examples/csv/application.conf"
+include "sfts/examples/json/application.conf"
+include "sfts/examples/xml/application.conf"