Moved resurces to module rest. Moved mysql implementation to module s…

…tore. Arranged dependencies. See #5
basilapi · Feb 21, 2021 · 1323509 · 1323509
1 parent 5aefd37
commit 1323509
Show file tree

Hide file tree

Showing 24 changed files with 25 additions and 5 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -170,11 +170,6 @@
 			<artifactId>sparql</artifactId>
 			<version>${basil.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.github.basilapi</groupId>
-			<artifactId>store</artifactId>
-			<version>${basil.version}</version>
-		</dependency>
 	</dependencies>
 
 </project>

diff --git a/rest/pom.xml b/rest/pom.xml
@@ -34,5 +34,11 @@
             <artifactId>core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.basilapi</groupId>
+            <artifactId>store</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/...basilapi/basil/rest/BasilApplication.java → ...basilapi/basil/rest/BasilApplication.java b/...basilapi/basil/rest/BasilApplication.java → ...basilapi/basil/rest/BasilApplication.java
diff --git a/...asilapi/basil/rest/auth/AuthResource.java → ...asilapi/basil/rest/auth/AuthResource.java b/...asilapi/basil/rest/auth/AuthResource.java → ...asilapi/basil/rest/auth/AuthResource.java
diff --git a/...i/basil/rest/auth/StatelessBasicAuth.java → ...i/basil/rest/auth/StatelessBasicAuth.java b/...i/basil/rest/auth/StatelessBasicAuth.java → ...i/basil/rest/auth/StatelessBasicAuth.java
diff --git a/...silapi/basil/rest/auth/UsersResource.java → ...silapi/basil/rest/auth/UsersResource.java b/...silapi/basil/rest/auth/UsersResource.java → ...silapi/basil/rest/auth/UsersResource.java
diff --git a/...api/basil/rest/core/AbstractResource.java → ...api/basil/rest/core/AbstractResource.java b/...api/basil/rest/core/AbstractResource.java → ...api/basil/rest/core/AbstractResource.java
diff --git a/...silapi/basil/rest/core/AliasResource.java → ...silapi/basil/rest/core/AliasResource.java b/...silapi/basil/rest/core/AliasResource.java → ...silapi/basil/rest/core/AliasResource.java
diff --git a/...lapi/basil/rest/core/ApiDocsResource.java → ...lapi/basil/rest/core/ApiDocsResource.java b/...lapi/basil/rest/core/ApiDocsResource.java → ...lapi/basil/rest/core/ApiDocsResource.java
diff --git a/...basilapi/basil/rest/core/ApiResource.java → ...basilapi/basil/rest/core/ApiResource.java b/...basilapi/basil/rest/core/ApiResource.java → ...basilapi/basil/rest/core/ApiResource.java
diff --git a/.../basil/rest/core/CredentialsResource.java → .../basil/rest/core/CredentialsResource.java b/.../basil/rest/core/CredentialsResource.java → .../basil/rest/core/CredentialsResource.java
diff --git a/...asilapi/basil/rest/core/DocsResource.java → ...asilapi/basil/rest/core/DocsResource.java b/...asilapi/basil/rest/core/DocsResource.java → ...asilapi/basil/rest/core/DocsResource.java
diff --git a/...lapi/basil/rest/core/ExplainResource.java → ...lapi/basil/rest/core/ExplainResource.java b/...lapi/basil/rest/core/ExplainResource.java → ...lapi/basil/rest/core/ExplainResource.java
diff --git a/...hub/basilapi/basil/rest/core/Headers.java → ...hub/basilapi/basil/rest/core/Headers.java b/...hub/basilapi/basil/rest/core/Headers.java → ...hub/basilapi/basil/rest/core/Headers.java
diff --git a/...ilapi/basil/rest/core/SearchResource.java → ...ilapi/basil/rest/core/SearchResource.java b/...ilapi/basil/rest/core/SearchResource.java → ...ilapi/basil/rest/core/SearchResource.java
diff --git a/...asil/rest/core/SpecificationResource.java → ...asil/rest/core/SpecificationResource.java b/...asil/rest/core/SpecificationResource.java → ...asil/rest/core/SpecificationResource.java
diff --git a/...asilapi/basil/rest/core/ViewResource.java → ...asilapi/basil/rest/core/ViewResource.java b/...asilapi/basil/rest/core/ViewResource.java → ...asilapi/basil/rest/core/ViewResource.java
diff --git a/...basilapi/basil/rest/msg/ErrorMessage.java → ...basilapi/basil/rest/msg/ErrorMessage.java b/...basilapi/basil/rest/msg/ErrorMessage.java → ...basilapi/basil/rest/msg/ErrorMessage.java
diff --git a/...thub/basilapi/basil/rest/msg/Message.java → ...thub/basilapi/basil/rest/msg/Message.java b/...thub/basilapi/basil/rest/msg/Message.java → ...thub/basilapi/basil/rest/msg/Message.java
diff --git a/...asilapi/basil/rest/msg/SimpleMessage.java → ...asilapi/basil/rest/msg/SimpleMessage.java b/...asilapi/basil/rest/msg/SimpleMessage.java → ...asilapi/basil/rest/msg/SimpleMessage.java
diff --git a/...silapi/basil/server/BasilEnvironment.java → ...silapi/basil/server/BasilEnvironment.java b/...silapi/basil/server/BasilEnvironment.java → ...silapi/basil/server/BasilEnvironment.java
diff --git a/store/pom.xml b/store/pom.xml
@@ -16,5 +16,24 @@
 
     <description></description>
 
+    <dependencies>
+        <!-- Logging -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
 
+        <!-- Test -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- BASIL -->
+        <dependency>
+            <groupId>io.github.basilapi</groupId>
+            <artifactId>core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/...pi/basil/store/mysql/JDBCUserManager.java → ...pi/basil/store/mysql/JDBCUserManager.java b/...pi/basil/store/mysql/JDBCUserManager.java → ...pi/basil/store/mysql/JDBCUserManager.java
diff --git a/...asilapi/basil/store/mysql/MySQLStore.java → ...asilapi/basil/store/mysql/MySQLStore.java b/...asilapi/basil/store/mysql/MySQLStore.java → ...asilapi/basil/store/mysql/MySQLStore.java