Update for 1.3.0 Release

neo4j-contrib · Jan 22, 2019 · f636fbf · f636fbf
1 parent e3e17d9
commit f636fbf
Show file tree

Hide file tree

Showing 22 changed files with 45 additions and 4 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/README.adoc b/README.adoc
@@ -23,9 +23,9 @@ This tool is licensed under the link:LICENSE.txt[NEO4J PRE-RELEASE LICENSE AGREE
 == Issues & Feedback & Contributions
 
 * You can raise link:issues[GitHub issues] or send feedback to feedback@neo4j.com
-* Please also join our http://neo4j.com/slack[neo4j-users Slack] and ask in the  #help-import channel
+* Please also join our https://community.neo4j.com/c/neo4j-graph-platform/etl[Community Site] ask in the appropriate category
 
-== Download & Run
+== Download & Run Command Line Tool
 
 Download & unzip the latest https://github.com/neo4j-contrib/neo4j-etl/releases/latest[neo4j-etl.zip^].
 
@@ -53,8 +53,15 @@ For detailed usage see also the: http://neo4j-contrib.github.io/neo4j-etl#neo4j-
 
 == Neo4j-Desktop
 
-You can add Neo4j ETL to Neo4j Desktop by adding the appropriate application key.
-Please ask your Neo4j contact or send an email to link:mailto:devrel@neo4j.com[devrel@neo4j.com^]
+=== Install in Neo4j Desktop
+
+Use the Application URL `https://r.neo4j.com/neo4j-etl-app` in the "Graph Apps" tab of Neo4j Desktop.
+
+image:{img}/neo4j-etl-install.jpg[width=400]
+image:{img}/graph-app-icon.jpg[width=400]
+
+// You can add Neo4j ETL to Neo4j Desktop by adding the appropriate application key.
+// Please ask your Neo4j contact or send an email to link:mailto:devrel@neo4j.com[devrel@neo4j.com^]
 
 Then the next time you start Neo4j Desktop you'll see Neo4j ETL as a UI to be used interactively.
 
@@ -70,6 +77,8 @@ Then the next time you start Neo4j Desktop you'll see Neo4j ETL as a UI to be us
 | image:{img}/import-data.jpg[width=200]
 |===
 
+We put https://neo4j.com/developer/neo4j-etl[detailed usage instructions for the Neo4j ETL Tool] in the Neo4j Developer Pages.
+
 ////
 .Location of $DESKTOP
 |===

diff --git a/docs/etl_config.txt b/docs/etl_config.txt
@@ -0,0 +1,30 @@
+#EXAMPLE - ETL CONFIG FILE
+
+#RDBMS 
+rdbms-url=url
+rdbms-schema=schema
+rdbms-password=neo4j
+rdbms-user=neo4j
+rdbms-fetch-size=10000
+
+#NEO4J
+using=cypher:direct
+neo4j-url=bolt://127.0.0.1:7687
+neo4j-user=neo4j
+neo4j-password=neo4j
+
+#RULES
+exclusion-mode-tables=INCLUDE
+tables=-l table1,table2,...
+exclusion-mode-columns=INCLUDE
+columns=-l column1,column2,...
+exclusion-mode-column-types=EXCLUDE
+column-types=type1,type2,...
+
+#MISC
+output-mapping-file=path_to_output_mapping_file
+import-tool=path_to_import_tool
+csv-directory=path_to_directory
+mapping-file=path_to_file
+
+debug=false
diff --git a/docs/img/driver.jpg b/docs/img/driver.jpg
diff --git a/docs/img/edit-mapping.jpg b/docs/img/edit-mapping.jpg
diff --git a/docs/img/graph-app-icon.jpg b/docs/img/graph-app-icon.jpg
diff --git a/docs/img/import-data.jpg b/docs/img/import-data.jpg
diff --git a/docs/img/load-mapping.jpg b/docs/img/load-mapping.jpg
diff --git a/docs/img/mapping-success.jpg b/docs/img/mapping-success.jpg
diff --git a/docs/img/mapping.jpg b/docs/img/mapping.jpg
diff --git a/docs/img/neo4j-etl-install.jpg b/docs/img/neo4j-etl-install.jpg
diff --git a/docs/index.adoc b/docs/index.adoc
diff --git a/docs/index.html b/docs/index.html
@@ -1651,6 +1651,7 @@ <h3 id="_how_to_import_world_wide_importers_database_into_a_ms_sql_server_docker
 <div class="content">
 <pre># Create docker instance for MS-SQL Server
 docker run --name mssql-etl \
+-e MSSQL_COLLATION=Latin1_General_100_CI_AS \
 -e 'ACCEPT_EULA=Y' \
 -e 'SA_PASSWORD=&lt;YOUR_PASSWORD&gt;' \
 -p 1433:1433 \

diff --git a/docs/manpage.sh b/docs/manpage.sh
diff --git a/docs/neo4j-etl-architecture.png b/docs/neo4j-etl-architecture.png
diff --git a/docs/neo4j-etl-architecture.svg b/docs/neo4j-etl-architecture.svg
diff --git a/docs/neo4j-etl-export.txt b/docs/neo4j-etl-export.txt
diff --git a/docs/neo4j-etl-generate-metadata-mapping.txt b/docs/neo4j-etl-generate-metadata-mapping.txt
diff --git a/docs/neo4j-etl-help.txt b/docs/neo4j-etl-help.txt
diff --git a/docs/neo4j-etl.adoc b/docs/neo4j-etl.adoc
@@ -360,6 +360,7 @@ echo '{"multiline-fields":"true"}' > /tmp/wideworldimporters/options.json
 ----
 # Create docker instance for MS-SQL Server
 docker run --name mssql-etl \
+-e MSSQL_COLLATION=Latin1_General_100_CI_AS \
 -e 'ACCEPT_EULA=Y' \
 -e 'SA_PASSWORD=<YOUR_PASSWORD>' \
 -p 1433:1433 \

diff --git a/docs/neo4j-etl.html b/docs/neo4j-etl.html
diff --git a/docs/testing.adoc b/docs/testing.adoc