From e3225fa3af93fdcb20fc94c16c6d80520d0c92c5 Mon Sep 17 00:00:00 2001
From: vkovtun <viktor.kovtun@id.ethz.ch>
Date: Fri, 14 Jul 2023 16:39:16 +0200
Subject: [PATCH] SSDM-13579: Separated the new Data Store API scripts from V3
API scripts.
---
server-application-server/gwtdev.gradle | 8 +++-----
ui-admin/index.html | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/server-application-server/gwtdev.gradle b/server-application-server/gwtdev.gradle
index 9e9f9f6b96d..7531ac6ec15 100644
--- a/server-application-server/gwtdev.gradle
+++ b/server-application-server/gwtdev.gradle
@@ -94,17 +94,15 @@ task compileGWTToTempJDK11(type: Copy, dependsOn: untarGwt) {
task copyV3Api(type: Copy, dependsOn: [compileGWTToTempJDK11, ':api-openbis-javascript:bundleOpenbisStaticResources']) {
from("${project(':api-openbis-javascript').projectDir}/src/v3")
- from("${project(':api-data-store-server-javascript').projectDir}/src/js")
into "${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS/resources/api/v3"
}
-task copyV3Api(type: Copy, dependsOn: [compileGWTToTempJDK11, ':api-openbis-javascript:bundleOpenbisStaticResources']) {
- from("${project(':api-openbis-javascript').projectDir}/src/v3")
+task copyDataStoreServerApi(type: Copy, dependsOn: [compileGWTToTempJDK11, ':api-openbis-javascript:bundleOpenbisStaticResources']) {
from("${project(':api-data-store-server-javascript').projectDir}/src/js")
- into "${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS/resources/api/v3"
+ into "${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS/resources/api/data-store-server"
}
-task openBISDevelopmentEnvironmentASPrepare(type: Copy, dependsOn: [copyV3Api]) {
+task openBISDevelopmentEnvironmentASPrepare(type: Copy, dependsOn: [copyDataStoreServerApi, copyV3Api]) {
from "${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS"
into "targets/www/openbis-test"
}
diff --git a/ui-admin/index.html b/ui-admin/index.html
index a492a8cf8ea..2793a6673f6 100644
--- a/ui-admin/index.html
+++ b/ui-admin/index.html
@@ -40,7 +40,7 @@
onerror="loadError()"
></script>
<script src="/openbis/resources/api/v3/require.js"></script>
- <script src="/openbis/resources/api/v3/server-data-store-facade.js"></script>
+ <script src="/openbis/resources/api/data-store-server/server-data-store-facade.js"></script>
</head>
<body>
<div id="app"></div>
--
GitLab