From 30b916ade48aa4f5434e1be9097c80313815b941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Sch=C3=A4rtl?= <andreas@schaertl.me>
Date: Thu, 28 May 2020 08:57:51 +0200
Subject: [PATCH] mv /experimental/ulapi -> /src

---
 README.md                                                  | 7 +++++++
 {experimental => src}/uloapi/.gitignore                    | 0
 {experimental => src}/uloapi/README.md                     | 0
 {experimental => src}/uloapi/pom.xml                       | 0
 .../src/main/java/info/mathhub/uloapi/config/Config.java   | 0
 .../src/main/java/info/mathhub/uloapi/html/Errors.java     | 0
 .../src/main/java/info/mathhub/uloapi/html/Filters.java    | 0
 .../src/main/java/info/mathhub/uloapi/html/Main.java       | 0
 .../src/main/java/info/mathhub/uloapi/html/Routes.java     | 0
 .../src/main/java/info/mathhub/uloapi/query/GraphDB.java   | 0
 .../src/main/java/info/mathhub/uloapi/query/Query.java     | 0
 .../main/java/info/mathhub/uloapi/query/Statistics.java    | 0
 .../src/main/java/info/mathhub/uloapi/query/Timer.java     | 0
 .../src/main/java/info/mathhub/uloapi/query/ULO.java       | 0
 .../src/main/java/info/mathhub/uloapi/rest/Errors.java     | 0
 .../src/main/java/info/mathhub/uloapi/rest/Filters.java    | 0
 .../java/info/mathhub/uloapi/rest/JsonTransformer.java     | 0
 .../src/main/java/info/mathhub/uloapi/rest/Main.java       | 0
 .../src/main/java/info/mathhub/uloapi/rest/Routes.java     | 0
 .../uloapi/src/main/resources/logback.xml                  | 0
 .../src/main/resources/spark/template/freemarker/base.flt  | 0
 .../src/main/resources/spark/template/freemarker/error.flt | 0
 .../src/main/resources/spark/template/freemarker/index.flt | 0
 .../main/resources/spark/template/freemarker/queries.flt   | 0
 .../resources/spark/template/freemarker/statistics.flt     | 0
 .../uloapi/src/main/resources/uloapi.properties            | 0
 26 files changed, 7 insertions(+)
 rename {experimental => src}/uloapi/.gitignore (100%)
 rename {experimental => src}/uloapi/README.md (100%)
 rename {experimental => src}/uloapi/pom.xml (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java (100%)
 rename {experimental => src}/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java (100%)
 rename {experimental => src}/uloapi/src/main/resources/logback.xml (100%)
 rename {experimental => src}/uloapi/src/main/resources/spark/template/freemarker/base.flt (100%)
 rename {experimental => src}/uloapi/src/main/resources/spark/template/freemarker/error.flt (100%)
 rename {experimental => src}/uloapi/src/main/resources/spark/template/freemarker/index.flt (100%)
 rename {experimental => src}/uloapi/src/main/resources/spark/template/freemarker/queries.flt (100%)
 rename {experimental => src}/uloapi/src/main/resources/spark/template/freemarker/statistics.flt (100%)
 rename {experimental => src}/uloapi/src/main/resources/uloapi.properties (100%)

diff --git a/README.md b/README.md
index 5d18460..0f1d046 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,10 @@ Directories
   technologies.
 
 * `/src`: Implementation source code.
+
+	- `/src/uloapi`: RDF4J/JVM-based endpoint to the dataset.
+
+	- `/src/ulocollect`: Collects and imports data from MathHub into a database.
+
+	- `/src/ulo-rdf4j`: Script for generating `ULO.java` which contains
+	  constants for use with RDF4J.
diff --git a/experimental/uloapi/.gitignore b/src/uloapi/.gitignore
similarity index 100%
rename from experimental/uloapi/.gitignore
rename to src/uloapi/.gitignore
diff --git a/experimental/uloapi/README.md b/src/uloapi/README.md
similarity index 100%
rename from experimental/uloapi/README.md
rename to src/uloapi/README.md
diff --git a/experimental/uloapi/pom.xml b/src/uloapi/pom.xml
similarity index 100%
rename from experimental/uloapi/pom.xml
rename to src/uloapi/pom.xml
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java b/src/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java b/src/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java b/src/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java b/src/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java b/src/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java b/src/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java b/src/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java b/src/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java b/src/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java b/src/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java b/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java b/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java b/src/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java b/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java
diff --git a/experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java b/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java
similarity index 100%
rename from experimental/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java
rename to src/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java
diff --git a/experimental/uloapi/src/main/resources/logback.xml b/src/uloapi/src/main/resources/logback.xml
similarity index 100%
rename from experimental/uloapi/src/main/resources/logback.xml
rename to src/uloapi/src/main/resources/logback.xml
diff --git a/experimental/uloapi/src/main/resources/spark/template/freemarker/base.flt b/src/uloapi/src/main/resources/spark/template/freemarker/base.flt
similarity index 100%
rename from experimental/uloapi/src/main/resources/spark/template/freemarker/base.flt
rename to src/uloapi/src/main/resources/spark/template/freemarker/base.flt
diff --git a/experimental/uloapi/src/main/resources/spark/template/freemarker/error.flt b/src/uloapi/src/main/resources/spark/template/freemarker/error.flt
similarity index 100%
rename from experimental/uloapi/src/main/resources/spark/template/freemarker/error.flt
rename to src/uloapi/src/main/resources/spark/template/freemarker/error.flt
diff --git a/experimental/uloapi/src/main/resources/spark/template/freemarker/index.flt b/src/uloapi/src/main/resources/spark/template/freemarker/index.flt
similarity index 100%
rename from experimental/uloapi/src/main/resources/spark/template/freemarker/index.flt
rename to src/uloapi/src/main/resources/spark/template/freemarker/index.flt
diff --git a/experimental/uloapi/src/main/resources/spark/template/freemarker/queries.flt b/src/uloapi/src/main/resources/spark/template/freemarker/queries.flt
similarity index 100%
rename from experimental/uloapi/src/main/resources/spark/template/freemarker/queries.flt
rename to src/uloapi/src/main/resources/spark/template/freemarker/queries.flt
diff --git a/experimental/uloapi/src/main/resources/spark/template/freemarker/statistics.flt b/src/uloapi/src/main/resources/spark/template/freemarker/statistics.flt
similarity index 100%
rename from experimental/uloapi/src/main/resources/spark/template/freemarker/statistics.flt
rename to src/uloapi/src/main/resources/spark/template/freemarker/statistics.flt
diff --git a/experimental/uloapi/src/main/resources/uloapi.properties b/src/uloapi/src/main/resources/uloapi.properties
similarity index 100%
rename from experimental/uloapi/src/main/resources/uloapi.properties
rename to src/uloapi/src/main/resources/uloapi.properties
-- 
GitLab