From 984e1aa49977a6ecaa8538bcf7cc3a5da2b4ba26 Mon Sep 17 00:00:00 2001
From: "G. Blake Meike" <blake.meike@couchbase.com>
Date: Wed, 11 Dec 2024 09:06:23 -0800
Subject: [PATCH] Fix asset directories

---
 servers/jak/android/app/build.gradle    | 7 +++++--
 servers/jak/desktop/app/build.gradle    | 8 ++++++--
 servers/jak/webservice/app/build.gradle | 8 ++++++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/servers/jak/android/app/build.gradle b/servers/jak/android/app/build.gradle
index d56c6328..a2b17f89 100644
--- a/servers/jak/android/app/build.gradle
+++ b/servers/jak/android/app/build.gradle
@@ -28,6 +28,8 @@ ext {
 
     SHARED_DIR = "${ROOT_DIR}/shared"
     ETC_DIR = "${ROOT_DIR}/etc"
+    ASSETS_ROOT = "${ROOT_DIR}/../../dataset/server"
+    BLOB_ASSETS_DIR = "${ASSETS_ROOT}/blobs"
 
     REPORTS_DIR = "${buildDir}/reports"
 
@@ -42,7 +44,7 @@ def USE_LOCAL_MAVEN = COUCHBASE_LITE_VERSION.endsWith("SNAPSHOT")
 
 def DATASET_VERSION = project.hasProperty("datasetVersion") ? datasetVersion : ""
 if (!(DATASET_VERSION =~ /^\d{1,2}\.\d{1,2}/)) { throw new InvalidUserDataException ("!!! Bad dataset version: ${DATASET_VERSION}") }
-def ASSETS_DIR = "${ROOT_DIR}/../../dataset/server/${DATASET_VERSION}"
+def DB_ASSETS_DIR = "${ASSETS_ROOT}/dbs/${DATASET_VERSION}"
 
 println "Building test server ${SERVER_VERSION}@${SERVER_BUILD} for CBL Android ${COUCHBASE_LITE_VERSION} with ${DATASET_VERSION} data"
 
@@ -104,7 +106,8 @@ android {
                 "${SHARED_DIR}/server/main/java"
             ]
             assets.srcDirs = [
-                ASSETS_DIR,
+                DB_ASSETS_DIR,
+                BLOB_ASSETS_DIR,
                 "${SHARED_DIR}/assets"
             ]
         }
diff --git a/servers/jak/desktop/app/build.gradle b/servers/jak/desktop/app/build.gradle
index d42725da..9ae73af3 100644
--- a/servers/jak/desktop/app/build.gradle
+++ b/servers/jak/desktop/app/build.gradle
@@ -36,6 +36,9 @@ ext {
     ASSETS_DIR = "${ROOT_DIR}/../../dataset/server"
     SHARED_DIR = "${ROOT_DIR}/shared"
     ETC_DIR = "${ROOT_DIR}/etc"
+    ASSETS_ROOT = "${ROOT_DIR}/../../dataset/server"
+    BLOB_ASSETS_DIR = "${ASSETS_ROOT}/blobs"
+
 
     REPORTS_DIR = "${buildDir}/reports"
 
@@ -49,7 +52,7 @@ def USE_LOCAL_MAVEN = COUCHBASE_LITE_VERSION.endsWith("SNAPSHOT")
  
 def DATASET_VERSION = project.hasProperty("datasetVersion") ? datasetVersion : ""
 if (!(DATASET_VERSION  =~ /^\d{1,2}\.\d{1,2}/)) { throw new InvalidUserDataException ("!!! Bad dataset version: ${DATASET_VERSION}") }
-def ASSETS_DIR = "${ROOT_DIR}/../../dataset/server/${DATASET_VERSION}"
+def DB_ASSETS_DIR = "${ASSETS_ROOT}/dbs/${DATASET_VERSION}"
 
 // Set -Pverbose to get full console logs for tests
 def VERBOSE = project.hasProperty("verbose")
@@ -76,7 +79,8 @@ java {
                 "${SHARED_DIR}/server/main/java"
             ]
             resources.srcDirs = [
-                ASSETS_DIR,
+                DB_ASSETS_DIR,
+                BLOB_ASSETS_DIR,
                 "${SHARED_DIR}/assets"
             ]
         }
diff --git a/servers/jak/webservice/app/build.gradle b/servers/jak/webservice/app/build.gradle
index 122962ef..739988d0 100644
--- a/servers/jak/webservice/app/build.gradle
+++ b/servers/jak/webservice/app/build.gradle
@@ -35,6 +35,9 @@ ext {
 
     SHARED_DIR = "${ROOT_DIR}/shared"
     ETC_DIR = "${ROOT_DIR}/etc"
+    ASSETS_ROOT = "${ROOT_DIR}/../../dataset/server"
+    BLOB_ASSETS_DIR = "${ASSETS_ROOT}/blobs"
+
 
     REPORTS_DIR = "${buildDir}/reports"
 
@@ -48,7 +51,7 @@ def USE_LOCAL_MAVEN = COUCHBASE_LITE_VERSION.endsWith("SNAPSHOT")
 
 def DATASET_VERSION = project.hasProperty("datasetVersion") ? datasetVersion : ""
 if (!(DATASET_VERSION  =~ /^\d{1,2}\.\d{1,2}/)) { throw new InvalidUserDataException ("!!! Bad dataset version: ${DATASET_VERSION}") }
-def ASSETS_DIR = "${ROOT_DIR}/../../dataset/server/${DATASET_VERSION}"
+def DB_ASSETS_DIR = "${ASSETS_ROOT}/dbs/${DATASET_VERSION}"
 
 // Set -Pverbose to get full console logs for tests
 def VERBOSE = project.hasProperty("verbose")
@@ -74,7 +77,8 @@ java {
                 "${SHARED_DIR}/jvm/main/java"
             ]
             resources.srcDirs = [
-                ASSETS_DIR,
+                DB_ASSETS_DIR,
+                BLOB_ASSETS_DIR,
                 "${SHARED_DIR}/assets"
             ]
         }