Merge branch 'develop'

.gitignore

@@ -6,3 +6,6 @@ dist/
 /Error1.txt
 /ScanReport.xlsx
 /.classpath
+target/
+*.iml
+.idea/

.project

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>WhiteRabbit</name>
+	<name>leporidae</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

README.md

@@ -1,4 +1,4 @@
-![alt text](https://github.com/OHDSI/WhiteRabbit/blob/master/src/org/ohdsi/whiteRabbit/WhiteRabbit64.png) WhiteRabbit
+![alt text](https://github.com/OHDSI/WhiteRabbit/blob/master/whiterabbit/src/main/resources/org/ohdsi/whiteRabbit/WhiteRabbit64.png) WhiteRabbit
 ===========
 
 Introduction
@@ -35,26 +35,28 @@ White Rabbit and Rabbit in a Hat are pure Java applications. Both applications u
 
 System Requirements
 ============
-Requires Java 1.7 or higher, and read access to the database to be scanned. Java can be downloaded from
+Requires Java 1.8 or higher, and read access to the database to be scanned. Java can be downloaded from
 <a href="http://www.java.com" target="_blank">http://www.java.com</a>.
 
 Dependencies
 ============
- * There are no dependencies.
+For the distributable packages, the only requirement is Java 8. For building the package, also Maven is needed.
 
 Getting Started
 ===============
 WhiteRabbit
 
-1. Under the [Releases](https://github.com/OHDSI/WhiteRabbit/releases) tab, download WhiteRabbit*.zip
+1. Under the [Releases](https://github.com/OHDSI/WhiteRabbit/releases) tab, download `WhiteRabbit*.zip`
 2. Unzip the download
-3. Double-click on WhiteRabbit.jar to start White Rabbit.
+3. Double-click on `bin/whiteRabbit.bat` on Windows to start White Rabbit, and `bin/whiteRabbit` on macOS and Linux.
 
 (See the [Wiki](http://www.ohdsi.org/web/wiki/doku.php?id=documentation:software:whiterabbit#running_from_the_command_line) for details on how to run from the command prompt instead)
 
 Rabbit-In-A-Hat
 
-1. Using the files downloaded for WhiteRabbit, double-click on RabbitInAHat.jar to start Rabbit-In-A-Hat.
+1. Using the files downloaded for WhiteRabbit, double-click on `bin/rabbitInAHat.bat` to start Rabbit-In-A-Hat on Windows, and `bin/rabbitInAHat` on macOS and Linux.
+
+Note: on releases earlier than version 0.8.0, open the respective `WhiteRabbit.jar` or `RabbitInAHat.jar` files instead.
 
 Getting Involved
 =============
@@ -68,7 +70,9 @@ WhiteRabbit is licensed under Apache License 2.0
 
 Development
 ===========
-White Rabbit and Rabbit in a Hat are being developed in Eclipse. Contributions are welcome.
+White Rabbit and Rabbit in a Hat are structured as a Maven package and can be developed in Eclipse. Contributions are welcome.
+
+To generate the files ready for distribution, run `mvn install`.
 
 ### Development status
 

lib/com/teradata/jdbc/terajdbc4/16.0.0.32/terajdbc4-16.0.0.32.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.teradata.jdbc</groupId>
+  <artifactId>terajdbc4</artifactId>
+  <version>16.0.0.32</version>
+  <description>POM was created from install:install-file</description>
+</project>

lib/com/teradata/jdbc/terajdbc4/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.teradata.jdbc</groupId>
+  <artifactId>terajdbc4</artifactId>
+  <versioning>
+    <release>16.0.0.32</release>
+    <versions>
+      <version>16.0.0.32</version>
+    </versions>
+    <lastUpdated>20190507142405</lastUpdated>
+  </versioning>
+</metadata>

lib/com/teradata/tdgss/tdgssconfig/16.0.0.0/tdgssconfig-16.0.0.0.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.teradata.tdgss</groupId>
+  <artifactId>tdgssconfig</artifactId>
+  <version>16.0.0.0</version>
+  <description>POM was created from install:install-file</description>
+</project>

lib/com/teradata/tdgss/tdgssconfig/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.teradata.tdgss</groupId>
+  <artifactId>tdgssconfig</artifactId>
+  <versioning>
+    <release>16.0.0.0</release>
+    <versions>
+      <version>16.0.0.0</version>
+    </versions>
+    <lastUpdated>20190507142309</lastUpdated>
+  </versioning>
+</metadata>

pom.xml

@@ -0,0 +1,133 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.ohdsi</groupId>
+    <artifactId>leporidae</artifactId>
+    <packaging>pom</packaging>
+    <version>0.8.0-SNAPSHOT</version>
+    <modules>
+        <module>rabbitinahat</module>
+        <module>whiterabbit</module>
+        <module>rabbit-core</module>
+    </modules>
+    <name>Leporidae</name>
+    <url>https://www.ohdsi.org/analytic-tools/whiterabbit-for-etl-design/</url>
+
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>clojars</id>
+            <name>Clojars Repository</name>
+            <url>http://clojars.org/repo/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>icm</id>
+            <name>ICM Repository</name>
+            <url>https://maven.ceon.pl/artifactory/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>mulesoft</id>
+            <name>Mulesoft Repository</name>
+            <url>https://repository.mulesoft.org/nexus/content/repositories/public/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>jahia</id>
+            <name>Geomajas Repository</name>
+            <url>http://maven.geomajas.org/</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>local-maven-repo</id>
+            <name>Local Repository</name>
+            <layout>default</layout>
+            <url>file:///${project.basedir}/../lib</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>appassembler-maven-plugin</artifactId>
+                    <version>1.10</version>
+                    <configuration>
+                        <programs>
+                        </programs>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>jar:jar</id>
+                            <goals>
+                                <goal>assemble</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>3.1.0</version>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>dist</directory>
+                            <includes>
+                                <include>**</include>
+                            </includes>
+                            <followSymlinks>false</followSymlinks>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

rabbit-core/.classpath

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>