Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
e3225fa3
Commit
e3225fa3
authored
1 year ago
by
vkovtun
Browse files
Options
Downloads
Patches
Plain Diff
SSDM-13579: Separated the new Data Store API scripts from V3 API scripts.
parent
281d29ac
No related branches found
No related tags found
1 merge request
!40
SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
server-application-server/gwtdev.gradle
+3
-5
3 additions, 5 deletions
server-application-server/gwtdev.gradle
ui-admin/index.html
+1
-1
1 addition, 1 deletion
ui-admin/index.html
with
4 additions
and
6 deletions
server-application-server/gwtdev.gradle
+
3
−
5
View file @
e3225fa3
...
@@ -94,17 +94,15 @@ task compileGWTToTempJDK11(type: Copy, dependsOn: untarGwt) {
...
@@ -94,17 +94,15 @@ task compileGWTToTempJDK11(type: Copy, dependsOn: untarGwt) {
task
copyV3Api
(
type:
Copy
,
dependsOn:
[
compileGWTToTempJDK11
,
':api-openbis-javascript:bundleOpenbisStaticResources'
])
{
task
copyV3Api
(
type:
Copy
,
dependsOn:
[
compileGWTToTempJDK11
,
':api-openbis-javascript:bundleOpenbisStaticResources'
])
{
from
(
"${project(':api-openbis-javascript').projectDir}/src/v3"
)
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"
into
"${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS/resources/api/v3"
}
}
task
copyV3Api
(
type:
Copy
,
dependsOn:
[
compileGWTToTempJDK11
,
':api-openbis-javascript:bundleOpenbisStaticResources'
])
{
task
copyDataStoreServerApi
(
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"
)
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"
from
"${gwtTempPath}/ch.systemsx.cisd.openbis.OpenBIS"
into
"targets/www/openbis-test"
into
"targets/www/openbis-test"
}
}
This diff is collapsed.
Click to expand it.
ui-admin/index.html
+
1
−
1
View file @
e3225fa3
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
onerror=
"loadError()"
onerror=
"loadError()"
></script>
></script>
<script
src=
"/openbis/resources/api/v3/require.js"
></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>
</head>
<body>
<body>
<div
id=
"app"
></div>
<div
id=
"app"
></div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment