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 deleted file mode 100644 index 882a22153d2b..000000000000 --- a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/avro/ingest_avro.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-xml is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-accumulo ingest -u user -p password -i inst -z zoo -c catalog -s example-avro -C example-avro-no-header example_no_header.avro - -bin/geomesa-accumulo ingest -u user -p password -i inst -z zoo -c catalog -s example-avro -C example-avro-header example_with_header.avro \ No newline at end of file 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 deleted file mode 100644 index 5189c6063a94..000000000000 --- a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/csv/ingest_csv.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-csv is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-accumulo ingest -u user -p password -i inst -z zoo -c catalog -s example-csv -C example-csv example.csv \ No newline at end of file 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 deleted file mode 100644 index ce8bc7e52b2c..000000000000 --- a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/json/ingest_json.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -bin/geomesa-accumulo ingest -u user -p pass -i inst -z zoo -c catalog -s example-json -C example-json example.json - -# this uses a file to define the converter -bin/geomesa-accumulo ingest -u user -p pass -i inst -z zoo -c catalog2 -s example-json -C example_multi_line.conf example_multi_line.json - 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 deleted file mode 100644 index 46e9da93ac23..000000000000 --- a/geomesa-accumulo/geomesa-accumulo-tools/examples/ingest/xml/ingest_xml.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-xml is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-accumulo ingest -u user -p password -i inst -z zoo -c catalog -s example-xml -C example-xml example.xml \ No newline at end of file diff --git a/geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml b/geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml index 26370177f8bb..3c4f249887d4 100644 --- a/geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml +++ b/geomesa-archetypes/geomesa-archetypes-binary-dist/assembly.xml @@ -97,13 +97,6 @@ 0644 true - - ../geomesa-${tools.module}-tools/examples - examples - 755 - 0644 - false - @@ -138,6 +131,16 @@ 0644 false + + ../../geomesa-tools/examples + conf/sfts/examples + 755 + 0644 + false + + **/application.conf + + ./ logs 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 deleted file mode 100644 index 66dad0691a4c..000000000000 --- a/geomesa-gt/geomesa-gt-tools/examples/ingest/avro/ingest_avro.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-xml is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-gt ingest --param dbtype=postgis --param host=localhost --param port=5432 --param schema=public --param database=database --param user=postgres --param passwd=postgres -s example-avro -C example-avro-no-header example_no_header.avro - -bin/geomesa-gt ingest --param dbtype=postgis --param host=localhost --param port=5432 --param schema=public --param database=database --param user=postgres --param passwd=postgres -s example-avro -C example-avro-header example_with_header.avro - 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 deleted file mode 100644 index 39749c54c4ef..000000000000 --- a/geomesa-gt/geomesa-gt-tools/examples/ingest/csv/ingest_csv.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-csv is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-gt ingest --param dbtype=postgis --param host=localhost --param port=5432 --param schema=public --param database=database --param user=postgres --param passwd=postgres -s example-csv -C example-csv example.csv 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 deleted file mode 100644 index 23cd6337979a..000000000000 --- a/geomesa-gt/geomesa-gt-tools/examples/ingest/json/ingest_json.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -bin/geomesa-gt ingest --param dbtype=postgis --param host=localhost --param port=5432 --param schema=public --param database=database --param user=postgres --param passwd=postgres -s example-json -C example-json example.json - -# this uses a file to define the converter -bin/geomesa-gt ingest --param dbtype=postgis --param host=localhost --param port=5432 --param schema=public --param database=database --param user=postgres --param passwd=postgres -s example-json -C example_multi_line.conf example_multi_line.json - 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 deleted file mode 100644 index 1368370b9379..000000000000 --- a/geomesa-gt/geomesa-gt-tools/examples/ingest/xml/ingest_xml.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-xml is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-gt ingest --param dbtype=postgis --param host=localhost --param port=5432 --param schema=public --param database=database --param user=postgres --param passwd=postgres -s example-xml -C example-xml example.xml 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 deleted file mode 100644 index 4b3f629316df..000000000000 --- a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/avro/ingest_avro.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-xml is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-hbase ingest -c catalog -s example-avro -C example-avro-no-header example_no_header.avro - -bin/geomesa-hbase ingest -c catalog -s example-avro -C example-avro-header example_with_header.avro 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 deleted file mode 100644 index 577f320217d6..000000000000 --- a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/csv/ingest_csv.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-csv is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-hbase ingest -c catalog -s example-csv -C example-csv example.csv 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 deleted file mode 100644 index b006aa430595..000000000000 --- a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/json/ingest_json.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -bin/geomesa-hbase ingest -c catalog -s example-json -C example-json example.json - -# this uses a file to define the converter -bin/geomesa-hbase ingest -c catalog2 -s example-json -C example_multi_line.conf example_multi_line.json - 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 deleted file mode 100644 index 48d82091bc15..000000000000 --- a/geomesa-hbase/geomesa-hbase-tools/examples/ingest/xml/ingest_xml.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# type and converter example-xml is registered in $GEOMESA_HOME/conf/application.conf -bin/geomesa-hbase ingest -c catalog -s example-xml -C example-xml example.xml diff --git a/geomesa-tools/conf/application.conf b/geomesa-tools/conf/application.conf index 94d6f1d08cf3..e0606ee6dee7 100644 --- 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"